Incorporate the review and update spec

The feature spec now also tests the absence of the new branch button

2 files changed, 6 insertions, 7 deletions

diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb
index f47d7a5471b..462cb1f8f62 100644
--- a/spec/features/issues/new_branch_button_spec.rb
+++ b/spec/features/issues/new_branch_button_spec.rb
@@ -18,14 +18,13 @@ feature 'Start new branch from an issue', feature: true do
     end
 
     context "when there is a referenced merge request" do
-      let(:note) do 
+      let(:note) do
         create(:note, :on_issue, :system, project: project,
-                                          note: "mentioned in !#{referenced_mr.iid}") 
+                                          note: "mentioned in !#{referenced_mr.iid}")
       end
-      let(:referenced_mr) do 
-        create(:merge_request, source_project: project,
-                               target_project: project,
-                               description: "Fixes ##{issue.iid}") 
+      let(:referenced_mr) do
+        create(:merge_request, :simple, source_project: project, target_project: project,
+                                description: "Fixes ##{issue.iid}")
       end
 
       before do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 2730b42c612..8e6292014d4 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -287,7 +287,7 @@ describe SystemNoteService, services: true do
 
     context 'when a branch is created from the new branch button' do
       it 'sets the note text' do
-        expect(subject.note).to eq 'Started branch 1-mepmep'
+        expect(subject.note).to match /\AStarted branch [`1-mepmep`]/
       end
     end
   end