1 files changed, 9 insertions, 15 deletions
diff --git a/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb b/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
index c18ae3b76d3..66555118a43 100644
--- a/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
+++ b/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
@@ -3,12 +3,13 @@ require Rails.root.join('db', 'post_migrate', '20180306074045_migrate_create_tra
 
 describe MigrateCreateTraceArtifactSidekiqQueue, :sidekiq, :redis do
   include Gitlab::Database::MigrationHelpers
+  include StubWorker
 
   context 'when there are jobs in the queues' do
     it 'correctly migrates queue when migrating up' do
       Sidekiq::Testing.disable! do
-        stubbed_worker(queue: 'pipeline_default:create_trace_artifact').perform_async('Something', [1])
-        stubbed_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:create_trace_artifact').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
 
         described_class.new.up
 
@@ -19,11 +20,11 @@ describe MigrateCreateTraceArtifactSidekiqQueue, :sidekiq, :redis do
 
     it 'does not affect other queues under the same namespace' do
       Sidekiq::Testing.disable! do
-        stubbed_worker(queue: 'pipeline_default:build_coverage').perform_async('Something', [1])
-        stubbed_worker(queue: 'pipeline_default:build_trace_sections').perform_async('Something', [1])
-        stubbed_worker(queue: 'pipeline_default:pipeline_metrics').perform_async('Something', [1])
-        stubbed_worker(queue: 'pipeline_default:pipeline_notification').perform_async('Something', [1])
-        stubbed_worker(queue: 'pipeline_default:update_head_pipeline_for_merge_request').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:build_coverage').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:build_trace_sections').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:pipeline_metrics').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:pipeline_notification').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_default:update_head_pipeline_for_merge_request').perform_async('Something', [1])
 
         described_class.new.up
 
@@ -37,7 +38,7 @@ describe MigrateCreateTraceArtifactSidekiqQueue, :sidekiq, :redis do
 
     it 'correctly migrates queue when migrating down' do
       Sidekiq::Testing.disable! do
-        stubbed_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
+        stub_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
 
         described_class.new.down
 
@@ -56,11 +57,4 @@ describe MigrateCreateTraceArtifactSidekiqQueue, :sidekiq, :redis do
       expect { described_class.new.down }.not_to raise_error
     end
   end
-
-  def stubbed_worker(queue:)
-    Class.new do
-      include Sidekiq::Worker
-      sidekiq_options queue: queue
-    end
-  end
 end