Merge branch 'thutterer/switch-specs-to-new-nav-1' into 'master'

Switch tests over to use the new navigation

See merge request !134253



Merged-by: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Approved-by: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Approved-by: Serena Fang <sfang@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>

spec/features/ide/user_opens_merge_request_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'IDE merge request', :js, feature_category: :web_ide do
-  let_it_be(:user) { create(:user, :no_super_sidebar) }
+  let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public, :repository, namespace: user.namespace) }
   let_it_be(:merge_request) { create(:merge_request, :simple, source_project: project) }
 
@@ -16,7 +16,9 @@
   end
 
   it 'user opens merge request' do
-    click_button 'Code'
+    within '.merge-request' do
+      click_button 'Code'
+    end
     click_link 'Open in Web IDE'
 
     wait_for_requests

spec/features/invites_spec.rb

@@ -59,7 +59,7 @@ def fill_in_welcome_form
       end
 
       context 'when invite is sent before account is created;ldap or service sign in for manual acceptance edge case' do
-        let(:user) { create(:user, :no_super_sidebar, email: 'user@example.com') }
+        let(:user) { create(:user, email: 'user@example.com') }
 
         context 'when invite clicked and not signed in' do
           before do
@@ -85,7 +85,6 @@ def fill_in_welcome_form
 
             it 'shows message user already a member' do
               expect(page).to have_current_path(invite_path(group_invite.raw_invite_token), ignore_query: true)
-              expect(page).to have_link(user.name, href: user_path(user))
               expect(page).to have_content('You are already a member of this group.')
             end
           end

spec/features/issues/service_desk_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe 'Service Desk Issue Tracker', :js, feature_category: :service_desk do
   let(:project) { create(:project, :private, service_desk_enabled: true) }
 
-  let_it_be(:user) { create(:user, :no_super_sidebar) }
+  let_it_be(:user) { create(:user) }
   let_it_be(:support_bot) { Users::Internal.support_bot }
 
   before do
@@ -21,8 +21,10 @@
   describe 'navigation to service desk' do
     before do
       visit project_path(project)
-      find('.sidebar-top-level-items .shortcuts-issues').click
-      find('.sidebar-sub-level-items a', text: 'Service Desk').click
+      find('#menu-section-button-monitor').click
+      within('#monitor') do
+        click_link('Service Desk')
+      end
     end
 
     it 'can navigate to the service desk from link in the sidebar' do

spec/features/issues/todo_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe 'Manually create a todo item from issue', :js, feature_category: :team_planning do
   let!(:project) { create(:project) }
   let!(:issue)   { create(:issue, project: project) }
-  let!(:user)    { create(:user, :no_super_sidebar) }
+  let!(:user)    { create(:user) }
 
   before do
     stub_feature_flags(notifications_todos_buttons: false)
@@ -20,13 +20,13 @@
       expect(page).to have_content 'Mark as done'
     end
 
-    page.within ".header-content span[aria-label='#{_('Todos count')}']" do
+    within_testid 'todos-shortcut-button' do
       expect(page).to have_content '1'
     end
 
     visit project_issue_path(project, issue)
 
-    page.within ".header-content span[aria-label='#{_('Todos count')}']" do
+    within_testid 'todos-shortcut-button' do
       expect(page).to have_content '1'
     end
   end
@@ -37,10 +37,10 @@
       click_button 'Mark as done'
     end
 
-    expect(page).to have_selector(".header-content span[aria-label='#{_('Todos count')}']", visible: false)
+    expect(page).to have_selector("[data-testid='todos-shortcut-button']", text: '')
 
     visit project_issue_path(project, issue)
 
-    expect(page).to have_selector(".header-content span[aria-label='#{_('Todos count')}']", visible: false)
+    expect(page).to have_selector("[data-testid='todos-shortcut-button']", text: '')
   end
 end

spec/features/users/terms_spec.rb

@@ -27,7 +27,7 @@
   end
 
   context 'when user is a project bot' do
-    let(:project_bot) { create(:user, :no_super_sidebar, :project_bot) }
+    let(:project_bot) { create(:user, :project_bot) }
 
     before do
       enforce_terms
@@ -42,7 +42,7 @@
   end
 
   context 'when user is a service account' do
-    let(:service_account) { create(:user, :no_super_sidebar, :service_account) }
+    let(:service_account) { create(:user, :service_account) }
 
     before do
       enforce_terms
@@ -57,7 +57,7 @@
   end
 
   context 'when signed in' do
-    let(:user) { create(:user, :no_super_sidebar) }
+    let(:user) { create(:user) }
 
     before do
       sign_in(user)
@@ -115,7 +115,7 @@
 
         # Application settings are cached for a minute
         travel_to 2.minutes.from_now do
-          within('.nav-sidebar') do
+          within('.contextual-nav') do
             click_link 'Issues'
           end