Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index 32e718d4b3b..2ac1b0d2583 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -86,6 +86,22 @@ describe Backup::Repository do
         expect(pool_repository.object_pool.exists?).to be(true)
       end
     end
+
+    it 'cleans existing repositories' do
+      wiki_repository_spy = spy(:wiki)
+
+      allow_next_instance_of(ProjectWiki) do |project_wiki|
+        allow(project_wiki).to receive(:repository).and_return(wiki_repository_spy)
+      end
+
+      expect_next_instance_of(Repository) do |repo|
+        expect(repo).to receive(:remove)
+      end
+
+      subject.restore
+
+      expect(wiki_repository_spy).to have_received(:remove)
+    end
   end
 
   describe '#empty_repo?' do