Add latest changes from gitlab-org/gitlab@master

19 files changed, 83 insertions, 16 deletions

diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index 6ef59e118fb..f58d672efe8 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -68,6 +68,8 @@ module QA
         end
 
         def go_to_applications
+          return click_element(:nav_item_link, submenu_item: 'Applications') if Runtime::Env.super_sidebar_enabled?
+
           click_element(:sidebar_menu_link, menu_item: 'Applications')
         end
 
diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 490b16a53fd..157bc3abaf6 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -12,6 +12,7 @@ module QA
           prepend Page::SubMenus::SuperSidebar::Settings
           prepend SubMenus::SuperSidebar::Main
           prepend SubMenus::SuperSidebar::Build
+          prepend SubMenus::SuperSidebar::Operate
         end
 
         def click_group_members_item
@@ -73,6 +74,8 @@ module QA
         end
 
         def go_to_group_packages
+          return go_to_package_registry if Runtime::Env.super_sidebar_enabled?
+
           hover_group_packages do
             within_submenu do
               click_element(:sidebar_menu_item_link, menu_item: 'Package Registry')
diff --git a/qa/qa/page/group/sub_menus/super_sidebar/operate.rb b/qa/qa/page/group/sub_menus/super_sidebar/operate.rb
new file mode 100644
index 00000000000..640e1e969de
--- /dev/null
+++ b/qa/qa/page/group/sub_menus/super_sidebar/operate.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Group
+      module SubMenus
+        module SuperSidebar
+          module Operate
+            extend QA::Page::PageConcern
+
+            def self.prepended(base)
+              super
+
+              base.class_eval do
+                include QA::Page::SubMenus::SuperSidebar::Operate
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/project/sub_menus/packages.rb b/qa/qa/page/project/sub_menus/packages.rb
index aaa4a2d2f66..9f3446bfd39 100644
--- a/qa/qa/page/project/sub_menus/packages.rb
+++ b/qa/qa/page/project/sub_menus/packages.rb
@@ -7,7 +7,7 @@ module QA
         module Packages
           extend QA::Page::PageConcern
 
-          def click_packages_link
+          def go_to_package_registry
             hover_registry do
               within_submenu do
                 click_element(:sidebar_menu_item_link, menu_item: 'Package Registry')
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/operate.rb b/qa/qa/page/project/sub_menus/super_sidebar/operate.rb
index 1974d5a4c64..8191f2263ef 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/operate.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/operate.rb
@@ -8,8 +8,12 @@ module QA
           module Operate
             extend QA::Page::PageConcern
 
-            def go_to_package_registry
-              open_operate_submenu('Package Registry')
+            def self.included(base)
+              super
+
+              base.class_eval do
+                include QA::Page::SubMenus::SuperSidebar::Operate
+              end
             end
 
             def go_to_infrastructure_registry
diff --git a/qa/qa/page/sub_menus/super_sidebar/operate.rb b/qa/qa/page/sub_menus/super_sidebar/operate.rb
new file mode 100644
index 00000000000..1ffbb6872da
--- /dev/null
+++ b/qa/qa/page/sub_menus/super_sidebar/operate.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module SubMenus
+      module SuperSidebar
+        module Operate
+          extend QA::Page::PageConcern
+
+          def go_to_package_registry
+            open_operate_submenu('Package Registry')
+          end
+
+          def go_to_container_registry
+            open_operate_submenu('Container Registry')
+          end
+
+          def go_to_dependency_proxy
+            open_operate_submenu('Dependency proxy')
+          end
+
+          private
+
+          def open_operate_submenu(sub_menu)
+            open_submenu('Operate', sub_menu)
+          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
index 910e1c2ffdf..ff38ab2b043 100644
--- a/qa/qa/page/sub_menus/super_sidebar/settings.rb
+++ b/qa/qa/page/sub_menus/super_sidebar/settings.rb
@@ -31,6 +31,10 @@ module QA
             open_settings_submenu('CI/CD')
           end
 
+          def go_to_package_settings
+            open_settings_submenu('Packages and registries')
+          end
+
           private
 
           def open_settings_submenu(sub_menu)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
index 0dce0022b38..d0bae3cfa98 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
@@ -72,7 +72,7 @@ module QA
       end
 
       it 'publishes a composer package and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348016' do
-        Page::Project::Menu.perform(&:click_packages_link)
+        Page::Project::Menu.perform(&:go_to_package_registry)
 
         Page::Project::Packages::Index.perform do |index|
           expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
