Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/issuables/close_reopen_report_toggle_spec.rb
index 6e99cfb3293..a730b94a898 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
@@ -95,7 +95,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
         expect(page).to have_link('New issue')
         expect(page).not_to have_button('Close issue')
         expect(page).not_to have_button('Reopen issue')
-        expect(page).not_to have_link('Edit')
+        expect(page).not_to have_link(title: 'Edit title and description')
       end
     end
   end
@@ -121,7 +121,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
 
         it 'shows only the `Report abuse` and `Edit` button' do
           expect(page).to have_link('Report abuse')
-          expect(page).to have_link('Edit')
+          expect(page).to have_link(exact_text: 'Edit')
           expect(page).not_to have_button('Close merge request')
           expect(page).not_to have_button('Reopen merge request')
         end
@@ -130,8 +130,8 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
           let(:issuable) { create(:merge_request, :merged, source_project: project, author: user) }
 
           it 'shows only the `Edit` button' do
-            expect(page).to have_link('Edit')
             expect(page).to have_link('Report abuse')
+            expect(page).to have_link(exact_text: 'Edit')
             expect(page).not_to have_button('Close merge request')
             expect(page).not_to have_button('Reopen merge request')
           end
@@ -153,7 +153,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
         expect(page).to have_link('Report abuse')
         expect(page).not_to have_button('Close merge request')
         expect(page).not_to have_button('Reopen merge request')
-        expect(page).not_to have_link('Edit')
+        expect(page).not_to have_link(exact_text: 'Edit')
       end
     end
   end