diff options
author | Shinya Maeda <shinya@gitlab.com> | 2019-03-29 14:56:40 +0700 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2019-04-01 14:02:57 +0700 |
commit | a7d4824ded0c5ae6a155d7bdc87a1ba71eb3df5c (patch) | |
tree | 855a0cd3c16093fb76f38738876da23da6b2ccc1 /spec/models | |
parent | 093629fedc43e8b481c6626765e3fcf0603add17 (diff) | |
download | gitlab-ce-a7d4824ded0c5ae6a155d7bdc87a1ba71eb3df5c.tar.gz |
Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-service
and add spec
Add changelog
ok
ok
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/merge_request_spec.rb | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 5adeb616e84..138036ab3c2 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -3081,6 +3081,38 @@ describe MergeRequest do end end + describe '#mergeable_to_ref?' do + it 'returns true when merge request is mergeable' do + subject = create(:merge_request) + + expect(subject.mergeable_to_ref?).to be(true) + end + + it 'returns false when merge request is already merged' do + subject = create(:merge_request, :merged) + + expect(subject.mergeable_to_ref?).to be(false) + end + + it 'returns false when merge request is closed' do + subject = create(:merge_request, :closed) + + expect(subject.mergeable_to_ref?).to be(false) + end + + it 'returns false when merge request is work in progress' do + subject = create(:merge_request, title: 'WIP: The feature') + + expect(subject.mergeable_to_ref?).to be(false) + end + + it 'returns false when merge request has no commits' do + subject = create(:merge_request, source_branch: 'empty-branch', target_branch: 'master') + + expect(subject.mergeable_to_ref?).to be(false) + end + end + describe '#merge_participants' do it 'contains author' do expect(subject.merge_participants).to eq([subject.author]) |