1 files changed, 81 insertions, 136 deletions

diff --git a/spec/features/admin/admin_mode_spec.rb b/spec/features/admin/admin_mode_spec.rb
index 9fd83f4af6d..24a10d3677d 100644
--- a/spec/features/admin/admin_mode_spec.rb
+++ b/spec/features/admin/admin_mode_spec.rb
@@ -2,48 +2,62 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Admin mode' do
+RSpec.describe 'Admin mode', :js do
   include MobileHelpers
   include Spec::Support::Helpers::Features::TopNavSpecHelpers
   include StubENV
 
   let(:admin) { create(:admin) }
 
-  shared_examples 'combined_menu: feature flag examples' do
+  before do
+    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
+  end
+
+  context 'application setting :admin_mode is enabled', :request_store do
     before do
-      stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
+      sign_in(admin)
     end
 
-    context 'application setting :admin_mode is enabled', :request_store do
-      before do
-        sign_in(admin)
+    context 'when not in admin mode' do
+      it 'has no leave admin mode button' do
+        visit new_admin_session_path
+        open_top_nav
+
+        page.within('.navbar-sub-nav') do
+          expect(page).not_to have_link(href: destroy_admin_session_path)
+        end
       end
 
-      context 'when not in admin mode' do
-        it 'has no leave admin mode button' do
-          visit new_admin_session_path
-          open_top_nav
+      it 'can open pages not in admin scope' do
+        visit new_admin_session_path
+        open_top_nav_projects
 
-          page.within('.navbar-sub-nav') do
-            expect(page).not_to have_link(href: destroy_admin_session_path)
-          end
+        within_top_nav do
+          click_link('Your projects')
         end
 
-        it 'can open pages not in admin scope' do
-          visit new_admin_session_path
-          open_top_nav_projects
+        expect(page).to have_current_path(dashboard_projects_path)
+      end
 
-          within_top_nav do
-            click_link('Your projects')
-          end
+      it 'is necessary to provide credentials again before opening pages in admin scope' do
+        visit general_admin_application_settings_path # admin logged out because not in admin_mode
 
-          expect(page).to have_current_path(dashboard_projects_path)
-        end
+        expect(page).to have_current_path(new_admin_session_path)
+      end
+
+      it 'can enter admin mode' do
+        visit new_admin_session_path
 
-        it 'is necessary to provide credentials again before opening pages in admin scope' do
-          visit general_admin_application_settings_path # admin logged out because not in admin_mode
+        fill_in 'user_password', with: admin.password
 
-          expect(page).to have_current_path(new_admin_session_path)
+        click_button 'Enter Admin Mode'
+
+        expect(page).to have_current_path(admin_root_path)
+      end
+
+      context 'on a read-only instance' do
+        before do
+          allow(Gitlab::Database).to receive(:read_only?).and_return(true)
         end
 
         it 'can enter admin mode' do
@@ -55,151 +69,82 @@ RSpec.describe 'Admin mode' do
 
           expect(page).to have_current_path(admin_root_path)
         end
+      end
+    end
 
-        context 'on a read-only instance' do
-          before do
-            allow(Gitlab::Database).to receive(:read_only?).and_return(true)
-          end
-
-          it 'can enter admin mode' do
-            visit new_admin_session_path
-
-            fill_in 'user_password', with: admin.password
+    context 'when in admin_mode' do
+      before do
+        gitlab_enable_admin_mode_sign_in(admin)
+      end
 
-            click_button 'Enter Admin Mode'
+      it 'contains link to leave admin mode' do
+        open_top_nav
 
-            expect(page).to have_current_path(admin_root_path)
-          end
+        within_top_nav do
+          expect(page).to have_link(href: destroy_admin_session_path)
         end
       end
 
-      context 'when in admin_mode' do
-        before do
-          gitlab_enable_admin_mode_sign_in(admin)
-        end
+      it 'can leave admin mode using main dashboard link' do
+        gitlab_disable_admin_mode
 
-        it 'contains link to leave admin mode' do
-          open_top_nav
+        open_top_nav
 
-          within_top_nav do
-            expect(page).to have_link(href: destroy_admin_session_path)
-          end
+        within_top_nav do
+          expect(page).to have_link(href: new_admin_session_path)
         end
+      end
 
-        it 'can leave admin mode using main dashboard link', :js do
-          gitlab_disable_admin_mode
-
-          open_top_nav
+      it 'can open pages not in admin scope' do
+        open_top_nav_projects
 
