1 files changed, 53 insertions, 5 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index cb4c3e72aa0..e56d335a7d6 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -172,11 +172,32 @@ describe MergeRequests::BuildService do
         end
       end
 
-      context 'branch starts with external issue IID followed by a hyphen' do
+      context 'branch starts with numeric characters followed by a hyphen with no issue tracker' do
         let(:source_branch) { '12345-fix-issue' }
 
         before do
+          allow(project).to receive(:external_issue_tracker).and_return(false)
+          allow(project).to receive(:issues_enabled?).and_return(false)
+        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' do
+          commit_description = commit_1.safe_message.split(/\n+/, 2).last
+
+          expect(merge_request.description).to eq("#{commit_description}")
+        end
+      end
+
+      context 'branch starts with JIRA-formatted external issue IID followed by a hyphen' do
+        let(:source_branch) { 'EXMPL-12345-fix-issue' }
+
+        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 'uses the title of the commit as the title of the merge request' do
@@ -186,7 +207,7 @@ describe MergeRequests::BuildService do
         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")
+          expect(merge_request.description).to eq("#{commit_description}\n\nCloses EXMPL-12345")
         end
       end
     end
@@ -252,19 +273,46 @@ describe MergeRequests::BuildService do
         end
       end
 
-      context 'branch starts with external issue IID followed by a hyphen' do
+      context 'branch starts with numeric characters followed by a hyphen with no issue tracker' do
         let(:source_branch) { '12345-fix-issue' }
 
         before do
-          allow(project).to receive(:external_issue_tracker).and_return(true)
+          allow(project).to receive(:external_issue_tracker).and_return(false)
+          allow(project).to receive(:issues_enabled?).and_return(false)
         end
 
         it 'sets the title to the humanized branch title' do
           expect(merge_request.title).to eq('12345 fix issue')
         end
+      end
+
+      context 'branch starts with JIRA-formatted external issue IID' do
+        let(:source_branch) { 'EXMPL-12345' }
+
+        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
 
         it 'appends the closes text' do
-          expect(merge_request.description).to eq('Closes #12345')
+          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