Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 12 insertions, 10 deletions

diff --git a/spec/features/merge_request/close_reopen_report_toggle_spec.rb b/spec/features/merge_request/close_reopen_report_toggle_spec.rb
index 63ed355b16e..9b8e50a31e3 100644
--- a/spec/features/merge_request/close_reopen_report_toggle_spec.rb
+++ b/spec/features/merge_request/close_reopen_report_toggle_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_review do
+RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_review_workflow do
   include IssuablesHelper
 
   let(:user) { create(:user) }
@@ -27,12 +27,12 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
           find('[data-testid="merge-request-actions"]').click
 
           expect(container).to have_link("Close merge request")
-          expect(container).to have_link('Report abuse to administrator')
+          expect(container).to have_button('Report abuse to administrator')
         end
 
         it 'links to Report Abuse' do
           find('[data-testid="merge-request-actions"]').click
-          click_link 'Report abuse to administrator'
+          click_button 'Report abuse to administrator'
 
           expect(page).to have_content('Report abuse to administrator')
         end
@@ -47,7 +47,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
           expect(container).to have_link('Edit')
           expect(container).to have_link('Mark as draft')
           expect(container).to have_link('Close merge request')
-          expect(container).to have_link('Report abuse to administrator')
+          expect(container).to have_button('Report abuse to administrator')
           expect(container).not_to have_link('Reopen merge request')
         end
       end
@@ -59,7 +59,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
           find('[data-testid="merge-request-actions"]').click
 
           expect(container).to have_link('Edit')
-          expect(container).to have_link('Report abuse to administrator')
+          expect(container).to have_button('Report abuse to administrator')
           expect(container).to have_link('Reopen merge request')
           expect(container).not_to have_link('Close merge request')
         end
@@ -73,7 +73,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
             expect(container).to have_link('Edit')
             expect(container).to have_link('Reopen merge request')
             expect(container).not_to have_link('Close merge request')
-            expect(container).not_to have_link('Report abuse to administrator')
+            expect(container).not_to have_button('Report abuse to administrator')
           end
         end
       end
@@ -83,7 +83,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
 
         it 'shows only the `Edit` button' do
           expect(container).to have_link(exact_text: 'Edit')
-          expect(container).not_to have_link('Report abuse to administrator')
+          expect(container).not_to have_button('Report abuse to administrator')
           expect(container).not_to have_button('Close merge request')
           expect(container).not_to have_button('Reopen merge request')
         end
@@ -93,7 +93,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
 
           it 'shows only the `Edit` button' do
             expect(container).to have_link(exact_text: 'Edit')
-            expect(container).not_to have_link('Report abuse to administrator')
+            expect(container).not_to have_button('Report abuse to administrator')
             expect(container).not_to have_button('Close merge request')
             expect(container).not_to have_button('Reopen merge request')
           end
@@ -101,7 +101,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
       end
     end
 
-    context 'when user doesnt have permission to update' do
+    context 'when user doesnt have permission to update', :js do
       let(:cant_project) { create(:project, :repository) }
       let(:cant_issuable) { create(:merge_request, source_project: cant_project) }
 
@@ -112,7 +112,9 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle', feature_category: :code_r
       end
 
       it 'only shows a `Report abuse` button' do
-        expect(container).to have_link('Report abuse to administrator')
+        find('[data-testid="merge-request-actions"]').click
+
+        expect(container).to have_button('Report abuse to administrator')
         expect(container).not_to have_button('Close merge request')
         expect(container).not_to have_button('Reopen merge request')
         expect(container).not_to have_link(exact_text: 'Edit')