Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 13 deletions

diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 554fd4d4fb0..c4b1e2133ed 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -711,11 +711,7 @@ module Ci
         end
       end
 
-      context 'when ci_register_job_service_one_by_one is enabled' do
-        before do
-          stub_feature_flags(ci_register_job_service_one_by_one: true)
-        end
-
+      context 'when a long queue is created' do
         it 'picks builds one-by-one' do
           expect(Ci::Build).to receive(:find).with(pending_job.id).and_call_original
 
@@ -725,14 +721,6 @@ module Ci
         include_examples 'handles runner assignment'
       end
 
-      context 'when ci_register_job_service_one_by_one is disabled' do
-        before do
-          stub_feature_flags(ci_register_job_service_one_by_one: false)
-        end
-
-        include_examples 'handles runner assignment'
-      end
-
       context 'when joining with pending builds table' do
         before do
           stub_feature_flags(ci_pending_builds_queue_join: true)