Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 8cf121342a3..65abb43b6c4 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -1191,12 +1191,28 @@ RSpec.describe GroupPolicy do
       context 'when admin mode is enabled', :enable_admin_mode do
         it { is_expected.to be_allowed(:register_group_runners) }
 
+        context 'with specific group runner registration disabled' do
+          before do
+            group.runner_registration_enabled = false
+          end
+
+          it { is_expected.to be_allowed(:register_group_runners) }
+        end
+
         context 'with group runner registration disabled' do
           before do
             stub_application_setting(valid_runner_registrars: ['project'])
           end
 
           it { is_expected.to be_allowed(:register_group_runners) }
+
+          context 'with specific group runner registration disabled' do
+            before do
+              group.runner_registration_enabled = false
+            end
+
+            it { is_expected.to be_allowed(:register_group_runners) }
+          end
         end
       end
 
@@ -1217,6 +1233,14 @@ RSpec.describe GroupPolicy do
 
         it { is_expected.to be_disallowed(:register_group_runners) }
       end
+
+      context 'with specific group runner registration disabled' do
+        before do
+          group.runner_registration_enabled = false
+        end
+
+        it { is_expected.to be_disallowed(:register_group_runners) }
+      end
     end
 
     context 'with maintainer' do