Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 38 deletions

diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index 582effcc303..bf827fb3914 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -83,30 +83,6 @@ describe Backup::Repository do
     end
   end
 
-  describe '#prepare_directories', :seed_helper do
-    before do
-      allow(FileUtils).to receive(:mkdir_p).and_call_original
-      allow(FileUtils).to receive(:mv).and_call_original
-    end
-
-    after(:all) do
-      ensure_seeds
-    end
-
-    it' removes all repositories' do
-      # Sanity check: there should be something for us to delete
-      expect(list_repositories).to include(File.join(SEED_STORAGE_PATH, TEST_REPO_PATH))
-
-      subject.prepare_directories
-
-      expect(list_repositories).to be_empty
-    end
-
-    def list_repositories
-      Dir[File.join(SEED_STORAGE_PATH, '*.git')]
-    end
-  end
-
   describe '#empty_repo?' do
     context 'for a wiki' do
       let(:wiki) { create(:project_wiki) }
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 354260f23f6..04a648a0da0 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -2254,7 +2254,7 @@ describe Gitlab::Git::Repository, :seed_helper do
   end
 
   describe '#remove' do
-    let(:project) { create(:project, :repository)}
+    let(:project) { create(:project, :repository) }
     let(:repository) { project.repository }
 
     it 'removes the repository' do
@@ -2264,5 +2264,17 @@ describe Gitlab::Git::Repository, :seed_helper do
 
       expect(repository.raw_repository.exists?).to be false
     end
+
+    context 'when the repository does not exist' do
+      let(:repository) { create(:project).repository }
+
+      it 'is idempotent' do
+        expect(repository.exists?).to be false
+
+        repository.remove
+
+        expect(repository.raw_repository.exists?).to be false
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/gitaly_client/storage_service_spec.rb b/spec/lib/gitlab/gitaly_client/storage_service_spec.rb
deleted file mode 100644
index 6c25e2d6ebd..00000000000
--- a/spec/lib/gitlab/gitaly_client/storage_service_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::GitalyClient::StorageService do
-  describe '#delete_all_repositories' do
-    let!(:project) { create(:project, :repository) }
-
-    it 'removes all repositories' do
-      described_class.new(project.repository_storage).delete_all_repositories
-
-      expect(project.repository.exists?).to be(false)
-    end
-  end
-end