Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 24 deletions

diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb
index 4954eafe338..65bd335dd7e 100644
--- a/spec/policies/global_policy_spec.rb
+++ b/spec/policies/global_policy_spec.rb
@@ -372,35 +372,13 @@ RSpec.describe GlobalPolicy do
 
   describe 'read instance statistics' do
     context 'regular user' do
-      it { is_expected.to be_allowed(:read_instance_statistics) }
-
-      context 'when instance statistics are set to private' do
-        before do
-          stub_application_setting(instance_statistics_visibility_private: true)
-        end
-
-        it { is_expected.not_to be_allowed(:read_instance_statistics) }
-      end
+      it { is_expected.to be_disallowed(:read_instance_statistics) }
     end
 
-    context 'admin' do
+    context 'admin', :enable_admin_mode do
       let(:current_user) { create(:admin) }
 
       it { is_expected.to be_allowed(:read_instance_statistics) }
-
-      context 'when instance statistics are set to private' do
-        before do
-          stub_application_setting(instance_statistics_visibility_private: true)
-        end
-
-        context 'when admin mode is enabled', :enable_admin_mode do
-          it { is_expected.to be_allowed(:read_instance_statistics) }
-        end
-
-        context 'when admin mode is disabled' do
-          it { is_expected.to be_disallowed(:read_instance_statistics) }
-        end
-      end
     end
 
     context 'anonymous' do