Add latest changes from gitlab-org/gitlab@master

10 files changed, 176 insertions, 45 deletions

diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index dab1b93a841..dc6fbb6c081 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -4,6 +4,13 @@ module QA
   module Page
     module Admin
       class Menu < Page::Base
+        include SubMenus::Common
+
+        if QA::Runtime::Env.super_sidebar_enabled?
+          prepend Sidebar::Overview
+          prepend Sidebar::Settings
+        end
+
         view 'lib/sidebars/admin/menus/admin_overview_menu.rb' do
           element :admin_overview_submenu_content
         end
diff --git a/qa/qa/page/admin/sidebar/overview.rb b/qa/qa/page/admin/sidebar/overview.rb
new file mode 100644
index 00000000000..5bd542a2e52
--- /dev/null
+++ b/qa/qa/page/admin/sidebar/overview.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Sidebar
+        module Overview
+          def go_to_users_overview
+            open_overview_submenu("Users")
+          end
+
+          def go_to_groups_overview
+            open_overview_submenu("Groups")
+          end
+
+          private
+
+          def open_overview_submenu(sub_menu)
+            open_submenu("Overview", sub_menu)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/admin/sidebar/settings.rb b/qa/qa/page/admin/sidebar/settings.rb
new file mode 100644
index 00000000000..1eb6ac2c119
--- /dev/null
+++ b/qa/qa/page/admin/sidebar/settings.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Sidebar
+        module Settings
+          def go_to_preferences_settings
+            open_settings_submenu("Preferences")
+          end
+
+          def go_to_repository_settings
+            open_settings_submenu("Repository")
+          end
+
+          def go_to_integration_settings
+            open_settings_submenu("Integration")
+          end
+
+          def go_to_general_settings
+            open_settings_submenu("General")
+          end
+
+          def go_to_metrics_and_profiling_settings
+            open_settings_submenu("Metrics and profiling")
+          end
+
+          def go_to_network_settings
+            open_settings_submenu("Network")
+          end
+
+          private
+
+          def open_settings_submenu(sub_menu)
+            open_submenu("Settings", sub_menu)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 04c4f20ad18..490b16a53fd 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -9,7 +9,7 @@ module QA
         if Runtime::Env.super_sidebar_enabled?
           prepend Page::SubMenus::SuperSidebar::Manage
           prepend Page::SubMenus::SuperSidebar::Plan
-          prepend SubMenus::SuperSidebar::Settings
+          prepend Page::SubMenus::SuperSidebar::Settings
           prepend SubMenus::SuperSidebar::Main
           prepend SubMenus::SuperSidebar::Build
         end
diff --git a/qa/qa/page/group/sub_menus/super_sidebar/settings.rb b/qa/qa/page/group/sub_menus/super_sidebar/settings.rb
deleted file mode 100644
index 7f94e3c378b..00000000000
--- a/qa/qa/page/group/sub_menus/super_sidebar/settings.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Group
-      module SubMenus
-        module SuperSidebar
-          module Settings
-            extend QA::Page::PageConcern
-
-            def go_to_general_settings
-              open_settings_submenu("General")
-            end
-
-            private
-
-            def open_settings_submenu(sub_menu)
-              open_submenu("Settings", sub_menu)
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index b254b135dda..ad722e85cdd 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -5,7 +5,11 @@ module QA
     module Main
       class Menu < Page::Base
         prepend Mobile::Page::Main::Menu if Runtime::Env.mobile_layout?
-        prepend SubMenus::CreateNewMenu if Runtime::Env.super_sidebar_enabled?
+
+        if Runtime::Env.super_sidebar_enabled?
+          prepend SubMenus::CreateNewMenu
+          include SubMenus::SuperSidebar::ContextSwitcher
+        end
 
         if QA::Runtime::Env.super_sidebar_enabled?
           # Define alternative navbar (super sidebar) which does not yet implement all the same elements
@@ -144,7 +148,7 @@ module QA
         end
 
         def go_to_admin_area
