diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
commit | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (patch) | |
tree | 673deb5b6d8047b511ff01e9d7c1110fc4f0812a /spec | |
parent | b46b52af37fd8c800e8fdca5de25be31415c7d5d (diff) | |
download | gitlab-ce-7a7e9288d4dea50a9797b3f624bf8174fa7060d4.tar.gz |
Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/merge_requests/conflicts/list_service_spec.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/services/merge_requests/conflicts/list_service_spec.rb b/spec/services/merge_requests/conflicts/list_service_spec.rb index e8a305d6130..23982b9e6e1 100644 --- a/spec/services/merge_requests/conflicts/list_service_spec.rb +++ b/spec/services/merge_requests/conflicts/list_service_spec.rb @@ -25,6 +25,13 @@ describe MergeRequests::Conflicts::ListService do expect(conflicts_service(merge_request).can_be_resolved_in_ui?).to be_falsey end + it 'returns a falsey value when one of the MR branches is missing' do + merge_request = create_merge_request('conflict-resolvable') + merge_request.project.repository.rm_branch(merge_request.author, 'conflict-resolvable') + + expect(conflicts_service(merge_request).can_be_resolved_in_ui?).to be_falsey + end + it 'returns a falsey value when the MR has a missing ref after a force push' do merge_request = create_merge_request('conflict-resolvable') service = conflicts_service(merge_request) |