diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-18 14:23:44 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-18 14:23:44 +0300 |
commit | a1deb6ece3be68fb176eb08a6371a334b24b4f01 (patch) | |
tree | 7b5c300c34507efa05a885a6a51f3924b508dc52 /spec/models | |
parent | da07c2e4d3d382c05ec287ee60f639b870074fe7 (diff) | |
parent | c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff) |
Merge branch 'master' into issue_19734_2
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/merge_request_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 5884b4cff8c..91a423b670c 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1155,12 +1155,6 @@ describe MergeRequest, models: true do expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey end - it 'returns a falsey value when the conflicts contain a file with ambiguous conflict markers' do - merge_request = create_merge_request('conflict-contains-conflict-markers') - - expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey - end - it 'returns a falsey value when the conflicts contain a file edited in one branch and deleted in another' do merge_request = create_merge_request('conflict-missing-side') @@ -1172,6 +1166,12 @@ describe MergeRequest, models: true do expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_truthy end + + it 'returns a truthy value when the conflicts have to be resolved in an editor' do + merge_request = create_merge_request('conflict-contains-conflict-markers') + + expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_truthy + end end describe "#forked_source_project_missing?" do |