Merge branch 'gitaly-519-commit-stats' into 'master'

Migrate Git::CommitStats to Gitaly

Closes gitaly#519

See merge request !14077

2 files changed, 34 insertions, 1 deletions

diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index 14d64d8c4da..46e968cc398 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -401,7 +401,7 @@ describe Gitlab::Git::Commit, seed_helper: true do
     end
   end
 
-  describe '#stats' do
+  shared_examples '#stats' do
     subject { commit.stats }
 
     describe '#additions' do
@@ -415,6 +415,14 @@ describe Gitlab::Git::Commit, seed_helper: true do
     end
   end
 
+  describe '#stats with gitaly on' do
+    it_should_behave_like '#stats'
+  end
+
+  describe '#stats with gitaly disabled', skip_gitaly_mock: true do
+    it_should_behave_like '#stats'
+  end
+
   describe '#to_diff' do
     subject { commit.to_diff }
 
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
index f32fe5d8150..ec3abcb0953 100644
--- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
@@ -165,4 +165,29 @@ describe Gitlab::GitalyClient::CommitService do
       expect(subject).to eq("my diff")
     end
   end
+
+  describe '#commit_stats' do
+    let(:request) do
+      Gitaly::CommitStatsRequest.new(
+        repository: repository_message, revision: revision
+      )
+    end
+    let(:response) do
+      Gitaly::CommitStatsResponse.new(
+        oid: revision,
+        additions: 11,
+        deletions: 15
+      )
+    end
+
+    subject { described_class.new(repository).commit_stats(revision) }
+
+    it 'sends an RPC request' do
+      expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commit_stats)
+        .with(request, kind_of(Hash)).and_return(response)
+
+      expect(subject.additions).to eq(11)
+      expect(subject.deletions).to eq(15)
+    end
+  end
 end