diff options
author | Luke Howell <luke.howell@gmail.com> | 2016-09-01 14:52:43 +0000 |
---|---|---|
committer | Luke Howell <luke.howell@gmail.com> | 2016-09-01 14:06:45 -0500 |
commit | 0ee5efbd20bf99385183618dc0bcf74deaa20075 (patch) | |
tree | 7708c9689ec6e4cff7b84294132bbcf21ff401a7 /spec/services/merge_requests | |
parent | a4c56a2b895f1313c09f1f029745395c4563763c (diff) | |
download | gitlab-ce-0ee5efbd20bf99385183618dc0bcf74deaa20075.tar.gz |
Prepend blank line to close message on merge request
- Added an extra new line to the prepend of the Close message
Fixes #21710
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/build_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index 232508cda23..0d586e2216b 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -99,14 +99,14 @@ describe MergeRequests::BuildService, services: true do let(:source_branch) { "#{issue.iid}-fix-issue" } it 'appends "Closes #$issue-iid" to the description' do - expect(merge_request.description).to eq("#{commit_1.safe_message.split(/\n+/, 2).last}\nCloses ##{issue.iid}") + expect(merge_request.description).to eq("#{commit_1.safe_message.split(/\n+/, 2).last}\n\nCloses ##{issue.iid}") end context 'merge request already has a description set' do let(:description) { 'Merge request description' } it 'appends "Closes #$issue-iid" to the description' do - expect(merge_request.description).to eq("#{description}\nCloses ##{issue.iid}") + expect(merge_request.description).to eq("#{description}\n\nCloses ##{issue.iid}") end end |