Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

3 files changed, 29 insertions, 29 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
index 09548d21106..cc730e203f6 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
@@ -41,10 +41,10 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::Server, :clean_gitlab_r
     describe '#call' do
       it 'removes the stored job from redis before execution' do
         bare_job = { 'class' => 'TestDeduplicationWorker', 'args' => ['hello'] }
-        job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'test_deduplication')
+        job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'default')
 
         expect(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob)
-          .to receive(:new).with(a_hash_including(bare_job), 'test_deduplication')
+          .to receive(:new).with(a_hash_including(bare_job), 'default')
                 .and_return(job_definition).twice # once in client middleware
 
         expect(job_definition).to receive(:delete!).ordered.and_call_original
@@ -60,10 +60,10 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::Server, :clean_gitlab_r
 
     it 'removes the stored job from redis after execution' do
       bare_job = { 'class' => 'TestDeduplicationWorker', 'args' => ['hello'] }
-      job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'test_deduplication')
+      job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'default')
 
       expect(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob)
-        .to receive(:new).with(a_hash_including(bare_job), 'test_deduplication')
+        .to receive(:new).with(a_hash_including(bare_job), 'default')
               .and_return(job_definition).twice # once in client middleware
 
       expect(TestDeduplicationWorker).to receive(:work).ordered.and_call_original
diff --git a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
index d6d24ea3a24..52b50a143fc 100644
--- a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
@@ -22,39 +22,39 @@ RSpec.describe Gitlab::SidekiqMiddleware::ServerMetrics do
 
           expect(completion_seconds_metric)
             .to receive(:get).with({ queue: 'merge',
-                                   worker: 'MergeWorker',
-                                   urgency: 'high',
-                                   external_dependencies: 'no',
-                                   feature_category: 'source_code_management',
-                                   boundary: '',
-                                   job_status: 'done' })
+                                     worker: 'MergeWorker',
+                                     urgency: 'high',
+                                     external_dependencies: 'no',
+                                     feature_category: 'source_code_management',
+                                     boundary: '',
+                                     job_status: 'done' })
 
           expect(completion_seconds_metric)
             .to receive(:get).with({ queue: 'merge',
-                                   worker: 'MergeWorker',
-                                   urgency: 'high',
-                                   external_dependencies: 'no',
-                                   feature_category: 'source_code_management',
-                                   boundary: '',
-                                   job_status: 'fail' })
+                                     worker: 'MergeWorker',
+                                     urgency: 'high',
+                                     external_dependencies: 'no',
+                                     feature_category: 'source_code_management',
+                                     boundary: '',
+                                     job_status: 'fail' })
 
           expect(completion_seconds_metric)
             .to receive(:get).with({ queue: 'default',
-                                   worker: 'Ci::BuildFinishedWorker',
-                                   urgency: 'high',
-                                   external_dependencies: 'no',
-                                   feature_category: 'continuous_integration',
-                                   boundary: 'cpu',
-                                   job_status: 'done' })
+                                     worker: 'Ci::BuildFinishedWorker',
+                                     urgency: 'high',
+                                     external_dependencies: 'no',
+                                     feature_category: 'continuous_integration',
+                                     boundary: 'cpu',
+                                     job_status: 'done' })
 
           expect(completion_seconds_metric)
             .to receive(:get).with({ queue: 'default',
-                                   worker: 'Ci::BuildFinishedWorker',
-                                   urgency: 'high',
-                                   external_dependencies: 'no',
-                                   feature_category: 'continuous_integration',
-                                   boundary: 'cpu',
-                                   job_status: 'fail' })
+                                     worker: 'Ci::BuildFinishedWorker',
+                                     urgency: 'high',
+                                     external_dependencies: 'no',
+                                     feature_category: 'continuous_integration',
+                                     boundary: 'cpu',
+                                     job_status: 'fail' })
 
           described_class.initialize_process_metrics
         end
diff --git a/spec/lib/gitlab/sidekiq_middleware/size_limiter/server_spec.rb b/spec/lib/gitlab/sidekiq_middleware/size_limiter/server_spec.rb
index 91b8ef97ab4..12430313141 100644
--- a/spec/lib/gitlab/sidekiq_middleware/size_limiter/server_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/size_limiter/server_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 # rubocop: disable RSpec/MultipleMemoizedHelpers
 RSpec.describe Gitlab::SidekiqMiddleware::SizeLimiter::Server, :clean_gitlab_redis_queues do