Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 18 insertions, 1 deletions

diff --git a/spec/requests/api/graphql/mutations/groups/update_spec.rb b/spec/requests/api/graphql/mutations/groups/update_spec.rb
index ea3d42a4463..a9acc593229 100644
--- a/spec/requests/api/graphql/mutations/groups/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/groups/update_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'GroupUpdate', feature_category: :subgroups do
   let(:variables) do
     {
       full_path: group.full_path,
-      shared_runners_setting: 'DISABLED_WITH_OVERRIDE'
+      shared_runners_setting: 'DISABLED_AND_OVERRIDABLE'
     }
   end
 
@@ -52,6 +52,23 @@ RSpec.describe 'GroupUpdate', feature_category: :subgroups do
       expect(group.reload.shared_runners_setting).to eq(variables[:shared_runners_setting].downcase)
     end
 
+    context 'when using DISABLED_WITH_OVERRIDE (deprecated)' do
+      let(:variables) do
+        {
+          full_path: group.full_path,
+          shared_runners_setting: 'DISABLED_WITH_OVERRIDE'
+        }
+      end
+
+      it 'updates shared runners settings with disabled_and_overridable' do
+        post_graphql_mutation(mutation, current_user: user)
+
+        expect(response).to have_gitlab_http_status(:success)
+        expect(graphql_errors).to be_nil
+        expect(group.reload.shared_runners_setting).to eq('disabled_and_overridable')
+      end
+    end
+
     context 'when bad arguments are provided' do
       let(:variables) { { full_path: '', shared_runners_setting: 'INVALID' } }