1 files changed, 10 insertions, 54 deletions
diff --git a/spec/requests/api/ci/runner/runners_post_spec.rb b/spec/requests/api/ci/runner/runners_post_spec.rb
index b3a7d591c93..a51d8b458f8 100644
--- a/spec/requests/api/ci/runner/runners_post_spec.rb
+++ b/spec/requests/api/ci/runner/runners_post_spec.rb
@@ -98,33 +98,14 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :project_type, projects: [project], contacted_at: 1.second.ago)
               create(:plan_limits, :default_plan, ci_registered_project_runners: 1)
-
-              skip_default_enabled_yaml_check
-              stub_feature_flags(ci_runner_limits_override: ci_runner_limits_override)
-            end
-
-            context 'with ci_runner_limits_override FF disabled' do
-              let(:ci_runner_limits_override) { false }
-
-              it 'does not create runner' do
-                request
-
-                expect(response).to have_gitlab_http_status(:bad_request)
-                expect(json_response['message']).to include('runner_projects.base' => ['Maximum number of ci registered project runners (1) exceeded'])
-                expect(project.runners.reload.size).to eq(1)
-              end
             end
 
-            context 'with ci_runner_limits_override FF enabled' do
-              let(:ci_runner_limits_override) { true }
-
-              it 'creates runner' do
-                request
+            it 'does not create runner' do
+              request
 
-                expect(response).to have_gitlab_http_status(:created)
-                expect(json_response['message']).to be_nil
-                expect(project.runners.reload.size).to eq(2)
-              end
+              expect(response).to have_gitlab_http_status(:bad_request)
+              expect(json_response['message']).to include('runner_projects.base' => ['Maximum number of ci registered project runners (1) exceeded'])
+              expect(project.runners.reload.size).to eq(1)
             end
           end
 
@@ -132,9 +113,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :project_type, projects: [project], created_at: 14.months.ago, contacted_at: 13.months.ago)
               create(:plan_limits, :default_plan, ci_registered_project_runners: 1)
-
-              skip_default_enabled_yaml_check
-              stub_feature_flags(ci_runner_limits_override: false)
             end
 
             it 'creates runner' do
@@ -204,33 +182,14 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             before do
               create(:ci_runner, runner_type: :group_type, groups: [group], contacted_at: nil, created_at: 1.month.ago)
               create(:plan_limits, :default_plan, ci_registered_group_runners: 1)
-
-              skip_default_enabled_yaml_check
-              stub_feature_flags(ci_runner_limits_override: ci_runner_limits_override)
-            end
-
-            context 'with ci_runner_limits_override FF disabled' do
-              let(:ci_runner_limits_override) { false }
-
-              it 'does not create runner' do
-                request
-
-                expect(response).to have_gitlab_http_status(:bad_request)
-                expect(json_response['message']).to include('runner_namespaces.base' => ['Maximum number of ci registered group runners (1) exceeded'])
-                expect(group.runners.reload.size).to eq(1)
-              end
             end
 
-            context 'with ci_runner_limits_override FF enabled' do
-              let(:ci_runner_limits_override) { true }
-
-              it 'creates runner' do
-                request
+            it 'does not create runner' do
+              request
 
-                expect(response).to have_gitlab_http_status(:created)
-                expect(json_response['message']).to be_nil
-                expect(group.runners.reload.size).to eq(2)
-              end
+              expect(response).to have_gitlab_http_status(:bad_request)
+              expect(json_response['message']).to include('runner_namespaces.base' => ['Maximum number of ci registered group runners (1) exceeded'])
+              expect(group.runners.reload.size).to eq(1)
             end
           end
 
@@ -239,9 +198,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
               create(:ci_runner, runner_type: :group_type, groups: [group], created_at: 4.months.ago, contacted_at: 3.months.ago)
               create(:ci_runner, runner_type: :group_type, groups: [group], contacted_at: nil, created_at: 4.months.ago)
               create(:plan_limits, :default_plan, ci_registered_group_runners: 1)
-
-              skip_default_enabled_yaml_check
-              stub_feature_flags(ci_runner_limits_override: false)
             end
 
             it 'creates runner' do