1 files changed, 70 insertions, 40 deletions

diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 338a135614d..c997598e25a 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -6,51 +6,32 @@ module QA
       class Menu < Page::Base
         include SubMenus::Common
 
-        view 'app/views/layouts/nav/sidebar/_group_menus.html.haml' do
-          element :general_settings_link
-          element :group_issues_item
-          element :group_members_item
-          element :group_milestones_link
-          element :group_settings
-          element :group_information_link
-          element :group_information_submenu
-        end
-
-        view 'app/views/groups/sidebar/_packages_settings.html.haml' do
-          element :group_package_settings_link
-        end
-
-        view 'app/views/layouts/nav/sidebar/_analytics_links.html.haml' do
-          element :analytics_link
-          element :analytics_sidebar_submenu
-        end
-
         def click_group_members_item
-          hover_element(:group_information_link) do
-            within_submenu(:group_information_submenu) do
-              click_element(:group_members_item)
+          hover_group_information do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Members')
             end
           end
         end
 
-        def click_settings
-          within_sidebar do
-            click_element(:group_settings)
+        def click_subgroup_members_item
+          hover_subgroup_information do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Members')
+            end
           end
         end
 
-        def click_contribution_analytics_item
-          hover_element(:analytics_link) do
-            within_submenu(:analytics_sidebar_submenu) do
-              click_element(:contribution_analytics_link)
-            end
+        def click_settings
+          within_sidebar do
+            click_element(:sidebar_menu_link, menu_item: 'Settings')
           end
         end
 
         def click_group_general_settings_item
-          hover_element(:group_settings) do
-            within_submenu(:group_sidebar_submenu) do
-              click_element(:general_settings_link)
+          hover_group_settings do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'General')
             end
           end
         end
@@ -58,16 +39,31 @@ module QA
         def go_to_milestones
           hover_issues do
             within_submenu do
-              click_element(:group_milestones_link)
+              click_element(:sidebar_menu_item_link, menu_item: 'Milestones')
             end
           end
         end
 
         def go_to_package_settings
-          scroll_to_element(:group_settings)
-          hover_element(:group_settings) do
-            within_submenu(:group_sidebar_submenu) do
-              click_element(:group_package_settings_link)
+          hover_group_settings do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Packages & Registries')
+            end
+          end
+        end
+
+        def go_to_group_packages
+          hover_group_packages do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Package Registry')
+            end
+          end
+        end
+
+        def go_to_dependency_proxy
+          hover_group_packages do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Dependency Proxy')
             end
           end
         end
@@ -76,8 +72,42 @@ module QA
 
         def hover_issues
           within_sidebar do
-            scroll_to_element(:group_issues_item)
-            find_element(:group_issues_item).hover
+            scroll_to_element(:sidebar_menu_link, menu_item: 'Issues')
+            find_element(:sidebar_menu_link, menu_item: 'Issues').hover
+
+            yield
+          end
+        end
+
+        def hover_group_information
+          within_sidebar do
+            find_element(:sidebar_menu_link, menu_item: 'Group information').hover
+
+            yield
+          end
+        end
+
+        def hover_subgroup_information
+          within_sidebar do
+            find_element(:sidebar_menu_link, menu_item: 'Subgroup information').hover
+
+            yield
+          end
+        end
+
+        def hover_group_packages
+          within_sidebar do
+            scroll_to_element(:sidebar_menu_link, menu_item: 'Packages & Registries')
+            find_element(:sidebar_menu_link, menu_item: 'Packages & Registries').hover
+
+            yield
+          end
+        end
+
+        def hover_group_settings
+          within_sidebar do
+            scroll_to_element(:sidebar_menu_link, menu_item: 'Settings')
+            find_element(:sidebar_menu_link, menu_item: 'Settings').hover
 
             yield
           end