1 files changed, 34 insertions, 10 deletions
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
index 93affb12f2b..0868c793a33 100644
--- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe Gitlab::GitalyClient::CommitService do
   let(:project) { create(:project, :repository) }
+  let(:storage_name) { project.repository_storage }
+  let(:relative_path) { project.path_with_namespace + '.git' }
   let(:repository) { project.repository }
   let(:repository_message) { repository.gitaly_repository }
-  let(:commit) { project.commit('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
+  let(:revision) { '913c66a37b4a45b9769037c55c2d238bd0942d2e' }
+  let(:commit) { project.commit(revision) }
+  let(:client) { described_class.new(repository) }
 
   describe '#diff_from_parent' do
     context 'when a commit has a parent' do
@@ -12,12 +16,15 @@ describe Gitlab::GitalyClient::CommitService do
         request = Gitaly::CommitDiffRequest.new(
           repository: repository_message,
           left_commit_id: 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660',
-          right_commit_id: commit.id
+          right_commit_id: commit.id,
+          collapse_diffs: true,
+          enforce_limits: true,
+          **Gitlab::Git::DiffCollection.collection_limits.to_h
         )
 
         expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_diff).with(request, kind_of(Hash))
 
-        described_class.new(repository).diff_from_parent(commit)
+        client.diff_from_parent(commit)
       end
     end
 
@@ -27,27 +34,30 @@ describe Gitlab::GitalyClient::CommitService do
         request        = Gitaly::CommitDiffRequest.new(
           repository: repository_message,
           left_commit_id: '4b825dc642cb6eb9a060e54bf8d69288fbee4904',
-          right_commit_id: initial_commit.id
+          right_commit_id: initial_commit.id,
+          collapse_diffs: true,
+          enforce_limits: true,
+          **Gitlab::Git::DiffCollection.collection_limits.to_h
         )
 
         expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_diff).with(request, kind_of(Hash))
 
-        described_class.new(repository).diff_from_parent(initial_commit)
+        client.diff_from_parent(initial_commit)
       end
     end
 
     it 'returns a Gitlab::Git::DiffCollection' do
-      ret = described_class.new(repository).diff_from_parent(commit)
+      ret = client.diff_from_parent(commit)
 
       expect(ret).to be_kind_of(Gitlab::Git::DiffCollection)
     end
 
     it 'passes options to Gitlab::Git::DiffCollection' do
-      options = { max_files: 31, max_lines: 13 }
+      options = { max_files: 31, max_lines: 13, from_gitaly: true }
 
       expect(Gitlab::Git::DiffCollection).to receive(:new).with(kind_of(Enumerable), options)
 
-      described_class.new(repository).diff_from_parent(commit, options)
+      client.diff_from_parent(commit, options)
     end
   end
 
@@ -62,7 +72,7 @@ describe Gitlab::GitalyClient::CommitService do
 
         expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_delta).with(request, kind_of(Hash)).and_return([])
 
-        described_class.new(repository).commit_deltas(commit)
+        client.commit_deltas(commit)
       end
     end
 
@@ -77,7 +87,7 @@ describe Gitlab::GitalyClient::CommitService do
 
         expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_delta).with(request, kind_of(Hash)).and_return([])
 
-        described_class.new(repository).commit_deltas(initial_commit)
+        client.commit_deltas(initial_commit)
       end
     end
   end
@@ -85,6 +95,7 @@ describe Gitlab::GitalyClient::CommitService do
   describe '#between' do
     let(:from) { 'master' }
     let(:to) { '4b825dc642cb6eb9a060e54bf8d69288fbee4904' }
+
     it 'sends an RPC request' do
       request = Gitaly::CommitsBetweenRequest.new(
         repository: repository_message, from: from, to: to
@@ -96,4 +107,17 @@ describe Gitlab::GitalyClient::CommitService do
       described_class.new(repository).between(from, to)
     end
   end
+
+  describe '#tree_entries' do
+    let(:path) { '/' }
+
+    it 'sends a get_tree_entries message' do
+      expect_any_instance_of(Gitaly::CommitService::Stub)
+        .to receive(:get_tree_entries)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return([])
+
+      client.tree_entries(repository, revision, path)
+    end
+  end
 end