diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-29 23:53:47 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-29 23:53:47 -0200 |
commit | dbfedb5adb3651d3b700186b24a5b1b69d10a0dd (patch) | |
tree | c34420dc30ecfa6479595294d59fd623406bc550 /spec | |
parent | 1f309b69df3f71d988d4d31b08a1b683099a46e5 (diff) | |
download | gitlab-ce-dbfedb5adb3651d3b700186b24a5b1b69d10a0dd.tar.gz |
Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-state
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/merge_request_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index eb9690df313..243eeddc7a8 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1339,6 +1339,10 @@ describe MergeRequest do it 'returns false' do expect(subject.mergeable_state?).to be_falsey end + + it 'returns true when skipping discussions check' do + expect(subject.mergeable_state?(skip_discussions_check: true)).to be(true) + end end end end |