diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2016-12-30 22:49:59 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-13 17:16:35 +0300 |
| commit | 557a0bf14c79c02c65196ff8f7a2251ecd77073c (patch) | |
| tree | 36cef1d85fbc5541ec15949d5ea42feb8444c6df /spec/models/merge_request_spec.rb | |
| parent | aa934c7469372cac7b8cd10b49761d90d8e367fa (diff) | |
Address MR comments
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 722987a423c..861426acbc3 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1578,6 +1578,12 @@ describe MergeRequest, models: true do end end + context 'sha is not provided' do + it 'is not mergeable' do + expect(merge_request.mergeable_with_slash_command?(developer)).to be_falsey + end + end + context 'with pipeline ok' do before do create_pipeline(:success) |