diff options
author | Sean McGivern <sean@gitlab.com> | 2018-07-10 15:00:13 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2018-07-10 15:06:20 +0100 |
commit | 57fc7cd8f35525f772d7c59a2aa45c96467cb882 (patch) | |
tree | 12123ad5d95b5bd5b3335996cbe398f27d9780c1 /spec/services/merge_requests | |
parent | 3d4873fa64c833c71ab7ee274002d854eb93ef96 (diff) | |
download | gitlab-ce-57fc7cd8f35525f772d7c59a2aa45c96467cb882.tar.gz |
Make sure ConflictsService does not raise for conflicting submodules
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/conflicts/list_service_spec.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/services/merge_requests/conflicts/list_service_spec.rb b/spec/services/merge_requests/conflicts/list_service_spec.rb index a5520e7373e..c81fa95e4b7 100644 --- a/spec/services/merge_requests/conflicts/list_service_spec.rb +++ b/spec/services/merge_requests/conflicts/list_service_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe MergeRequests::Conflicts::ListService do describe '#can_be_resolved_in_ui?' do - def create_merge_request(source_branch) - create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start', merge_status: :unchecked) do |mr| + def create_merge_request(source_branch, target_branch = 'conflict-start') + create(:merge_request, source_branch: source_branch, target_branch: target_branch, merge_status: :unchecked) do |mr| mr.mark_as_unmergeable end end @@ -84,5 +84,11 @@ describe MergeRequests::Conflicts::ListService do expect(service.can_be_resolved_in_ui?).to be_falsey end + + it 'returns a falsey value when the conflict is in a submodule revision' do + merge_request = create_merge_request('update-gitlab-shell-v-6-0-3', 'update-gitlab-shell-v-6-0-1') + + expect(conflicts_service(merge_request).can_be_resolved_in_ui?).to be_falsey + end end end |