summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-17 14:12:16 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-17 16:44:15 +0100
commitcc25c4c06c532eef592cb88440f271694faf97ef (patch)
treedd9ef986b2506078c153872015b018fa2573125f /spec/services
parent7a623907528a77187e070c9721469df8bdd00ec8 (diff)
downloadgitlab-ce-cc25c4c06c532eef592cb88440f271694faf97ef.tar.gz
Allow creating merge request even if target branch is not specified in query params
Closes #28890
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/merge_requests/build_service_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 0768f644036..adfa75a524f 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -49,10 +49,13 @@ describe MergeRequests::BuildService, services: true do
let(:commits) { Commit.decorate([commit_1], project) }
it 'creates compare object with target branch as default branch' do
- expect(merge_request.can_be_created).to eq(false)
expect(merge_request.compare).to be_present
expect(merge_request.target_branch).to eq(project.default_branch)
end
+
+ it 'allows the merge request to be created' do
+ expect(merge_request.can_be_created).to eq(true)
+ end
end
context 'same source and target branch' do