Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 8 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 65a407b0346..003ca2512dc 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -1297,9 +1297,9 @@ RSpec.describe GroupPolicy, feature_category: :system_access do
       end
     end
 
-    context 'create_runner_workflow_for_admin flag enabled' do
+    context 'create_runner_workflow_for_namespace flag enabled' do
       before do
-        stub_feature_flags(create_runner_workflow_for_admin: true)
+        stub_feature_flags(create_runner_workflow_for_namespace: [group])
       end
 
       context 'admin' do
@@ -1380,11 +1380,13 @@ RSpec.describe GroupPolicy, feature_category: :system_access do
       end
     end
 
-    context 'with create_runner_workflow_for_admin flag disabled' do
+    context 'with create_runner_workflow_for_namespace flag disabled' do
       before do
-        stub_feature_flags(create_runner_workflow_for_admin: false)
+        stub_feature_flags(create_runner_workflow_for_namespace: [other_group])
       end
 
+      let_it_be(:other_group) { create(:group) }
+
       context 'admin' do
         let(:current_user) { admin }
 
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index bc58171f27b..e7b548b8f3b 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -2740,9 +2740,9 @@ RSpec.describe ProjectPolicy, feature_category: :system_access do
   end
 
   describe 'create_project_runners' do
-    context 'create_runner_workflow_for_admin flag enabled' do
+    context 'create_runner_workflow_for_namespace flag enabled' do
       before do
-        stub_feature_flags(create_runner_workflow_for_admin: true)
+        stub_feature_flags(create_runner_workflow_for_namespace: [project.namespace])
       end
 
       context 'admin' do
@@ -2810,9 +2810,9 @@ RSpec.describe ProjectPolicy, feature_category: :system_access do
       end
     end
 
-    context 'create_runner_workflow_for_admin flag disabled' do
+    context 'create_runner_workflow_for_namespace flag disabled' do
       before do
-        stub_feature_flags(create_runner_workflow_for_admin: false)
+        stub_feature_flags(create_runner_workflow_for_namespace: [group])
       end
 
       context 'admin' do