summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-01-10 13:43:32 +0000
committerSean McGivern <sean@gitlab.com>2018-01-10 13:47:24 +0000
commitca2755619b36d11b3e25c107505aa7d99c3d8352 (patch)
treeb4caa6d8ad493c7ee6dcfa8a8a1df4149e6c09e9 /spec/services/merge_requests
parent44c8f919b4ba73fee6215ce2d6b023c666f34177 (diff)
downloadgitlab-ce-ca2755619b36d11b3e25c107505aa7d99c3d8352.tar.gz
Never set special MR titles for external issues
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/build_service_spec.rb22
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 4b670d3530e..cb4c3e72aa0 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -171,6 +171,24 @@ describe MergeRequests::BuildService do
end
end
end
+
+ context 'branch starts with external issue IID followed by a hyphen' do
+ let(:source_branch) { '12345-fix-issue' }
+
+ before do
+ allow(project).to receive(:external_issue_tracker).and_return(true)
+ end
+
+ it 'uses the title of the commit as the title of the merge request' do
+ expect(merge_request.title).to eq(commit_1.safe_message.split("\n").first)
+ end
+
+ it 'uses the description of the commit as the description of the merge request and appends the closes text' do
+ commit_description = commit_1.safe_message.split(/\n+/, 2).last
+
+ expect(merge_request.description).to eq("#{commit_description}\n\nCloses #12345")
+ end
+ end
end
context 'more than one commit in the diff' do
@@ -244,6 +262,10 @@ describe MergeRequests::BuildService do
it 'sets the title to the humanized branch title' do
expect(merge_request.title).to eq('12345 fix issue')
end
+
+ it 'appends the closes text' do
+ expect(merge_request.description).to eq('Closes #12345')
+ end
end
end