Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2

1 files changed, 24 insertions, 3 deletions

diff --git a/spec/features/security/admin_access_spec.rb b/spec/features/security/admin_access_spec.rb
index 38f00f399f3..8070ae066e7 100644
--- a/spec/features/security/admin_access_spec.rb
+++ b/spec/features/security/admin_access_spec.rb
@@ -8,7 +8,14 @@ RSpec.describe "Admin::Projects" do
   describe "GET /admin/projects" do
     subject { admin_projects_path }
 
-    it { is_expected.to be_allowed_for :admin }
+    context 'when admin mode is enabled', :enable_admin_mode do
+      it { is_expected.to be_allowed_for :admin }
+    end
+
+    context 'when admin mode is disabled' do
+      it { is_expected.to be_denied_for :admin }
+    end
+
     it { is_expected.to be_denied_for :user }
     it { is_expected.to be_denied_for :visitor }
   end
@@ -16,7 +23,14 @@ RSpec.describe "Admin::Projects" do
   describe "GET /admin/users" do
     subject { admin_users_path }
 
-    it { is_expected.to be_allowed_for :admin }
+    context 'when admin mode is enabled', :enable_admin_mode do
+      it { is_expected.to be_allowed_for :admin }
+    end
+
+    context 'when admin mode is disabled' do
+      it { is_expected.to be_denied_for :admin }
+    end
+
     it { is_expected.to be_denied_for :user }
     it { is_expected.to be_denied_for :visitor }
   end
@@ -24,7 +38,14 @@ RSpec.describe "Admin::Projects" do
   describe "GET /admin/hooks" do
     subject { admin_hooks_path }
 
-    it { is_expected.to be_allowed_for :admin }
+    context 'when admin mode is enabled', :enable_admin_mode do
+      it { is_expected.to be_allowed_for :admin }
+    end
+
+    context 'when admin mode is disabled' do
+      it { is_expected.to be_denied_for :admin }
+    end
+
     it { is_expected.to be_denied_for :user }
     it { is_expected.to be_denied_for :visitor }
   end