...@@ -1301,7 +1301,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -1301,7 +1301,7 @@ class MergeRequest < ActiveRecord::Base
end end
def has_commits? def has_commits?
merge_request_diff && commits_count > 0 merge_request_diff && commits_count.to_i > 0
end end
def has_no_commits? def has_no_commits?
... ...
......
...@@ -2613,14 +2613,21 @@ describe MergeRequest do ...@@ -2613,14 +2613,21 @@ describe MergeRequest do
end end
describe '#has_commits?' do 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) allow(subject.merge_request_diff).to receive(:commits_count)
.and_return(2) .and_return(2)
end
it 'returns true when merge request diff has commits' do
expect(subject.has_commits?).to be_truthy expect(subject.has_commits?).to be_truthy
end 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 end
describe '#has_no_commits?' do describe '#has_no_commits?' do
... ...
......