Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 11 deletions

diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index 5ae057dc97d..26dadd3b4f1 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -81,7 +81,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
                   track_action: 'click_link_new_project',
                   track_label: 'plus_menu_dropdown',
                   track_property: 'navigation_top',
-                  qa_selector: 'global_new_project_link'
+                  testid: 'global_new_project_link'
                 }
               )
             )
@@ -104,7 +104,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
                   track_action: 'click_link_new_group',
                   track_label: 'plus_menu_dropdown',
                   track_property: 'navigation_top',
-                  qa_selector: 'global_new_group_link'
+                  testid: 'global_new_group_link'
                 }
               )
             )
@@ -127,7 +127,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
                   track_action: 'click_link_new_snippet_parent',
                   track_label: 'plus_menu_dropdown',
                   track_property: 'navigation_top',
-                  qa_selector: 'global_new_snippet_link'
+                  testid: 'global_new_snippet_link'
                 }
               )
             )
@@ -256,7 +256,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
                   track_action: 'click_link_new_issue',
                   track_label: 'plus_menu_dropdown',
                   track_property: 'navigation_top',
-                  qa_selector: 'new_issue_link'
+                  testid: 'new_issue_link'
                 }
               )
             )
@@ -340,7 +340,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
               track_action: 'click_link_new_issue',
               track_label: 'plus_menu_dropdown',
               track_property: 'navigation_top',
-              qa_selector: 'new_issue_link'
+              testid: 'new_issue_link'
             }
           )
         )
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index 252423aa988..e2a0c11e7cb 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -133,7 +133,7 @@ RSpec.describe Nav::TopNavHelper do
               track_action: 'click_dropdown',
               track_label: 'projects_dropdown',
               track_property: 'navigation_top',
-              qa_selector: 'projects_dropdown'
+              testid: 'projects_dropdown'
             },
             icon: 'project',
             id: 'project',
@@ -166,7 +166,7 @@ RSpec.describe Nav::TopNavHelper do
             expected_links_primary = [
               ::Gitlab::Nav::TopNavMenuItem.build(
                 data: {
-                  qa_selector: 'menu_item_link',
+                  testid: 'menu_item_link',
                   qa_title: 'View all projects',
                   **menu_data_tracking_attrs('view_all_projects')
                 },
@@ -231,7 +231,7 @@ RSpec.describe Nav::TopNavHelper do
               track_action: 'click_dropdown',
               track_label: 'groups_dropdown',
               track_property: 'navigation_top',
-              qa_selector: 'groups_dropdown'
+              testid: 'groups_dropdown'
             },
             icon: 'group',
             id: 'groups',
@@ -264,7 +264,7 @@ RSpec.describe Nav::TopNavHelper do
             expected_links_primary = [
               ::Gitlab::Nav::TopNavMenuItem.build(
                 data: {
-                  qa_selector: 'menu_item_link',
+                  testid: 'menu_item_link',
                   qa_title: 'View all groups',
                   **menu_data_tracking_attrs('view_all_groups')
                 },
@@ -375,7 +375,7 @@ RSpec.describe Nav::TopNavHelper do
       it 'has admin as first :secondary item' do
         expected_admin_item = ::Gitlab::Nav::TopNavMenuItem.build(
           data: {
-            qa_selector: 'admin_area_link',
+            testid: 'admin_area_link',
             **menu_data_tracking_attrs('admin')
           },
           id: 'admin',
@@ -408,7 +408,7 @@ RSpec.describe Nav::TopNavHelper do
         it 'has enter_admin_mode as last :secondary item' do
           expected_enter_admin_mode_item = ::Gitlab::Nav::TopNavMenuItem.build(
             data: {
-              qa_selector: 'menu_item_link',
+              testid: 'menu_item_link',
               qa_title: 'Enter admin mode',
               **menu_data_tracking_attrs('enter_admin_mode')
             },