diff options
author | Francisco Javier López <fjlopez@gitlab.com> | 2019-04-01 14:50:34 +0200 |
---|---|---|
committer | Francisco Javier López <fjlopez@gitlab.com> | 2019-04-01 14:50:34 +0200 |
commit | 6645b825465a67f8a33e88d897992ff7b0c87bd2 (patch) | |
tree | d96226ed0f2405fbedd24705bdb0287806853f63 | |
parent | 3a477fec8f1fe6cf1da70a8ae0a8473ab26235bc (diff) | |
download | gitlab-ce-fj-59547-fix-has-commits.tar.gz |
Fix MergeRequest#commits_count nil comparisonfj-59547-fix-has-commits
-rw-r--r-- | app/models/merge_request.rb | 2 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 19557fd476e..449cc232ef8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1339,7 +1339,7 @@ class MergeRequest < ActiveRecord::Base end def has_commits? - merge_request_diff && commits_count > 0 + merge_request_diff && commits_count.to_i > 0 end def has_no_commits? diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index a1de0c63623..8af0fefc59f 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2712,14 +2712,21 @@ describe MergeRequest do end describe '#has_commits?' do - before do + it 'returns true when merge request diff has commits' do allow(subject.merge_request_diff).to receive(:commits_count) .and_return(2) - end - it 'returns true when merge request diff has commits' do expect(subject.has_commits?).to be_truthy end + + context 'when commits_count is nil' do + it 'returns false' do + allow(subject.merge_request_diff).to receive(:commits_count) + .and_return(nil) + + expect(subject.has_commits?).to be_falsey + end + end end describe '#has_no_commits?' do |