Fix MergeRequest#has_commits? nil comparison

This commit is contained in:
Francisco Javier López 2019-04-01 15:13:22 +00:00 committed by Nick Thomas
parent 0a480e3c32
commit 45293f66fa
2 changed files with 11 additions and 4 deletions

View File

@ -1343,7 +1343,7 @@ class MergeRequest < ApplicationRecord
end
def has_commits?
merge_request_diff && commits_count > 0
merge_request_diff && commits_count.to_i > 0
end
def has_no_commits?

View File

@ -2714,13 +2714,20 @@ 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)
expect(subject.has_commits?).to be_truthy
end
it 'returns true when merge request diff has commits' do
expect(subject.has_commits?).to be_truthy
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