Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 8 deletions

diff --git a/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb b/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb
index f3ea14ad539..5e0b07067df 100644
--- a/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb
+++ b/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb
@@ -11,11 +11,9 @@ RSpec.describe MergeRequests::UpdateHeadPipelineWorker do
   let(:pipeline) { create(:ci_pipeline, project: project, ref: ref) }
   let(:event) { Ci::PipelineCreatedEvent.new(data: { pipeline_id: pipeline.id }) }
 
-  subject { consume_event(event) }
+  subject { consume_event(subscriber: described_class, event: event) }
 
-  def consume_event(event)
-    described_class.new.perform(event.class.name, event.data)
-  end
+  it_behaves_like 'subscribes to event'
 
   context 'when merge requests already exist for this source branch', :sidekiq_inline do
     let(:merge_request_1) do
diff --git a/spec/workers/namespaces/update_root_statistics_worker_spec.rb b/spec/workers/namespaces/update_root_statistics_worker_spec.rb
index a525904b757..f2f633a39ca 100644
--- a/spec/workers/namespaces/update_root_statistics_worker_spec.rb
+++ b/spec/workers/namespaces/update_root_statistics_worker_spec.rb
@@ -9,11 +9,9 @@ RSpec.describe Namespaces::UpdateRootStatisticsWorker do
     Projects::ProjectDeletedEvent.new(data: { project_id: 1, namespace_id: namespace_id })
   end
 
-  subject { consume_event(event) }
+  subject { consume_event(subscriber: described_class, event: event) }
 
-  def consume_event(event)
-    described_class.new.perform(event.class.name, event.data)
-  end
+  it_behaves_like 'subscribes to event'
 
   it 'enqueues ScheduleAggregationWorker' do
     expect(Namespaces::ScheduleAggregationWorker).to receive(:perform_async).with(namespace_id)