Add latest changes from gitlab-org/gitlab@master

2 files changed, 48 insertions, 2 deletions

diff --git a/spec/lib/backup/repositories_spec.rb b/spec/lib/backup/repositories_spec.rb
index 1581e4793e3..211b0d91f9f 100644
--- a/spec/lib/backup/repositories_spec.rb
+++ b/spec/lib/backup/repositories_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Backup::Repositories do
   let(:progress) { spy(:stdout) }
   let(:strategy) { spy(:strategy) }
   let(:storages) { [] }
+  let(:paths) { [] }
   let(:destination) { 'repositories' }
   let(:backup_id) { 'backup_id' }
 
@@ -13,7 +14,8 @@ RSpec.describe Backup::Repositories do
     described_class.new(
       progress,
       strategy: strategy,
-      storages: storages
+      storages: storages,
+      paths: paths
     )
   end
 
@@ -107,6 +109,29 @@ RSpec.describe Backup::Repositories do
         expect(strategy).to have_received(:finish!)
       end
     end
+
+    describe 'paths' do
+      let_it_be(:project) { create(:project, :repository) }
+
+      let(:paths) { [project.full_path] }
+
+      it 'calls enqueue for all repositories on the specified project', :aggregate_failures do
+        excluded_project = create(:project, :repository)
+        excluded_project_snippet = create(:project_snippet, :repository, project: excluded_project)
+        excluded_personal_snippet = create(:personal_snippet, :repository, author: excluded_project.first_owner)
+
+        subject.dump(destination, backup_id)
+
+        expect(strategy).to have_received(:start).with(:create, destination, backup_id: backup_id)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_project, Gitlab::GlRepository::PROJECT)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_project_snippet, Gitlab::GlRepository::SNIPPET)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_personal_snippet, Gitlab::GlRepository::SNIPPET)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::PROJECT)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::WIKI)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::DESIGN)
+        expect(strategy).to have_received(:finish!)
+      end
+    end
   end
 
   describe '#restore' do
@@ -208,5 +233,26 @@ RSpec.describe Backup::Repositories do
         expect(strategy).to have_received(:finish!)
       end
     end
+
+    context 'paths' do
+      let(:paths) { [project.full_path] }
+
+      it 'calls enqueue for all repositories on the specified project', :aggregate_failures do
+        excluded_project = create(:project, :repository)
+        excluded_project_snippet = create(:project_snippet, :repository, project: excluded_project)
+        excluded_personal_snippet = create(:personal_snippet, :repository, author: excluded_project.first_owner)
+
+        subject.restore(destination)
+
+        expect(strategy).to have_received(:start).with(:restore, destination)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_project, Gitlab::GlRepository::PROJECT)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_project_snippet, Gitlab::GlRepository::SNIPPET)
+        expect(strategy).not_to have_received(:enqueue).with(excluded_personal_snippet, Gitlab::GlRepository::SNIPPET)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::PROJECT)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::WIKI)
+        expect(strategy).to have_received(:enqueue).with(project, Gitlab::GlRepository::DESIGN)
+        expect(strategy).to have_received(:finish!)
+      end
+    end
   end
 end
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 52a0a9a7385..4a3b81a072f 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -465,7 +465,7 @@ RSpec.describe 'gitlab:app namespace rake task', :delete do
         stub_env('GITLAB_BACKUP_MAX_STORAGE_CONCURRENCY', 2)
 
         expect(::Backup::Repositories).to receive(:new)
-          .with(anything, strategy: anything, storages: [])
+          .with(anything, strategy: anything, storages: [], paths: [])
           .and_call_original
         expect(::Backup::GitalyBackup).to receive(:new).with(anything, max_parallelism: 5, storage_parallelism: 2, incremental: false).and_call_original