summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git/commit_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-09-12 16:48:30 +0000
committerRobert Speicher <robert@gitlab.com>2017-09-12 16:48:30 +0000
commita1a2ce4af4abddea64f909997c4a214dd2c04aa3 (patch)
tree0bbb4437c7eff110ab46a21e2ec6d3d4066845fe /spec/lib/gitlab/git/commit_spec.rb
parentf0b4e547519af428e3827d6230505123ce9da0f6 (diff)
parent25c34608b9ecd73391aaf7fdc66740e43fee5acb (diff)
downloadgitlab-ce-a1a2ce4af4abddea64f909997c4a214dd2c04aa3.tar.gz
Merge branch 'gitaly-519-commit-stats' into 'master'
Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077
Diffstat (limited to 'spec/lib/gitlab/git/commit_spec.rb')
-rw-r--r--spec/lib/gitlab/git/commit_spec.rb10
1 files changed, 9 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 }