Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 12 deletions

diff --git a/qa/qa/page/group/sub_menus/common.rb b/qa/qa/page/group/sub_menus/common.rb
index 2f8a3fdeb4e..3cbca3db359 100644
--- a/qa/qa/page/group/sub_menus/common.rb
+++ b/qa/qa/page/group/sub_menus/common.rb
@@ -21,7 +21,7 @@ module QA
           private
 
           def sidebar_element
-            :group_sidebar
+            QA::Runtime::Env.super_sidebar_enabled? ? :navbar : :group_sidebar
           end
         end
       end
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 0b258c9ee34..bc99aa14b0d 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -6,12 +6,6 @@ module QA
       class Menu < Page::Base
         prepend Mobile::Page::Main::Menu if Runtime::Env.mobile_layout?
 
-        view 'app/views/layouts/header/_current_user_dropdown.html.haml' do
-          element :sign_out_link
-          element :edit_profile_link
-          element :user_profile_link
-        end
-
         if QA::Runtime::Env.super_sidebar_enabled?
           # 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
@@ -19,6 +13,11 @@ module QA
             element :user_menu, required: !QA::Runtime::Env.mobile_layout?
             element :user_avatar_content, required: !QA::Runtime::Env.mobile_layout?
           end
+
+          view 'app/assets/javascripts/super_sidebar/components/user_menu.vue' do
+            element :sign_out_link
+            element :edit_profile_link
+          end
         else
           view 'app/views/layouts/header/_default.html.haml' do
             element :navbar, required: true
@@ -30,6 +29,12 @@ module QA
             element :merge_requests_shortcut_button, required: !QA::Runtime::Env.mobile_layout?
             element :todos_shortcut_button, required: !QA::Runtime::Env.mobile_layout?
           end
+
+          view 'app/views/layouts/header/_current_user_dropdown.html.haml' do
+            element :sign_out_link
+            element :edit_profile_link
+            element :user_profile_link
+          end
         end
 
         view 'app/assets/javascripts/nav/components/top_nav_app.vue' do
@@ -100,6 +105,8 @@ module QA
         end
 
         def go_to_menu_dropdown_option(option_name)
+          return click_element(option_name) if QA::Runtime::Env.super_sidebar_enabled?
+
           within_top_menu do
             click_element(:navbar_dropdown, title: 'Menu')
             click_element(option_name)
diff --git a/qa/qa/page/project/sub_menus/common.rb b/qa/qa/page/project/sub_menus/common.rb
index 112f49a90ee..79054ec9802 100644
--- a/qa/qa/page/project/sub_menus/common.rb
+++ b/qa/qa/page/project/sub_menus/common.rb
@@ -29,7 +29,7 @@ module QA
           private
 
           def sidebar_element
-            :project_sidebar
+            QA::Runtime::Env.super_sidebar_enabled? ? :navbar : :project_sidebar
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_content_creation_spec.rb b/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_content_creation_spec.rb
index feb0f28763c..2b04ede25b0 100644
--- a/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_content_creation_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/project_wiki/project_based_content_creation_spec.rb
@@ -15,7 +15,7 @@ module QA
       end
 
       it 'by adding a home page to the wiki',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347809' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347809' do
         project.visit!
 
         Page::Project::Menu.perform(&:click_wiki)
@@ -36,7 +36,7 @@ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347809' do
       end
 
       it 'by adding a second page to the wiki',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347808' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347808' do
         wiki.visit!
 
         Page::Project::Wiki::Show.perform(&:click_new_page)
@@ -56,7 +56,7 @@ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347808' do
       end
 
       it 'by adding a home page to the wiki using git push',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347806' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347806' do
         empty_wiki = Resource::Wiki::ProjectPage.new do |empty_wiki|
           empty_wiki.project = project
         end
@@ -76,7 +76,7 @@ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347806' do
       end
 
       it 'by adding a second page to the wiki using git push',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347807' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347807' do
         Resource::Repository::WikiPush.fabricate! do |push|
           push.file_name = "#{new_wiki_title}.md"
           push.file_content = new_wiki_content