Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 42 deletions

diff --git a/qa/Gemfile b/qa/Gemfile
index 3c1dd90f8f3..ef66b1327eb 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'gitlab-qa', '~> 10', '>= 10.1.0', require: 'gitlab/qa'
+gem 'gitlab-qa', '~> 10', '>= 10.2.0', require: 'gitlab/qa'
 gem 'activesupport', '~> 6.1.7.2' # This should stay in sync with the root's Gemfile
 gem 'allure-rspec', '~> 2.20.0'
 gem 'capybara', '~> 3.39.0'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9cdf54e0920..1cd898903b8 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -102,7 +102,7 @@ GEM
     gitlab (4.18.0)
       httparty (~> 0.18)
       terminal-table (>= 1.5.1)
-    gitlab-qa (10.1.0)
+    gitlab-qa (10.2.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
@@ -318,7 +318,7 @@ DEPENDENCIES
   faraday-retry (~> 2.1)
   fog-core (= 2.1.0)
   fog-google (~> 1.19)
-  gitlab-qa (~> 10, >= 10.1.0)
+  gitlab-qa (~> 10, >= 10.2.0)
   influxdb-client (~> 2.9)
   knapsack (~> 4.0)
   nokogiri (~> 1.14, >= 1.14.3)
diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index 42dd1083bbe..dab1b93a841 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -4,81 +4,60 @@ module QA
   module Page
     module Admin
       class Menu < Page::Base
-        view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
-          element :admin_sidebar_content
-          element :admin_monitoring_menu_link
-          element :admin_monitoring_submenu_content
+        view 'lib/sidebars/admin/menus/admin_overview_menu.rb' do
           element :admin_overview_submenu_content
-          element :admin_overview_users_link
-          element :admin_overview_groups_link
-          element :admin_settings_menu_link
-          element :admin_settings_submenu_content
-          element :admin_settings_general_link
-          element :admin_settings_integrations_link
-          element :admin_settings_metrics_and_profiling_link
-          element :admin_settings_network_link
-          element :admin_settings_preferences_link
-          element :admin_settings_repository_link
+        end
+
+        view 'lib/sidebars/admin/menus/analytics_menu.rb' do
+          element :admin_sidebar_analytics_submenu_content
+        end
+
+        view 'lib/sidebars/admin/menus/monitoring_menu.rb' do
+          element :admin_monitoring_menu_link
         end
 
         def go_to_preferences_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_preferences_link
-            end
+            click_element :admin_settings_preferences_link
           end
         end
 
         def go_to_repository_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_repository_link
-            end
+            click_element :admin_settings_repository_link
           end
         end
 
         def go_to_integration_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_integrations_link
-            end
+            click_element :admin_settings_integrations_link
           end
         end
 
         def go_to_general_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_general_link
-            end
+            click_element :admin_settings_general_link
           end
         end
 
         def go_to_metrics_and_profiling_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_metrics_and_profiling_link
-            end
+            click_element :admin_settings_metrics_and_profiling_link
           end
         end
 
         def go_to_network_settings
           hover_element(:admin_settings_menu_link) do
-            within_submenu(:admin_settings_submenu_content) do
-              click_element :admin_settings_network_link
-            end
+            click_element :admin_settings_network_link
           end
         end
 
         def go_to_users_overview
-          within_submenu(:admin_overview_submenu_content) do
-            click_element :admin_overview_users_link
-          end
+          click_element :admin_overview_users_link
         end
 
         def go_to_groups_overview
-          within_submenu(:admin_overview_submenu_content) do
-            click_element :admin_overview_groups_link
-          end
+          click_element :admin_overview_groups_link
         end
 
         private
@@ -93,7 +72,7 @@ module QA
         end
 
         def within_sidebar(&block)
-          within_element(:admin_sidebar_content, &block)
+          page.within('.sidebar-top-level-items', &block)
         end
 
         def within_submenu(element, &block)