Add latest changes from gitlab-org/gitlab@master

12 files changed, 85 insertions, 16 deletions

diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 46228926311..04c4f20ad18 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -10,6 +10,7 @@ module QA
           prepend Page::SubMenus::SuperSidebar::Manage
           prepend Page::SubMenus::SuperSidebar::Plan
           prepend SubMenus::SuperSidebar::Settings
+          prepend SubMenus::SuperSidebar::Main
           prepend SubMenus::SuperSidebar::Build
         end
 
diff --git a/qa/qa/page/group/sub_menus/super_sidebar/main.rb b/qa/qa/page/group/sub_menus/super_sidebar/main.rb
new file mode 100644
index 00000000000..e470c03b9e5
--- /dev/null
+++ b/qa/qa/page/group/sub_menus/super_sidebar/main.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Group
+      module SubMenus
+        module SuperSidebar
+          module Main
+            extend QA::Page::PageConcern
+
+            def self.included(base)
+              super
+
+              base.class_eval do
+                include QA::Page::SubMenus::SuperSidebar::Main
+              end
+            end
+
+            def go_to_group_overview
+              click_element(:nav_item_link, submenu_item: 'Group overview')
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index c21b1a4ca3c..fa8c0508142 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -80,10 +80,14 @@ module QA
         end
 
         def go_to_projects
+          return click_element(:nav_item_link, submenu_item: 'Projects') if Runtime::Env.super_sidebar_enabled?
+
           click_element(:sidebar_menu_link, menu_item: 'Projects')
         end
 
         def go_to_groups
+          return click_element(:nav_item_link, submenu_item: 'Groups') if Runtime::Env.super_sidebar_enabled?
+
           # Use new functionality to visit Groups where possible
           if has_element?(:sidebar_menu_link, menu_item: 'Groups')
             click_element(:sidebar_menu_link, menu_item: 'Groups')
@@ -98,6 +102,8 @@ module QA
         end
 
         def go_to_snippets
+          return click_element(:nav_item_link, submenu_item: 'Snippets') if Runtime::Env.super_sidebar_enabled?
+
           click_element(:sidebar_menu_link, menu_item: 'Snippets')
         end
 
diff --git a/qa/qa/page/profile/super_sidebar/menu.rb b/qa/qa/page/profile/super_sidebar/menu.rb
index e31f8bbec58..ade9c47313d 100644
--- a/qa/qa/page/profile/super_sidebar/menu.rb
+++ b/qa/qa/page/profile/super_sidebar/menu.rb
@@ -6,19 +6,23 @@ module QA
       module SuperSidebar
         module Menu
           def click_ssh_keys
-            click_element(:sidebar_menu_link, menu_item: 'SSH Keys')
+            click_element(:nav_item_link, submenu_item: 'SSH Keys')
           end
 
           def click_account
-            click_element(:sidebar_menu_link, menu_item: 'Account')
+            click_element(:nav_item_link, submenu_item: 'Account')
           end
 
           def click_emails
-            click_element(:sidebar_menu_link, menu_item: 'Emails')
+            click_element(:nav_item_link, submenu_item: 'Emails')
           end
 
           def click_password
-            click_element(:sidebar_menu_link, menu_item: 'Password')
+            click_element(:nav_item_link, submenu_item: 'Password')
+          end
+
+          def click_access_tokens
+            click_element(:nav_item_link, submenu_item: 'Access Tokens')
           end
         end
       end
diff --git a/qa/qa/page/project/menu.rb b/qa/qa/page/project/menu.rb
index 4f91484e5a8..025102e29e6 100644
--- a/qa/qa/page/project/menu.rb
+++ b/qa/qa/page/project/menu.rb
@@ -18,13 +18,13 @@ module QA
 
         if Runtime::Env.super_sidebar_enabled?
           include Page::SubMenus::SuperSidebar::Manage
