1 files changed, 37 insertions, 6 deletions

diff --git a/spec/lib/gitlab/gitaly_client/blob_service_spec.rb b/spec/lib/gitlab/gitaly_client/blob_service_spec.rb
index 037734f1b13..f0ec58f3c2d 100644
--- a/spec/lib/gitlab/gitaly_client/blob_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/blob_service_spec.rb
@@ -14,14 +14,14 @@ RSpec.describe Gitlab::GitalyClient::BlobService do
     let(:limit) { 5 }
     let(:not_in) { %w[branch-a branch-b] }
     let(:expected_params) do
-      { revision: revision, limit: limit, not_in_refs: not_in, not_in_all: false }
+      { revisions: ["master", "--not", "branch-a", "branch-b"], limit: limit }
     end
 
     subject { client.get_new_lfs_pointers(revision, limit, not_in) }
 
     it 'sends a get_new_lfs_pointers message' do
       expect_any_instance_of(Gitaly::BlobService::Stub)
-        .to receive(:get_new_lfs_pointers)
+        .to receive(:list_lfs_pointers)
         .with(gitaly_request_with_params(expected_params), kind_of(Hash))
         .and_return([])
 
@@ -31,12 +31,39 @@ RSpec.describe Gitlab::GitalyClient::BlobService do
     context 'with not_in = :all' do
       let(:not_in) { :all }
       let(:expected_params) do
-        { revision: revision, limit: limit, not_in_refs: [], not_in_all: true }
+        { revisions: ["master", "--not", "--all"], limit: limit }
       end
 
       it 'sends the correct message' do
         expect_any_instance_of(Gitaly::BlobService::Stub)
-          .to receive(:get_new_lfs_pointers)
+          .to receive(:list_lfs_pointers)
+          .with(gitaly_request_with_params(expected_params), kind_of(Hash))
+          .and_return([])
+
+        subject
+      end
+    end
+
+    context 'with hook environment' do
+      let(:git_env) do
+        {
+          'GIT_OBJECT_DIRECTORY_RELATIVE' => '.git/objects',
+          'GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE' => ['/dir/one', '/dir/two']
+        }
+      end
+
+      let(:expected_params) do
+        expected_repository = repository.gitaly_repository
+        expected_repository.git_alternate_object_directories = Google::Protobuf::RepeatedField.new(:string)
+
+        { limit: limit, repository: expected_repository }
+      end
+
+      it 'sends a list_all_lfs_pointers message' do
+        allow(Gitlab::Git::HookEnv).to receive(:all).with(repository.gl_repository).and_return(git_env)
+
+        expect_any_instance_of(Gitaly::BlobService::Stub)
+          .to receive(:list_all_lfs_pointers)
           .with(gitaly_request_with_params(expected_params), kind_of(Hash))
           .and_return([])
 
@@ -46,12 +73,16 @@ RSpec.describe Gitlab::GitalyClient::BlobService do
   end
 
   describe '#get_all_lfs_pointers' do
+    let(:expected_params) do
+      { revisions: ["--all"], limit: 0 }
+    end
+
     subject { client.get_all_lfs_pointers }
 
     it 'sends a get_all_lfs_pointers message' do
       expect_any_instance_of(Gitaly::BlobService::Stub)
-        .to receive(:get_all_lfs_pointers)
-        .with(gitaly_request_with_params({}), kind_of(Hash))
+        .to receive(:list_lfs_pointers)
+        .with(gitaly_request_with_params(expected_params), kind_of(Hash))
         .and_return([])
 
       subject