1 files changed, 25 insertions, 47 deletions
diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
index 3dd993b4bb5..6861fac3cc2 100644
--- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
+++ b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
@@ -2,66 +2,44 @@
 
 require 'spec_helper'
 
-RSpec.describe 'The group dashboard' do
+RSpec.describe 'The group dashboard', :js do
   include ExternalAuthorizationServiceHelpers
   include Spec::Support::Helpers::Features::TopNavSpecHelpers
 
   let(:user) { create(:user) }
 
-  shared_examples 'combined_menu: feature flag examples' do
-    before do
-      sign_in user
-    end
-
-    describe 'The top navigation' do
-      it 'has all the expected links' do
-        visit dashboard_groups_path
-
-        open_top_nav
-
-        within_top_nav do
-          expect(page).to have_button('Projects')
-          expect(page).to have_button('Groups')
-          expect(page).to have_link('Activity')
-          expect(page).to have_link('Milestones')
-          expect(page).to have_link('Snippets')
-        end
-      end
+  before do
+    sign_in user
+  end
 
-      it 'hides some links when an external authorization service is enabled' do
-        enable_external_authorization_service_check
-        visit dashboard_groups_path
+  describe 'The top navigation' do
+    it 'has all the expected links' do
+      visit dashboard_groups_path
 
-        open_top_nav
+      open_top_nav
 
-        within_top_nav do
-          expect(page).to have_button('Projects')
-          expect(page).to have_button('Groups')
-          expect(page).not_to have_link('Activity')
-          expect(page).not_to have_link('Milestones')
-          expect(page).to have_link('Snippets')
-        end
+      within_top_nav do
+        expect(page).to have_button('Projects')
+        expect(page).to have_button('Groups')
+        expect(page).to have_link('Activity')
+        expect(page).to have_link('Milestones')
+        expect(page).to have_link('Snippets')
       end
     end
-  end
 
-  context 'with combined_menu feature flag on', :js do
-    let(:needs_rewrite_for_combined_menu_flag_on) { true }
+    it 'hides some links when an external authorization service is enabled' do
+      enable_external_authorization_service_check
+      visit dashboard_groups_path
 
-    before do
-      stub_feature_flags(combined_menu: true)
-    end
-
-    it_behaves_like 'combined_menu: feature flag examples'
-  end
+      open_top_nav
 
-  context 'with combined_menu feature flag off' do
-    let(:needs_rewrite_for_combined_menu_flag_on) { false }
-
-    before do
-      stub_feature_flags(combined_menu: false)
+      within_top_nav do
+        expect(page).to have_button('Projects')
+        expect(page).to have_button('Groups')
+        expect(page).not_to have_link('Activity')
+        expect(page).not_to have_link('Milestones')
+        expect(page).to have_link('Snippets')
+      end
     end
-
-    it_behaves_like 'combined_menu: feature flag examples'
   end
 end