Add latest changes from gitlab-org/gitlab@master

10 files changed, 34 insertions, 29 deletions

diff --git a/qa/Gemfile b/qa/Gemfile
index bf9def83a01..5a1493a033f 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -40,7 +40,7 @@ gem 'chemlab', '~> 0.10'
 gem 'chemlab-library-www-gitlab-com', '~> 0.1', '>= 0.1.1'
 
 # dependencies for jenkins client
-gem 'nokogiri', '~> 1.14', '>= 1.14.4'
+gem 'nokogiri', '~> 1.15'
 
 gem 'deprecation_toolkit', '~> 2.0.3', require: false
 
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index bbc06686b10..46ca11233fa 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -185,13 +185,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.0)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.14.4)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.0)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -331,7 +331,7 @@ DEPENDENCIES
   gitlab_quality-test_tooling (~> 0.4.0)
   influxdb-client (~> 2.9)
   knapsack (~> 4.0)
-  nokogiri (~> 1.14, >= 1.14.4)
+  nokogiri (~> 1.15)
   octokit (~> 6.1.1)
   parallel (~> 1.23)
   parallel_tests (~> 4.2, >= 4.2.1)
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 934aa182b12..7e0337035e3 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -17,11 +17,11 @@ module QA
           # Define alternative navbar (super sidebar) which does not yet implement all the same elements
           view 'app/assets/javascripts/super_sidebar/components/super_sidebar.vue' do
             element :navbar, required: true # TODO: rename to sidebar once it's default implementation
-            element :user_menu, required: !Runtime::Env.phone_layout?
-            element :user_avatar_content, required: !Runtime::Env.phone_layout?
           end
 
           view 'app/assets/javascripts/super_sidebar/components/user_menu.vue' do
+            element :user_menu, required: !Runtime::Env.phone_layout?
+            element :user_avatar_content, required: !Runtime::Env.phone_layout?
             element :sign_out_link
             element :edit_profile_link
           end
@@ -32,6 +32,7 @@ module QA
 
           view 'app/assets/javascripts/super_sidebar/components/user_bar.vue' do
             element :global_search_button
+            element :stop_impersonation_link
           end
 
           view 'app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue' do
@@ -252,16 +253,11 @@ module QA
         end
 
         def has_admin_area_link?(wait: Capybara.default_max_wait_time)
-          within_top_menu do
-            click_element(:navbar_dropdown, title: 'Menu')
-            has_element?(:admin_area_link, wait: wait)
-          end
-        end
+          return super if Runtime::Env.super_sidebar_enabled?
 
-        def has_no_admin_area_link?(wait: Capybara.default_max_wait_time)
           within_top_menu do
             click_element(:navbar_dropdown, title: 'Menu')
-            has_no_element?(:admin_area_link, wait: wait)
+            has_element?(:admin_area_link, wait: wait)
           end
         end
 
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/code.rb b/qa/qa/page/project/sub_menus/super_sidebar/code.rb
index 44d46725b47..fae7210e3c8 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/code.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/code.rb
@@ -36,6 +36,10 @@ module QA
               open_code_submenu('Compare revisions')
             end
 
+            def go_to_merge_requests
+              open_code_submenu('Merge requests')
+            end
+
             private
 
             def open_code_submenu(sub_menu)
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/main.rb b/qa/qa/page/project/sub_menus/super_sidebar/main.rb
index 63641248b15..bf2619737ab 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/main.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/main.rb
@@ -8,14 +8,6 @@ module QA
           module Main
             extend QA::Page::PageConcern
 
-            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
diff --git a/qa/qa/page/project/sub_menus/super_sidebar/plan.rb b/qa/qa/page/project/sub_menus/super_sidebar/plan.rb
index fe45bb6bb65..fe77789f371 100644
--- a/qa/qa/page/project/sub_menus/super_sidebar/plan.rb
+++ b/qa/qa/page/project/sub_menus/super_sidebar/plan.rb
@@ -25,6 +25,10 @@ module QA
             def go_to_open_jira
               open_plan_submenu("Open Jira")
             end
+
+            def go_to_issues
+              open_plan_submenu("Issues")
+            end
           end
         end
       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
index 1fd35e57dc2..e5f2e702e60 100644
--- a/qa/qa/page/sub_menus/super_sidebar/context_switcher.rb
+++ b/qa/qa/page/sub_menus/super_sidebar/context_switcher.rb
@@ -30,13 +30,22 @@ module QA
             go_to_context("Admin Area")
           end
 
+          def has_admin_area_link?(wait: Capybara.default_max_wait_time)
+            open_context_switcher
+
+            has_element?(:nav_item_link, submenu_item: "Admin Area", wait: wait)
+          end
+
           private
 
           def go_to_context(sub_menu)
-            click_element(:context_switcher) unless has_element?(:context_navigation, wait: 0)
-
+            open_context_switcher
             click_element(:nav_item_link, submenu_item: sub_menu)
           end
+
+          def open_context_switcher
+            click_element(:context_switcher) unless has_element?(:context_navigation, wait: 0)
+          end
         end
       end
     end
diff --git a/qa/qa/page/sub_menus/super_sidebar/manage.rb b/qa/qa/page/sub_menus/super_sidebar/manage.rb
index 535b29e607f..369171299b2 100644
--- a/qa/qa/page/sub_menus/super_sidebar/manage.rb
+++ b/qa/qa/page/sub_menus/super_sidebar/manage.rb
@@ -19,10 +19,6 @@ module QA
             open_manage_submenu('Labels')
           end
 
-          def go_to_milestones
-            open_manage_submenu('Milestones')
-          end
-
           private
 
           def open_manage_submenu(sub_menu)
diff --git a/qa/qa/page/sub_menus/super_sidebar/plan.rb b/qa/qa/page/sub_menus/super_sidebar/plan.rb
index e4b9fcf099c..839ba89cedb 100644
--- a/qa/qa/page/sub_menus/super_sidebar/plan.rb
+++ b/qa/qa/page/sub_menus/super_sidebar/plan.rb
@@ -19,6 +19,10 @@ module QA
             open_plan_submenu("Wiki")
           end
 
+          def go_to_milestones
+            open_plan_submenu('Milestones')
+          end
+
           private
 
           def open_plan_submenu(sub_menu)
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index cde36ba80c4..cc16d2dfc76 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -569,7 +569,7 @@ module QA
       end
 
       def super_sidebar_enabled?
-        enabled?(ENV['QA_SUPER_SIDEBAR_ENABLED'], default: false)
+        enabled?(ENV['QA_SUPER_SIDEBAR_ENABLED'], default: true)
       end
 
       def require_slack_env!