Fix old nav pipelines and add selectors to new sidebar shortcuts

app/assets/javascripts/nav/components/new_nav_toggle.vue

@@ -71,7 +71,12 @@ export default {
         class="gl-new-dropdown-item-text-wrapper gl-display-flex! gl-justify-content-space-between gl-align-items-center gl-py-2!"
       >
         {{ $options.i18n.toggleMenuItemLabel }}
-        <gl-toggle :value="isEnabled" :label="$options.i18n.toggleLabel" label-position="hidden" />
+        <gl-toggle
+          :value="isEnabled"
+          :label="$options.i18n.toggleLabel"
+          label-position="hidden"
+          data-testid="new-navigation-toggle"
+        />
       </div>
     </div>
   </gl-disclosure-dropdown-item>

app/assets/javascripts/super_sidebar/components/user_bar.vue

@@ -159,6 +159,7 @@ export default {
         :count="userCounts.assigned_issues"
         :href="sidebarData.issues_dashboard_path"
         :label="$options.i18n.issues"
+        data-testid="issues-shortcut-button"
         data-track-action="click_link"
         data-track-label="issues_link"
         data-track-property="nav_core_menu"
@@ -175,6 +176,7 @@ export default {
           icon="merge-request-open"
           :count="mergeRequestTotalCount"
           :label="$options.i18n.mergeRequests"
+          data-testid="merge-requests-shortcut-button"
           data-track-action="click_dropdown"
           data-track-label="merge_requests_menu"
           data-track-property="nav_core_menu"
@@ -187,7 +189,7 @@ export default {
         :count="userCounts.todos"
         :href="sidebarData.todos_dashboard_path"
         :label="$options.i18n.todoList"
-        data-testid="todos_shortcut_button"
+        data-testid="todos-shortcut-button"
         data-track-action="click_link"
         data-track-label="todos_link"
         data-track-property="nav_core_menu"

app/helpers/nav/top_nav_helper.rb

@@ -195,7 +195,7 @@ def build_view_model(builder:, project:, group:)
           active: active_nav_link?(controller: 'admin/dashboard'),
           icon: 'admin',
           href: admin_root_path,
-          data: { testid: 'admin_area_link', **menu_data_tracking_attrs(title) }
+          data: { qa_selector: 'admin_area_link', **menu_data_tracking_attrs(title) }
         )
       end
 

qa/qa/ee/page/project/sub_menus/analytics.rb

@@ -23,6 +23,22 @@ def hover_analytics
                 yield
               end
             end
+
+            def go_to_value_stream_analytics
+              hover_analytics do
+                within_submenu do
+                  click_element(:sidebar_menu_item_link, menu_item: 'Value stream')
+                end
+              end
+            end
+
+            def go_to_merge_request_analytics
+              hover_analytics do
+                within_submenu do
+                  click_element(:sidebar_menu_item_link, menu_item: 'Merge request')
+                end
+              end
+            end
           end
         end
       end

qa/qa/page/main/login.rb

@@ -103,6 +103,12 @@ def sign_in_using_ldap_credentials(user:)
             click_element :sign_in_button
           end
 
+          if Runtime::Env.super_sidebar_enabled?
+            Page::Main::Menu.perform(&:enable_new_navigation)
+          else
+            Page::Main::Menu.perform(&:disable_new_navigation)
+          end
+
           Page::Main::Menu.perform(&:signed_in?)
         end
 
@@ -263,7 +269,11 @@ def sign_in_using_gitlab_credentials(user:, skip_page_validation: false)
 
           wait_for_gitlab_to_respond
 
-          Page::Main::Menu.perform(&:enable_new_navigation) if Runtime::Env.super_sidebar_enabled?
+          if Runtime::Env.super_sidebar_enabled?
+            Page::Main::Menu.perform(&:enable_new_navigation)
+          else
+            Page::Main::Menu.perform(&:disable_new_navigation)
+          end
 
           wait_for_gitlab_to_respond
 

qa/qa/page/main/menu.rb

@@ -33,6 +33,9 @@ class Menu < Page::Base
           view 'app/assets/javascripts/super_sidebar/components/user_bar.vue' do
             element :super_sidebar_search_button
             element :stop_impersonation_btn
+            element :issues_shortcut_button, required: !Runtime::Env.phone_layout?
+            element :merge_requests_shortcut_button, required: !Runtime::Env.phone_layout?
+            element :todos_shortcut_button, required: !Runtime::Env.phone_layout?
           end
 
           view 'app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue' do
@@ -278,11 +281,23 @@ def canary?
         def enable_new_navigation
           Runtime::Logger.info("Enabling super sidebar!")
           return Runtime::Logger.info("User is not signed in, skipping") unless has_element?(:navbar, wait: 2)
+
           return Runtime::Logger.info("Super sidebar is already enabled") if has_css?('[data-testid="super-sidebar"]')
 
           within_user_menu { click_element(:new_navigation_toggle) }
         end
 
+        def disable_new_navigation
+          Runtime::Logger.info("Disabling super sidebar!")
+          return Runtime::Logger.info("User is not signed in, skipping") unless has_element?(:navbar, wait: 2)
+
+          unless has_css?('[data-testid="super-sidebar"]')
+            return Runtime::Logger.info("Super sidebar is already disabled")
+          end
+
+          within_user_menu { click_element(:new_navigation_toggle) }
+        end
+
         private
 
         def within_top_menu(&block)

qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb

@@ -43,7 +43,12 @@ module QA
 
       it(
         'allows enforcing 2FA via UI and logging in with 2FA',
-        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347931'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347931',
+        quarantine: {
+          type: :bug,
+          only: { condition: -> { !QA::Runtime::Env.super_sidebar_enabled? } },
+          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/409336'
+        }
       ) do
         enforce_two_factor_authentication_on_group(group)
 

qa/qa/vendor/saml_idp/page/login.rb

@@ -11,6 +11,12 @@ def login(username, password)
             fill_in 'username', with: username
             fill_in 'password', with: password
             click_on 'Login'
+
+            if Runtime::Env.super_sidebar_enabled?
+              QA::Page::Main::Menu.perform(&:enable_new_navigation)
+            else
+              QA::Page::Main::Menu.perform(&:disable_new_navigation)
+            end
           end
 
           def login_if_required(username, password)

spec/frontend/super_sidebar/components/user_bar_spec.js

@@ -7,7 +7,6 @@ import CreateMenu from '~/super_sidebar/components/create_menu.vue';
 import SearchModal from '~/super_sidebar/components/global_search/components/global_search.vue';
 import BrandLogo from 'jh_else_ce/super_sidebar/components/brand_logo.vue';
 import MergeRequestMenu from '~/super_sidebar/components/merge_request_menu.vue';
-import Counter from '~/super_sidebar/components/counter.vue';
 import UserBar from '~/super_sidebar/components/user_bar.vue';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -19,10 +18,9 @@ describe('UserBar component', () => {
   let wrapper;
 
   const findCreateMenu = () => wrapper.findComponent(CreateMenu);
-  const findCounter = (at) => wrapper.findAllComponents(Counter).at(at);
-  const findIssuesCounter = () => findCounter(0);
-  const findMRsCounter = () => findCounter(1);
-  const findTodosCounter = () => findCounter(2);
+  const findIssuesCounter = () => wrapper.findByTestId('issues-shortcut-button');
+  const findMRsCounter = () => wrapper.findByTestId('merge-requests-shortcut-button');
+  const findTodosCounter = () => wrapper.findByTestId('todos-shortcut-button');
   const findMergeRequestMenu = () => wrapper.findComponent(MergeRequestMenu);
   const findBrandLogo = () => wrapper.findComponent(BrandLogo);
   const findCollapseButton = () => wrapper.findByTestId('super-sidebar-collapse-button');

spec/helpers/nav/top_nav_helper_spec.rb

@@ -375,7 +375,7 @@
       it 'has admin as first :secondary item' do
         expected_admin_item = ::Gitlab::Nav::TopNavMenuItem.build(
           data: {
-            testid: 'admin_area_link',
+            qa_selector: 'admin_area_link',
             **menu_data_tracking_attrs('admin')
           },
           id: 'admin',