Commit 73187801 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Revert adding shared examples for every sidekiq worker

Since this already exists in `every_sidekiq_worker_spec.rb`.
parent 75dca155
shared_examples 'sidekiq worker' do
let(:queues) do
YAML.load_file(Rails.root.join('config', 'sidekiq_queues.yml'))
.fetch(:queues, []).map(&:first)
end
it 'is going to be processed inside a known sidekiq queue' do
expect(described_class.sidekiq_options['queue'].to_s).to be_in queues
end
end
...@@ -47,6 +47,4 @@ describe AuthorizedProjectsWorker do ...@@ -47,6 +47,4 @@ describe AuthorizedProjectsWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -41,6 +41,4 @@ describe BackgroundMigrationWorker, :sidekiq do ...@@ -41,6 +41,4 @@ describe BackgroundMigrationWorker, :sidekiq do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -20,6 +20,4 @@ describe BuildCoverageWorker do ...@@ -20,6 +20,4 @@ describe BuildCoverageWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -27,6 +27,4 @@ describe BuildFinishedWorker do ...@@ -27,6 +27,4 @@ describe BuildFinishedWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -20,6 +20,4 @@ describe BuildHooksWorker do ...@@ -20,6 +20,4 @@ describe BuildHooksWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -33,6 +33,4 @@ describe BuildSuccessWorker do ...@@ -33,6 +33,4 @@ describe BuildSuccessWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -36,6 +36,4 @@ describe CreateGpgSignatureWorker do ...@@ -36,6 +36,4 @@ describe CreateGpgSignatureWorker do
described_class.new.perform(anything, nonexisting_project_id) described_class.new.perform(anything, nonexisting_project_id)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -16,6 +16,4 @@ describe DeleteMergedBranchesWorker do ...@@ -16,6 +16,4 @@ describe DeleteMergedBranchesWorker do
expect(worker.perform('unknown', project.owner.id)).to be_falsy expect(worker.perform('unknown', project.owner.id)).to be_falsy
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -17,6 +17,4 @@ describe DeleteUserWorker do ...@@ -17,6 +17,4 @@ describe DeleteUserWorker do
described_class.new.perform(current_user.id, user.id, "test" => "test") described_class.new.perform(current_user.id, user.id, "test" => "test")
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -60,6 +60,4 @@ describe EmailReceiverWorker, :mailer do ...@@ -60,6 +60,4 @@ describe EmailReceiverWorker, :mailer do
described_class.new.perform(raw_message) described_class.new.perform(raw_message)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -127,6 +127,4 @@ describe EmailsOnPushWorker, :mailer do ...@@ -127,6 +127,4 @@ describe EmailsOnPushWorker, :mailer do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -41,6 +41,4 @@ describe 'Every Sidekiq worker' do ...@@ -41,6 +41,4 @@ describe 'Every Sidekiq worker' do
expect(queue_names).to include(worker.sidekiq_options['queue'].to_s) expect(queue_names).to include(worker.sidekiq_options['queue'].to_s)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -47,6 +47,4 @@ describe ExpireBuildArtifactsWorker do ...@@ -47,6 +47,4 @@ describe ExpireBuildArtifactsWorker do
Sidekiq::Queues.jobs_by_worker['ExpireBuildInstanceArtifactsWorker'] Sidekiq::Queues.jobs_by_worker['ExpireBuildInstanceArtifactsWorker']
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -74,6 +74,4 @@ describe ExpireBuildInstanceArtifactsWorker do ...@@ -74,6 +74,4 @@ describe ExpireBuildInstanceArtifactsWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -28,6 +28,4 @@ describe ExpireJobCacheWorker do ...@@ -28,6 +28,4 @@ describe ExpireJobCacheWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -43,6 +43,4 @@ describe ExpirePipelineCacheWorker do ...@@ -43,6 +43,4 @@ describe ExpirePipelineCacheWorker do
subject.perform(pipeline.id) subject.perform(pipeline.id)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -131,8 +131,6 @@ describe GitGarbageCollectWorker do ...@@ -131,8 +131,6 @@ describe GitGarbageCollectWorker do
end end
end end
it_behaves_like 'sidekiq worker'
# Create a new commit on a random new branch # Create a new commit on a random new branch
def create_objects(project) def create_objects(project)
rugged = project.repository.rugged rugged = project.repository.rugged
......
...@@ -10,6 +10,4 @@ describe GitlabUsagePingWorker do ...@@ -10,6 +10,4 @@ describe GitlabUsagePingWorker do
subject.perform subject.perform
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -16,6 +16,4 @@ describe GroupDestroyWorker do ...@@ -16,6 +16,4 @@ describe GroupDestroyWorker do
expect(Dir.exist?(project.path)).to be_falsey expect(Dir.exist?(project.path)).to be_falsey
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -26,6 +26,4 @@ describe InvalidGpgSignatureUpdateWorker do ...@@ -26,6 +26,4 @@ describe InvalidGpgSignatureUpdateWorker do
described_class.new.perform(nonexisting_gpg_key_id) described_class.new.perform(nonexisting_gpg_key_id)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -38,6 +38,4 @@ describe MergeWorker do ...@@ -38,6 +38,4 @@ describe MergeWorker do
expect { worker.perform(merge_request.id, user.id, {}) } expect { worker.perform(merge_request.id, user.id, {}) }
.to change { merge_request.reload.merge_jid }.from(nil).to('999') .to change { merge_request.reload.merge_jid }.from(nil).to('999')
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -76,6 +76,4 @@ describe NamespacelessProjectDestroyWorker do ...@@ -76,6 +76,4 @@ describe NamespacelessProjectDestroyWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -51,6 +51,4 @@ describe NewIssueWorker do ...@@ -51,6 +51,4 @@ describe NewIssueWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -53,6 +53,4 @@ describe NewMergeRequestWorker do ...@@ -53,6 +53,4 @@ describe NewMergeRequestWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -46,6 +46,4 @@ describe NewNoteWorker do ...@@ -46,6 +46,4 @@ describe NewNoteWorker do
described_class.new.perform(unexistent_note_id) described_class.new.perform(unexistent_note_id)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -20,6 +20,4 @@ describe PipelineHooksWorker do ...@@ -20,6 +20,4 @@ describe PipelineHooksWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -54,6 +54,4 @@ describe PipelineMetricsWorker do ...@@ -54,6 +54,4 @@ describe PipelineMetricsWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -16,6 +16,4 @@ describe PipelineNotificationWorker, :mailer do ...@@ -16,6 +16,4 @@ describe PipelineNotificationWorker, :mailer do
subject.perform(Ci::Pipeline.maximum(:id).to_i.succ) subject.perform(Ci::Pipeline.maximum(:id).to_i.succ)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -19,6 +19,4 @@ describe PipelineProcessWorker do ...@@ -19,6 +19,4 @@ describe PipelineProcessWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -62,6 +62,4 @@ describe PipelineScheduleWorker do ...@@ -62,6 +62,4 @@ describe PipelineScheduleWorker do
expect { subject }.not_to change { project.pipelines.count } expect { subject }.not_to change { project.pipelines.count }
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -21,6 +21,4 @@ describe PipelineSuccessWorker do ...@@ -21,6 +21,4 @@ describe PipelineSuccessWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -19,6 +19,4 @@ describe PipelineUpdateWorker do ...@@ -19,6 +19,4 @@ describe PipelineUpdateWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -140,6 +140,4 @@ describe PostReceive do ...@@ -140,6 +140,4 @@ describe PostReceive do
described_class.new.perform(gl_repository, key_id, base64_changes) described_class.new.perform(gl_repository, key_id, base64_changes)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -134,6 +134,4 @@ describe ProcessCommitWorker do ...@@ -134,6 +134,4 @@ describe ProcessCommitWorker do
expect(commit.authored_date).to be_an_instance_of(Time) expect(commit.authored_date).to be_an_instance_of(Time)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -87,6 +87,4 @@ describe ProjectCacheWorker do ...@@ -87,6 +87,4 @@ describe ProjectCacheWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -33,6 +33,4 @@ describe ProjectDestroyWorker do ...@@ -33,6 +33,4 @@ describe ProjectDestroyWorker do
end.not_to raise_error end.not_to raise_error
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -26,6 +26,4 @@ describe PropagateServiceTemplateWorker do ...@@ -26,6 +26,4 @@ describe PropagateServiceTemplateWorker do
subject.perform(service_template.id) subject.perform(service_template.id)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -23,6 +23,4 @@ describe PruneOldEventsWorker do ...@@ -23,6 +23,4 @@ describe PruneOldEventsWorker do
expect(exactly_12_months_event).to be_present expect(exactly_12_months_event).to be_present
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -12,6 +12,4 @@ describe ReactiveCachingWorker do ...@@ -12,6 +12,4 @@ describe ReactiveCachingWorker do
subject subject
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -21,6 +21,4 @@ describe RemoveExpiredGroupLinksWorker do ...@@ -21,6 +21,4 @@ describe RemoveExpiredGroupLinksWorker do
expect(non_expiring_project_group_link.reload).to be_present expect(non_expiring_project_group_link.reload).to be_present
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -55,6 +55,4 @@ describe RemoveExpiredMembersWorker do ...@@ -55,6 +55,4 @@ describe RemoveExpiredMembersWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -15,6 +15,4 @@ describe RemoveOldWebHookLogsWorker do ...@@ -15,6 +15,4 @@ describe RemoveOldWebHookLogsWorker do
expect(WebHookLog.all).not_to include(week_old_record, three_days_old_record) expect(WebHookLog.all).not_to include(week_old_record, three_days_old_record)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -52,6 +52,4 @@ describe RemoveUnreferencedLfsObjectsWorker do ...@@ -52,6 +52,4 @@ describe RemoveUnreferencedLfsObjectsWorker do
expect(LfsObject.where(id: referenced_lfs_object2.id)).to be_empty expect(LfsObject.where(id: referenced_lfs_object2.id)).to be_empty
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -69,6 +69,4 @@ describe RepositoryForkWorker do ...@@ -69,6 +69,4 @@ describe RepositoryForkWorker do
expect(project.reload.import_status).to eq('failed') expect(project.reload.import_status).to eq('failed')
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -43,6 +43,4 @@ describe RepositoryImportWorker do ...@@ -43,6 +43,4 @@ describe RepositoryImportWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -22,6 +22,4 @@ describe ScheduleUpdateUserActivityWorker, :clean_gitlab_redis_shared_state do ...@@ -22,6 +22,4 @@ describe ScheduleUpdateUserActivityWorker, :clean_gitlab_redis_shared_state do
subject.perform(1) subject.perform(1)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -132,6 +132,4 @@ describe StuckCiJobsWorker do ...@@ -132,6 +132,4 @@ describe StuckCiJobsWorker do
worker.perform worker.perform
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -33,6 +33,4 @@ describe StuckImportJobsWorker do ...@@ -33,6 +33,4 @@ describe StuckImportJobsWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -47,6 +47,4 @@ describe StuckMergeJobsWorker do ...@@ -47,6 +47,4 @@ describe StuckMergeJobsWorker do
end end
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -16,6 +16,4 @@ describe SystemHookPushWorker do ...@@ -16,6 +16,4 @@ describe SystemHookPushWorker do
subject.perform(push_data, :push_hooks) subject.perform(push_data, :push_hooks)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -8,6 +8,4 @@ describe TrendingProjectsWorker do ...@@ -8,6 +8,4 @@ describe TrendingProjectsWorker do
described_class.new.perform described_class.new.perform
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -24,6 +24,4 @@ describe UpdateMergeRequestsWorker do ...@@ -24,6 +24,4 @@ describe UpdateMergeRequestsWorker do
perform perform
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -32,6 +32,4 @@ describe UpdateUserActivityWorker, :clean_gitlab_redis_shared_state do ...@@ -32,6 +32,4 @@ describe UpdateUserActivityWorker, :clean_gitlab_redis_shared_state do
expect(Gitlab::UserActivities.new.to_a).to be_empty expect(Gitlab::UserActivities.new.to_a).to be_empty
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -16,6 +16,4 @@ describe UploadChecksumWorker do ...@@ -16,6 +16,4 @@ describe UploadChecksumWorker do
expect(upload).to have_received(:save!) expect(upload).to have_received(:save!)
end end
end end
it_behaves_like 'sidekiq worker'
end end
...@@ -20,6 +20,4 @@ describe UseKeyWorker do ...@@ -20,6 +20,4 @@ describe UseKeyWorker do
expect(worker.perform(key.id + 1)).to eq false expect(worker.perform(key.id + 1)).to eq false
end end
end end
it_behaves_like 'sidekiq worker'
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment