Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 40 insertions, 58 deletions

diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 7439bfd334b..3f3ab4218f2 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -3,89 +3,71 @@
 require 'spec_helper'
 
 RSpec.describe 'Dashboard shortcuts', :js do
-  shared_examples 'combined_menu: feature flag examples' do
-    context 'logged in' do
-      let(:user) { create(:user) }
-      let(:project) { create(:project) }
+  context 'logged in' do
+    let(:user) { create(:user) }
+    let(:project) { create(:project) }
 
-      before do
-        project.add_developer(user)
-        sign_in(user)
-        visit root_dashboard_path
-      end
+    before do
+      project.add_developer(user)
+      sign_in(user)
+      visit root_dashboard_path
+    end
 
-      it 'navigate to tabs' do
-        find('body').send_keys([:shift, 'I'])
+    it 'navigate to tabs' do
+      find('body').send_keys([:shift, 'I'])
 
-        check_page_title('Issues')
+      check_page_title('Issues')
 
-        find('body').send_keys([:shift, 'M'])
+      find('body').send_keys([:shift, 'M'])
 
-        check_page_title('Merge requests')
+      check_page_title('Merge requests')
 
-        find('body').send_keys([:shift, 'T'])
+      find('body').send_keys([:shift, 'T'])
 
-        check_page_title('To-Do List')
+      check_page_title('To-Do List')
 
-        find('body').send_keys([:shift, 'G'])
+      find('body').send_keys([:shift, 'G'])
 
-        check_page_title('Groups')
+      check_page_title('Groups')
 
-        find('body').send_keys([:shift, 'P'])
+      find('body').send_keys([:shift, 'P'])
 
-        check_page_title('Projects')
+      check_page_title('Projects')
 
-        find('body').send_keys([:shift, 'A'])
+      find('body').send_keys([:shift, 'A'])
 
-        check_page_title('Activity')
+      check_page_title('Activity')
 
-        find('body').send_keys([:shift, 'L'])
+      find('body').send_keys([:shift, 'L'])
 
-        check_page_title('Milestones')
-      end
+      check_page_title('Milestones')
     end
+  end
 
-    context 'logged out' do
-      before do
-        visit explore_root_path
-      end
-
-      it 'navigate to tabs' do
-        find('body').send_keys([:shift, 'G'])
+  context 'logged out' do
+    before do
+      visit explore_root_path
+    end
 
-        find('.nothing-here-block')
-        expect(page).to have_content('No public groups')
+    it 'navigate to tabs' do
+      find('body').send_keys([:shift, 'G'])
 
-        find('body').send_keys([:shift, 'S'])
+      find('.nothing-here-block')
+      expect(page).to have_content('No public groups')
 
-        find('.nothing-here-block')
-        expect(page).to have_content('No snippets found')
+      find('body').send_keys([:shift, 'S'])
 
-        find('body').send_keys([:shift, 'P'])
+      find('.nothing-here-block')
+      expect(page).to have_content('No snippets found')
 
-        find('.nothing-here-block')
-        expect(page).to have_content('Explore public groups to find projects to contribute to.')
-      end
-    end
+      find('body').send_keys([:shift, 'P'])
 
-    def check_page_title(title)
-      expect(find('.page-title')).to have_content(title)
+      find('.nothing-here-block')
+      expect(page).to have_content('Explore public groups to find projects to contribute to.')
     end
   end
 
-  context 'with combined_menu feature flag on' do
-    before do
-      stub_feature_flags(combined_menu: true)
-    end
-
-    it_behaves_like 'combined_menu: feature flag examples'
-  end
-
-  context 'with combined_menu feature flag off' do
-    before do
-      stub_feature_flags(combined_menu: false)
-    end
-
-    it_behaves_like 'combined_menu: feature flag examples'
+  def check_page_title(title)
+    expect(find('.page-title')).to have_content(title)
   end
 end