-          within_top_nav do
-            expect(page).to have_link(href: new_admin_session_path)
-          end
+        within_top_nav do
+          click_link('Your projects')
         end
 
-        it 'can leave admin mode using dropdown menu on smaller screens', :js do
-          skip('pending responsive development under :combined_menu feature flag') if Feature.enabled?(:combined_menu, default_enabled: :yaml)
+        expect(page).to have_current_path(dashboard_projects_path)
+      end
 
-          resize_screen_xs
+      context 'nav bar' do
+        it 'shows admin dashboard links on bigger screen' do
           visit root_dashboard_path
-
-          find('.header-more').click unless Feature.enabled?(:combined_menu, default_enabled: :yaml)
-
-          gitlab_disable_admin_mode
-
           open_top_nav
-          find('.header-more').click unless Feature.enabled?(:combined_menu, default_enabled: :yaml)
 
-          expect(page).to have_link(href: new_admin_session_path)
+          expect(page).to have_link(text: 'Admin', href: admin_root_path, visible: true)
+          expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true)
         end
+      end
 
-        it 'can open pages not in admin scope' do
-          open_top_nav_projects
-
-          within_top_nav do
-            click_link('Your projects')
-          end
-
-          expect(page).to have_current_path(dashboard_projects_path)
-        end
-
-        context 'nav bar' do
-          it 'shows admin dashboard links on bigger screen' do
-            visit root_dashboard_path
-            open_top_nav
-
-            link_text = Feature.enabled?(:combined_menu, default_enabled: :yaml) ? 'Admin' : 'Admin Area'
-            expect(page).to have_link(text: link_text, href: admin_root_path, visible: true)
-            expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true)
-          end
-
-          it 'relocates admin dashboard links to dropdown list on smaller screen', :js do
-            skip('pending responsive development under :combined_menu feature flag') if Feature.enabled?(:combined_menu, default_enabled: :yaml)
-
-            resize_screen_xs
-            visit root_dashboard_path
-
-            expect(page).not_to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true)
-
-            find('.header-more').click
-
-            page.within '.navbar' do
-              expect(page).to have_link(text: 'Admin Area', href: admin_root_path, visible: true)
-              expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true)
-            end
-          end
+      context 'on a read-only instance' do
+        before do
+          allow(Gitlab::Database).to receive(:read_only?).and_return(true)
         end
 
-        context 'on a read-only instance' do
-          before do
-            allow(Gitlab::Database).to receive(:read_only?).and_return(true)
-          end
-
-          it 'can leave admin mode', :js do
-            gitlab_disable_admin_mode
+        it 'can leave admin mode' do
+          gitlab_disable_admin_mode
 
-            open_top_nav
+          open_top_nav
 
-            within_top_nav do
-              expect(page).to have_link(href: new_admin_session_path)
-            end
+          within_top_nav do
+            expect(page).to have_link(href: new_admin_session_path)
           end
         end
       end
     end
-
-    context 'application setting :admin_mode is disabled' do
-      before do
-        stub_application_setting(admin_mode: false)
-        sign_in(admin)
-      end
-
-      it 'shows no admin mode buttons in navbar' do
-        visit admin_root_path
-        open_top_nav
-
-        expect(page).not_to have_link(href: new_admin_session_path)
-        expect(page).not_to have_link(href: destroy_admin_session_path)
-      end
-    end
   end
 
-  context 'with combined_menu feature flag on', :js do
-    let(:needs_rewrite_for_combined_menu_flag_on) { true }
-
+  context 'application setting :admin_mode is disabled' do
     before do
-      stub_feature_flags(combined_menu: true)
+      stub_application_setting(admin_mode: false)
+      sign_in(admin)
     end
 
-    it_behaves_like 'combined_menu: feature flag examples'
-  end
-
-  context 'with combined_menu feature flag off' do
-    let(:needs_rewrite_for_combined_menu_flag_on) { false }
+    it 'shows no admin mode buttons in navbar' do
+      visit admin_root_path
+      open_top_nav
 
-    before do
-      stub_feature_flags(combined_menu: false)
+      expect(page).not_to have_link(href: new_admin_session_path)
+      expect(page).not_to have_link(href: destroy_admin_session_path)
     end
-
-    it_behaves_like 'combined_menu: feature flag examples'
   end
 end