diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 13:11:56 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 13:11:56 +0300 |
commit | 754d1ec4c03c206376178e17af3f5d78a1e16a08 (patch) | |
tree | 872bff1ba5a6ba36cfa1fd3ce55189796fc05f39 /spec | |
parent | 8925671a063180e6bbb6c3c6dcbfe9fdb908ef50 (diff) | |
parent | 926002fdf8d83147cfb577939bd3f8e75da56548 (diff) |
Merge branch 'sh-fix-issue-43193' into 'master'
Fix Error 500s creating merge requests with external issue tracker
Closes #43193
See merge request gitlab-org/gitlab-ce!17073
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/merge_requests/build_service_spec.rb | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index e56d335a7d6..a0d0a4fd81b 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -286,33 +286,43 @@ describe MergeRequests::BuildService do end end - context 'branch starts with JIRA-formatted external issue IID' do - let(:source_branch) { 'EXMPL-12345' } - + describe 'with JIRA enabled' do before do allow(project).to receive(:external_issue_tracker).and_return(true) allow(project).to receive(:issues_enabled?).and_return(false) allow(project).to receive(:external_issue_reference_pattern).and_return(IssueTrackerService.reference_pattern) end - it 'sets the title to the humanized branch title' do - expect(merge_request.title).to eq('Resolve EXMPL-12345') - end + context 'branch does not start with JIRA-formatted external issue IID' do + let(:source_branch) { 'test-branch' } - it 'appends the closes text' do - expect(merge_request.description).to eq('Closes EXMPL-12345') + it 'sets the title to the humanized branch title' do + expect(merge_request.title).to eq('Test branch') + end end - context 'followed by hyphenated text' do - let(:source_branch) { 'EXMPL-12345-fix-issue' } + context 'branch starts with JIRA-formatted external issue IID' do + let(:source_branch) { 'EXMPL-12345' } it 'sets the title to the humanized branch title' do - expect(merge_request.title).to eq('Resolve EXMPL-12345 "Fix issue"') + expect(merge_request.title).to eq('Resolve EXMPL-12345') end it 'appends the closes text' do expect(merge_request.description).to eq('Closes EXMPL-12345') end + + context 'followed by hyphenated text' do + let(:source_branch) { 'EXMPL-12345-fix-issue' } + + it 'sets the title to the humanized branch title' do + expect(merge_request.title).to eq('Resolve EXMPL-12345 "Fix issue"') + end + + it 'appends the closes text' do + expect(merge_request.description).to eq('Closes EXMPL-12345') + end + end end end end |