Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 9 deletions

diff --git a/spec/features/abuse_report_spec.rb b/spec/features/abuse_report_spec.rb
index 0312efeb9ce..f934736ced9 100644
--- a/spec/features/abuse_report_spec.rb
+++ b/spec/features/abuse_report_spec.rb
@@ -61,7 +61,7 @@ RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
 
         before do
           visit user_path(abusive_user)
-          find('[data-testid="base-dropdown-toggle"').click
+          find_by_testid('base-dropdown-toggle').click
         end
 
         it_behaves_like 'reports the user with an abuse category'
@@ -69,7 +69,7 @@ RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
         it 'allows the reporter to report the same user for different abuse categories' do
           visit user_path(abusive_user)
 
-          find('[data-testid="base-dropdown-toggle"').click
+          find_by_testid('base-dropdown-toggle').click
           fill_and_submit_abuse_category_form
           fill_and_submit_report_abuse_form
 
@@ -77,7 +77,7 @@ RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
 
           visit user_path(abusive_user)
 
-          find('[data-testid="base-dropdown-toggle"').click
+          find_by_testid('base-dropdown-toggle').click
           fill_and_submit_abuse_category_form("They're being offensive or abusive.")
           fill_and_submit_report_abuse_form
 
@@ -95,7 +95,7 @@ RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
 
           visit user_path(abusive_user)
 
-          find('[data-testid="base-dropdown-toggle"').click
+          find_by_testid('base-dropdown-toggle').click
           fill_and_submit_abuse_category_form
           fill_and_submit_report_abuse_form
 
@@ -159,7 +159,7 @@ RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
 
       before do
         visit project_merge_request_path(project, merge_request)
-        find('[data-testid="merge-request-actions"]').click
+        find_by_testid('merge-request-actions').click
       end
 
       it_behaves_like 'reports the user with an abuse category'
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index c4e9713aa35..b6c96555767 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -70,7 +70,7 @@ RSpec.describe 'Profile account page', :js, feature_category: :user_profile do
 
     previous_token = ''
 
-    within('[data-testid="feed-token-container"]') do
+    within_testid('feed-token-container') do
       previous_token = find_field('Feed token').value
 
       click_link('reset this token')
@@ -78,7 +78,7 @@ RSpec.describe 'Profile account page', :js, feature_category: :user_profile do
 
     accept_gl_confirm
 
-    within('[data-testid="feed-token-container"]') do
+    within_testid('feed-token-container') do
       click_button('Click to reveal')
 
       expect(find_field('Feed token').value).not_to eq(previous_token)
@@ -92,7 +92,7 @@ RSpec.describe 'Profile account page', :js, feature_category: :user_profile do
 
     previous_token = ''
 
-    within('[data-testid="incoming-email-token-container"]') do
+    within_testid('incoming-email-token-container') do
       previous_token = find_field('Incoming email token').value
 
       click_link('reset this token')
@@ -100,7 +100,7 @@ RSpec.describe 'Profile account page', :js, feature_category: :user_profile do
 
     accept_gl_confirm
 
-    within('[data-testid="incoming-email-token-container"]') do
+    within_testid('incoming-email-token-container') do
       click_button('Click to reveal')
 
       expect(find_field('Incoming email token').value).not_to eq(previous_token)