-          click_admin_area
+          Runtime::Env.super_sidebar_enabled? ? super : click_admin_area
 
           return unless has_text?('Enter Admin Mode', wait: 1.0)
 
diff --git a/qa/qa/page/project/menu.rb b/qa/qa/page/project/menu.rb
index 025102e29e6..23b3ee61077 100644
--- a/qa/qa/page/project/menu.rb
+++ b/qa/qa/page/project/menu.rb
@@ -28,6 +28,8 @@ module QA
         end
 
         def click_merge_requests
+          return go_to_merge_requests if Runtime::Env.super_sidebar_enabled?
+
           within_sidebar do
             click_element(:sidebar_menu_link, menu_item: 'Merge requests')
           end
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/settings.rb b/qa/qa/page/project/sub_menus/super_sidebar/settings.rb
index 2d5ad29207f..3aca6cf00af 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/settings.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/settings.rb
@@ -8,30 +8,18 @@ module QA
           module Settings
             extend QA::Page::PageConcern
 
-            def go_to_general_settings
-              open_settings_submenu('General')
-            end
-
-            def go_to_integrations_settings
-              open_settings_submenu('Integrations')
-            end
+            def self.included(base)
+              super
 
-            def go_to_access_token_settings
-              open_settings_submenu('Access Tokens')
-            end
-
-            def go_to_repository_settings
-              open_settings_submenu('Repository')
+              base.class_eval do
+                include QA::Page::SubMenus::SuperSidebar::Settings
+              end
             end
 
             def go_to_merge_request_settings
               open_settings_submenu('Merge requests')
             end
 
-            def go_to_ci_cd_settings
-              open_settings_submenu('CI/CD')
-            end
-
             def go_to_pages_settings
               open_settings_submenu('Pages')
             end
diff --git a/qa/qa/page/sub_menus/super_sidebar/context_switcher.rb b/qa/qa/page/sub_menus/super_sidebar/context_switcher.rb
new file mode 100644
index 00000000000..fcfc1e1c76c
--- /dev/null
+++ b/qa/qa/page/sub_menus/super_sidebar/context_switcher.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module SubMenus
+      module SuperSidebar
+        module ContextSwitcher
+          extend QA::Page::PageConcern
+
+          def self.prepended(base)
+            super
+
+            base.class_eval do
+              view 'app/assets/javascripts/super_sidebar/components/super_sidebar.vue' do
+                element :context_switcher
+                element :context_section
+              end
+            end
+          end
+
+          def go_to_your_work
+            go_to_context("Your work")
+          end
+
+          def go_to_explore
+            go_to_context("Explore")
+          end
+
+          def go_to_admin_area
+            go_to_context("Admin")
+          end
+
+          private
+
+          def go_to_context(sub_menu)
+            click_element(:context_switcher) unless has_element?(:context_section, wait: 0)
+
+            within_element(:context_section) do
+              click_element(:nav_item_link, submenu_item: sub_menu)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/sub_menus/super_sidebar/settings.rb b/qa/qa/page/sub_menus/super_sidebar/settings.rb
new file mode 100644
index 00000000000..910e1c2ffdf
--- /dev/null
+++ b/qa/qa/page/sub_menus/super_sidebar/settings.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module SubMenus
+      module SuperSidebar
+        module Settings
+          extend QA::Page::PageConcern
+
+          def go_to_general_settings
+            open_settings_submenu('General')
+          end
+
+          def go_to_integrations_settings
+            open_settings_submenu('Integrations')
+          end
+
+          def go_to_webhooks_settings
+            open_settings_submenu('Webhooks')
+          end
+
+          def go_to_access_token_settings
+            open_settings_submenu('Access Tokens')
+          end
+
+          def go_to_repository_settings
+            open_settings_submenu('Repository')
+          end
+
+          def go_to_ci_cd_settings
+            open_settings_submenu('CI/CD')
+          end
+
+          private
+
+          def open_settings_submenu(sub_menu)
+            open_submenu('Settings', sub_menu)
+          end
+        end
+      end
+    end
+  end
+end