Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 62 deletions

diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repositories_spec.rb
index 718f38f9452..63f948e8dd4 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repositories_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Backup::Repository do
-  let_it_be(:project) { create(:project, :wiki_repo) }
-
+RSpec.describe Backup::Repositories do
   let(:progress) { StringIO.new }
 
   subject { described_class.new(progress) }
@@ -12,7 +10,6 @@ RSpec.describe Backup::Repository do
   before do
     allow(progress).to receive(:puts)
     allow(progress).to receive(:print)
-    allow(FileUtils).to receive(:mv).and_return(true)
 
     allow_next_instance_of(described_class) do |instance|
       allow(instance).to receive(:progress).and_return(progress)
@@ -24,11 +21,19 @@ RSpec.describe Backup::Repository do
       allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(storage_keys)
     end
 
-    let_it_be(:projects) { create_list(:project, 5, :wiki_repo) + [project] }
+    let_it_be(:projects) { create_list(:project, 5, :repository, :wiki_repo) }
 
     let(:storage_keys) { %w[default test_second_storage] }
 
     context 'no concurrency' do
+      it 'creates repository bundle' do
+        subject.dump(max_concurrency: 1, max_storage_concurrency: 1)
+
+        projects.each do |project|
+          expect(File).to exist(File.join(Gitlab.config.backup.path, 'repositories', project.disk_path + '.bundle'))
+        end
+      end
+
       it 'creates the expected number of threads' do
         expect(Thread).not_to receive(:new)
 
@@ -58,12 +63,22 @@ RSpec.describe Backup::Repository do
           subject.dump(max_concurrency: 1, max_storage_concurrency: 1)
         end.count
 
-        create_list(:project, 2, :wiki_repo)
+        create_list(:project, 2, :repository, :wiki_repo)
 
         expect do
           subject.dump(max_concurrency: 1, max_storage_concurrency: 1)
         end.not_to exceed_query_limit(control_count)
       end
+
+      context 'legacy storage' do
+        let_it_be(:project) { create(:project, :repository, :legacy_storage, :wiki_repo) }
+
+        it 'creates repository bundle' do
+          subject.dump(max_concurrency: 1, max_storage_concurrency: 1)
+
+          expect(File).to exist(File.join(Gitlab.config.backup.path, 'repositories', project.disk_path + '.bundle'))
+        end
+      end
     end
 
     [4, 10].each do |max_storage_concurrency|
@@ -120,7 +135,7 @@ RSpec.describe Backup::Repository do
             subject.dump(max_concurrency: 1, max_storage_concurrency: max_storage_concurrency)
           end.count
 
-          create_list(:project, 2, :wiki_repo)
+          create_list(:project, 2, :repository, :wiki_repo)
 
           expect do
             subject.dump(max_concurrency: 1, max_storage_concurrency: max_storage_concurrency)
@@ -131,45 +146,32 @@ RSpec.describe Backup::Repository do
   end
 
   describe '#restore' do
-    let(:timestamp) { Time.utc(2017, 3, 22) }
-    let(:temp_dirs) do
-      Gitlab.config.repositories.storages.map do |name, storage|
-        Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          File.join(storage.legacy_disk_path, '..', 'repositories.old.' + timestamp.to_i.to_s)
-        end
-      end
-    end
-
-    around do |example|
-      Timecop.freeze(timestamp) { example.run }
-    end
-
-    after do
-      temp_dirs.each { |path| FileUtils.rm_rf(path) }
-    end
+    let_it_be(:project) { create(:project, :wiki_repo) }
 
     describe 'command failure' do
       before do
-        # Allow us to set expectations on the project directly
         expect(Project).to receive(:find_each).and_yield(project)
-        expect(project.repository).to receive(:create_repository) { raise 'Fail in tests' }
+
+        allow_next_instance_of(Repository) do |repository|
+          allow(repository).to receive(:create_repository) { raise 'Fail in tests' }
+        end
       end
 
       context 'hashed storage' do
         it 'shows the appropriate error' do
           subject.restore
 
-          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
+          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} (#{project.disk_path})")
         end
       end
 
       context 'legacy storage' do
-        let!(:project) { create(:project, :legacy_storage) }
+        let_it_be(:project) { create(:project, :legacy_storage) }
 
         it 'shows the appropriate error' do
           subject.restore
 
-          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
+          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} (#{project.disk_path})")
         end
       end
     end
@@ -188,45 +190,15 @@ RSpec.describe Backup::Repository do
     end
 
     it 'cleans existing repositories' do
-      wiki_repository_spy = spy(:wiki)
+      expect(Repository).to receive(:new).twice.and_wrap_original do |method, *original_args|
+        repository = method.call(*original_args)
 
-      allow_next_instance_of(ProjectWiki) do |project_wiki|
-        allow(project_wiki).to receive(:repository).and_return(wiki_repository_spy)
-      end
+        expect(repository).to receive(:remove)
 
-      expect_next_instance_of(Repository) do |repo|
-        expect(repo).to receive(:remove)
+        repository
       end
 
       subject.restore
-
-      expect(wiki_repository_spy).to have_received(:remove)
-    end
-  end
-
-  describe '#empty_repo?' do
-    context 'for a wiki' do
-      let(:wiki) { create(:project_wiki) }
-
-      it 'invalidates the emptiness cache' do
-        expect(wiki.repository).to receive(:expire_emptiness_caches).once
-
-        subject.send(:empty_repo?, wiki)
-      end
-
-      context 'wiki repo has content' do
-        let!(:wiki_page) { create(:wiki_page, wiki: wiki) }
-
-        it 'returns true, regardless of bad cache value' do
-          expect(subject.send(:empty_repo?, wiki)).to be(false)
-        end
-      end
-
-      context 'wiki repo does not have content' do
-        it 'returns true, regardless of bad cache value' do
-          expect(subject.send(:empty_repo?, wiki)).to be_truthy
-        end
-      end
     end
   end
 end