index 39c2121331d..bedd447f6ec 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
@@ -69,7 +69,7 @@ module QA
           expect(job).to be_successful(timeout: 800)
         end
 
-        Page::Project::Menu.perform(&:click_packages_link)
+        Page::Project::Menu.perform(&:go_to_package_registry)
 
         Page::Project::Packages::Index.perform do |index|
           expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
index d6fb52cfea9..c4a1663f36e 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
@@ -83,7 +83,7 @@ module QA
       end
 
       it 'uploads a generic package and downloads it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348017' do
-        Page::Project::Menu.perform(&:click_packages_link)
+        Page::Project::Menu.perform(&:go_to_package_registry)
 
         Page::Project::Packages::Index.perform do |index|
           expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
index 6252a287fd4..6cf6a77ab74 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
@@ -73,7 +73,7 @@ module QA
             expect(job).to be_successful(timeout: 800)
           end
 
-          Page::Project::Menu.perform(&:click_packages_link)
+          Page::Project::Menu.perform(&:go_to_package_registry)
 
           Page::Project::Packages::Index.perform do |index|
             expect(index).to have_package(package_name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb
index 879bb7022c8..f8ab9ef15ab 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb
@@ -92,7 +92,7 @@ module QA
               expect(job).to be_successful(timeout: 800)
             end
 
-            Page::Project::Menu.perform(&:click_packages_link)
+            Page::Project::Menu.perform(&:go_to_package_registry)
 
             Page::Project::Packages::Index.perform do |index|
               expect(index).to have_package(package_name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
index c69b672a2ec..b70ec0bafbc 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
@@ -134,7 +134,7 @@ module QA
             expect(job).to be_successful(timeout: 800)
           end
 
-          Page::Project::Menu.perform(&:click_packages_link)
+          Page::Project::Menu.perform(&:go_to_package_registry)
 
           Page::Project::Packages::Index.perform do |index|
             expect(index).to have_package(package_name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
index 9a418f11b1b..423304051a2 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
@@ -61,7 +61,7 @@ module QA
             expect(job).to be_successful(timeout: 800)
           end
 
-          Page::Project::Menu.perform(&:click_packages_link)
+          Page::Project::Menu.perform(&:go_to_package_registry)
 
           Page::Project::Packages::Index.perform do |index|
             expect(index).to have_package(package_name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
index 92dee63e37a..4a8b95717d0 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
@@ -153,7 +153,7 @@ module QA
             end
 
             project.visit!
-            Page::Project::Menu.perform(&:click_packages_link)
+            Page::Project::Menu.perform(&:go_to_package_registry)
 
             Page::Project::Packages::Index.perform do |index|
               expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
index 29cdd5b9362..e913df0957d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
@@ -126,7 +126,7 @@ module QA
             end
 
             project.visit!
-            Page::Project::Menu.perform(&:click_packages_link)
+            Page::Project::Menu.perform(&:go_to_package_registry)
 
             Page::Project::Packages::Index.perform do |index|
               expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
index 038decddd96..ad5835d8c9d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
@@ -174,7 +174,7 @@ product_group: :package_registry do
             expect(job).to be_successful(timeout: 800)
           end
 
-          Page::Project::Menu.perform(&:click_packages_link)
+          Page::Project::Menu.perform(&:go_to_package_registry)
 
           Page::Project::Packages::Index.perform do |index|
             expect(index).to have_package(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
index 12e9d3e995f..4e072412bd4 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
@@ -92,7 +92,7 @@ module QA
 
       context 'when at the project level' do
         it 'publishes and installs a pypi package', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348015' do
-          Page::Project::Menu.perform(&:click_packages_link)
+          Page::Project::Menu.perform(&:go_to_package_registry)
 
           Page::Project::Packages::Index.perform do |index|
             expect(index).to have_package(package.name)
@@ -112,7 +112,7 @@ module QA
               dashboard.go_to_project(project.name)
             end
 
-            Page::Project::Menu.perform(&:click_packages_link)
+            Page::Project::Menu.perform(&:go_to_package_registry)
 
             Page::Project::Packages::Index.perform do |index|
               index.wait_for_package_replication(package.name)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
index b80eb3a688e..1af1fc7c231 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
@@ -89,7 +89,7 @@ module QA
           expect(job).to be_successful(timeout: 800)
         end
 
-        Page::Project::Menu.perform(&:click_packages_link)
+        Page::Project::Menu.perform(&:go_to_package_registry)
 
         Page::Project::Packages::Index.perform do |index|
           expect(index).to have_package(package.name)