Move checksum calculation to Gitlab::Git::Repositoryda-gitaly-calculate-repository-checksum

2 files changed, 49 insertions, 49 deletions

diff --git a/spec/lib/gitlab/git/checksum_spec.rb b/spec/lib/gitlab/git/checksum_spec.rb
deleted file mode 100644
index a500b52cf20..00000000000
--- a/spec/lib/gitlab/git/checksum_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Git::Checksum, seed_helper: true do
-  let(:storage) { 'default' }
-  let(:gl_repository) { 'project-123' }
-
-  shared_examples 'calculating checksum' do
-    it 'raises Gitlab::Git::Repository::NoRepository when there is no repo' do
-      checksum = described_class.new(storage, 'nonexistent-repo', gl_repository)
-
-      expect { checksum.calculate }.to raise_error Gitlab::Git::Repository::NoRepository
-    end
-
-    it 'pretends that checksum is 000000... when the repo is empty' do
-      FileUtils.rm_rf(File.join(SEED_STORAGE_PATH, 'empty-repo.git'))
-
-      system(git_env, *%W(#{Gitlab.config.git.bin_path} init --bare empty-repo.git),
-             chdir: SEED_STORAGE_PATH,
-             out:   '/dev/null',
-             err:   '/dev/null')
-
-      checksum = described_class.new(storage, 'empty-repo', gl_repository)
-
-      expect(checksum.calculate).to eq '0000000000000000000000000000000000000000'
-    end
-
-    it 'calculates the checksum when there is a repo' do
-      checksum = described_class.new(storage, 'gitlab-git-test', gl_repository)
-
-      expect(checksum.calculate).to eq '54f21be4c32c02f6788d72207fa03ad3bce725e4'
-    end
-  end
-
-  context 'when calculate_checksum Gitaly feature is enabled' do
-    it_behaves_like 'calculating checksum'
-  end
-
-  context 'when calculate_checksum Gitaly feature is disabled', :disable_gitaly do
-    it_behaves_like 'calculating checksum'
-
-    it "raises a Gitlab::Git::Repository::Failure error if the `popen` call to git returns a non-zero exit code" do
-      checksum = described_class.new(storage, 'gitlab-git-test', gl_repository)
-
-      allow(checksum).to receive(:popen).and_return(['output', nil])
-
-      expect { checksum.calculate }.to raise_error Gitlab::Git::Checksum::Failure
-    end
-  end
-end
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index f934bf9a6b0..d3ab61746f4 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -2184,6 +2184,55 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
+  describe '#checksum' do
+    shared_examples 'calculating checksum' do
+      it 'calculates the checksum for non-empty repo' do
+        expect(repository.checksum).to eq '54f21be4c32c02f6788d72207fa03ad3bce725e4'
+      end
+
+      it 'returns 0000000000000000000000000000000000000000 for an empty repo' do
+        FileUtils.rm_rf(File.join(storage_path, 'empty-repo.git'))
+
+        system(git_env, *%W(#{Gitlab.config.git.bin_path} init --bare empty-repo.git),
+               chdir: storage_path,
+               out:   '/dev/null',
+               err:   '/dev/null')
+
+        empty_repo = described_class.new('default', 'empty-repo.git', '')
+
+        expect(empty_repo.checksum).to eq '0000000000000000000000000000000000000000'
+      end
+
+      it 'raises a no repository exception when there is no repo' do
+        broken_repo = described_class.new('default', 'a/path.git', '')
+
+        expect { broken_repo.checksum }.to raise_error(Gitlab::Git::Repository::NoRepository)
+      end
+    end
+
+    context 'when calculate_checksum Gitaly feature is enabled' do
+      it_behaves_like 'calculating checksum'
+    end
+
+    context 'when calculate_checksum Gitaly feature is disabled', :disable_gitaly do
+      it_behaves_like 'calculating checksum'
+
+      describe 'when storage is broken', :broken_storage  do
+        it 'raises a storage exception when storage is not available' do
+          broken_repo = described_class.new('broken', 'a/path.git', '')
+
+          expect { broken_repo.rugged }.to raise_error(Gitlab::Git::Storage::Inaccessible)
+        end
+      end
+
+      it "raises a Gitlab::Git::Repository::Failure error if the `popen` call to git returns a non-zero exit code" do
+        allow(repository).to receive(:popen).and_return(['output', nil])
+
+        expect { repository.checksum }.to raise_error Gitlab::Git::Repository::ChecksumError
+      end
+    end
+  end
+
   context 'gitlab_projects commands' do
     let(:gitlab_projects) { repository.gitlab_projects }
     let(:timeout) { Gitlab.config.gitlab_shell.git_timeout }