-          include SubMenus::SuperSidebar::Project
           include SubMenus::SuperSidebar::Plan
           include SubMenus::SuperSidebar::Settings
           include SubMenus::SuperSidebar::Code
           include SubMenus::SuperSidebar::Build
           include SubMenus::SuperSidebar::Operate
           include SubMenus::SuperSidebar::Monitor
+          include SubMenus::SuperSidebar::Main
         end
 
         def click_merge_requests
diff --git a/qa/qa/page/project/sub_menus/issues.rb b/qa/qa/page/project/sub_menus/issues.rb
index 48840c29635..b5b918e076d 100644
--- a/qa/qa/page/project/sub_menus/issues.rb
+++ b/qa/qa/page/project/sub_menus/issues.rb
@@ -15,7 +15,7 @@ module QA
             end
           end
 
-          def click_issues
+          def go_to_issues
             within_sidebar do
               click_element(:sidebar_menu_link, menu_item: 'Issues')
             end
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/project.rb b/qa/qa/page/project/sub_menus/super_sidebar/main.rb
index 0d2df959548..63641248b15 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/project.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/main.rb
@@ -5,14 +5,20 @@ module QA
     module Project
       module SubMenus
         module SuperSidebar
-          module Project
+          module Main
             extend QA::Page::PageConcern
 
-            def click_project
-              within_sidebar do
-                click_element(:sidebar_menu_link, menu_item: 'Project overview')
+            def self.included(base)
+              super
+
+              base.class_eval do
+                include QA::Page::SubMenus::SuperSidebar::Main
               end
             end
+
+            def click_project
+              click_element(:nav_item_link, submenu_item: 'Project overview')
+            end
           end
         end
       end
diff --git a/qa/qa/page/sub_menus/super_sidebar/main.rb b/qa/qa/page/sub_menus/super_sidebar/main.rb
new file mode 100644
index 00000000000..aadb24369ea
--- /dev/null
+++ b/qa/qa/page/sub_menus/super_sidebar/main.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module SubMenus
+      module SuperSidebar
+        module Main
+          extend QA::Page::PageConcern
+
+          def go_to_issues
+            click_element(:nav_item_link, submenu_item: 'Issues')
+          end
+
+          def go_to_merge_requests
+            click_element(:nav_item_link, submenu_item: 'Merge requests')
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
index b5a8df15ddc..d92d8de5567 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
@@ -37,7 +37,11 @@ module QA
           end
         end
 
-        it 'imports a project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347877' do
+        it 'imports a project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347877',
+          quarantine: {
+            issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/405127',
+            type: :investigating
+          } do
           Page::Project::Import::Github.perform do |import_page|
             import_page.add_personal_access_token(Runtime::Env.github_access_token)
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
index 9132b262b51..f4042795995 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
@@ -18,7 +18,7 @@ module QA
         set_up_jira_integration
         import_jira_issues
 
-        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Menu.perform(&:go_to_issues)
         Page::Project::Issue::Index.perform do |issues_page|
           expect { issues_page }.to eventually_have_content(jira_issue_title).within(
             max_attempts: 5, sleep_interval: 1, reload_page: issues_page
@@ -56,7 +56,7 @@ module QA
       end
 
       def import_jira_issues
-        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Menu.perform(&:go_to_issues)
         Page::Project::Issue::Index.perform(&:go_to_jira_import_form)
 
         Page::Project::Issue::JiraImport.perform do |form|
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index e2fd0ec9cef..821f885c4c8 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -26,7 +26,7 @@ module QA
       ) do
         issue = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
 
-        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Menu.perform(&:go_to_issues)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_issue(issue)
@@ -46,7 +46,7 @@ module QA
           expect(issue_page).to have_reopen_issue_button
         end
 
-        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Menu.perform(&:go_to_issues)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).not_to have_issue(closed_issue)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
index 61fd743f920..275f3a52f17 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
@@ -19,7 +19,7 @@ module QA
         end
 
         project.visit!
-        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Menu.perform(&:go_to_issues)
       end
 
       it 'successfully exports issues list as CSV', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347968' do