1 files changed, 35 insertions, 34 deletions

diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index e55e156fb8a..3164676f8e4 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -5,78 +5,79 @@ module QA
     module Admin
       class Menu < Page::Base
         view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
-          element :admin_sidebar
-          element :admin_sidebar_settings_submenu_content
-          element :admin_settings_item
-          element :admin_settings_repository_item
-          element :admin_settings_general_item
-          element :admin_settings_metrics_and_profiling_item
+          element :admin_sidebar_content
+          element :admin_monitoring_menu_link
+          element :admin_monitoring_submenu_content
+          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_monitoring_link
-          element :admin_sidebar_monitoring_submenu_content
-          element :admin_sidebar_overview_submenu_content
-          element :users_overview_link
-          element :groups_overview_link
-          element :integration_settings_link
+          element :admin_settings_repository_link
         end
 
         def go_to_preferences_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
               click_element :admin_settings_preferences_link
             end
           end
         end
 
         def go_to_repository_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
-              click_element :admin_settings_repository_item
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
+              click_element :admin_settings_repository_link
             end
           end
         end
 
         def go_to_integration_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
-              click_element :integration_settings_link
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
+              click_element :admin_settings_integrations_link
             end
           end
         end
 
         def go_to_general_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
-              click_element :admin_settings_general_item
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
+              click_element :admin_settings_general_link
             end
           end
         end
 
         def go_to_metrics_and_profiling_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
-              click_element :admin_settings_metrics_and_profiling_item
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
+              click_element :admin_settings_metrics_and_profiling_link
             end
           end
         end
 
         def go_to_network_settings
-          hover_element(:admin_settings_item) do
-            within_submenu(:admin_sidebar_settings_submenu_content) do
-              click_element :admin_settings_network_item
+          hover_element(:admin_settings_menu_link) do
+            within_submenu(:admin_settings_submenu_content) do
+              click_element :admin_settings_network_link
             end
           end
         end
 
         def go_to_users_overview
-          within_submenu(:admin_sidebar_overview_submenu_content) do
-            click_element :users_overview_link
+          within_submenu(:admin_overview_submenu_content) do
+            click_element :admin_overview_users_link
           end
         end
 
         def go_to_groups_overview
-          within_submenu(:admin_sidebar_overview_submenu_content) do
-            click_element :groups_overview_link
+          within_submenu(:admin_overview_submenu_content) do
+            click_element :admin_overview_groups_link
           end
         end
 
@@ -92,7 +93,7 @@ module QA
         end
 
         def within_sidebar
-          within_element(:admin_sidebar) do
+          within_element(:admin_sidebar_content) do
             yield
           end
         end