2 files changed, 15 insertions, 40 deletions

diff --git a/spec/services/ci/runners/register_runner_service_spec.rb b/spec/services/ci/runners/register_runner_service_spec.rb
index 6d7b39de21e..2d1b109072f 100644
--- a/spec/services/ci/runners/register_runner_service_spec.rb
+++ b/spec/services/ci/runners/register_runner_service_spec.rb
@@ -9,7 +9,6 @@ RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute' do
   let(:runner) { execute.payload[:runner] }
 
   before do
-    stub_feature_flags(runner_registration_control: false)
     stub_application_setting(runners_registration_token: registration_token)
     stub_application_setting(valid_runner_registrars: ApplicationSetting::VALID_RUNNER_REGISTRAR_TYPES)
   end
@@ -166,25 +165,9 @@ RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute' do
           stub_application_setting(valid_runner_registrars: ['group'])
         end
 
-        context 'when feature flag is enabled' do
-          before do
-            stub_feature_flags(runner_registration_control: true)
-          end
-
-          it 'returns 403 error' do
-            expect(execute).to be_error
-            expect(execute.http_status).to eq :forbidden
-          end
-        end
-
-        context 'when feature flag is disabled' do
-          it 'registers the runner' do
-            expect(execute).to be_success
-
-            expect(runner).to be_an_instance_of(::Ci::Runner)
-            expect(runner.errors).to be_empty
-            expect(runner.active).to be true
-          end
+        it 'returns 403 error' do
+          expect(execute).to be_error
+          expect(execute.http_status).to eq :forbidden
         end
       end
     end
@@ -244,24 +227,8 @@ RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute' do
           stub_application_setting(valid_runner_registrars: ['project'])
         end
 
-        context 'when feature flag is enabled' do
-          before do
-            stub_feature_flags(runner_registration_control: true)
-          end
-
-          it 'returns error response' do
-            is_expected.to be_error
-          end
-        end
-
-        context 'when feature flag is disabled' do
-          it 'registers the runner' do
-            expect(execute).to be_success
-
-            expect(runner).to be_an_instance_of(::Ci::Runner)
-            expect(runner.errors).to be_empty
-            expect(runner.active).to be true
-          end
+        it 'returns error response' do
+          is_expected.to be_error
         end
       end
     end
diff --git a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
index 0d2e237c87b..1f44612947b 100644
--- a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
+++ b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
@@ -47,7 +47,11 @@ RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute' do
 
         it 'reassigns associated projects and returns success response' do
           expect(execute).to be_success
-          expect(runner.reload.projects.ids).to eq([owner_project.id] + project_ids)
+
+          runner.reload
+
+          expect(runner.owner_project).to eq(owner_project)
+          expect(runner.projects.ids).to match_array([owner_project.id] + project_ids)
         end
       end
 
@@ -56,7 +60,11 @@ RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute' do
 
         it 'reassigns associated projects and returns success response' do
           expect(execute).to be_success
-          expect(runner.reload.projects.ids).to eq([owner_project.id] + project_ids)
+
+          runner.reload
+
+          expect(runner.owner_project).to eq(owner_project)
+          expect(runner.projects.ids).to match_array([owner_project.id] + project_ids)
         end
       end
     end