diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-21 14:31:09 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-21 14:31:09 +0200 |
commit | 15f486e305b32ddaa8eeaf528dc79e04ed6aa98a (patch) | |
tree | 20556b622283b27b57605b59502527dc7da6acc5 | |
parent | 82056644d5c3be0b9cc4a268ff367944472bb11e (diff) | |
download | gitlab-ce-15f486e305b32ddaa8eeaf528dc79e04ed6aa98a.tar.gz |
Add sidekiq worker shared examples to workers specs
44 files changed, 88 insertions, 2 deletions
diff --git a/spec/workers/authorized_projects_worker_spec.rb b/spec/workers/authorized_projects_worker_spec.rb index 03b9b99e263..bf9425b3d09 100644 --- a/spec/workers/authorized_projects_worker_spec.rb +++ b/spec/workers/authorized_projects_worker_spec.rb @@ -47,4 +47,6 @@ describe AuthorizedProjectsWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/background_migration_worker_spec.rb b/spec/workers/background_migration_worker_spec.rb index 4f6e3474634..69971cf9243 100644 --- a/spec/workers/background_migration_worker_spec.rb +++ b/spec/workers/background_migration_worker_spec.rb @@ -41,4 +41,6 @@ describe BackgroundMigrationWorker, :sidekiq do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/create_gpg_signature_worker_spec.rb b/spec/workers/create_gpg_signature_worker_spec.rb index 54978baca88..0cfa957be06 100644 --- a/spec/workers/create_gpg_signature_worker_spec.rb +++ b/spec/workers/create_gpg_signature_worker_spec.rb @@ -36,4 +36,6 @@ describe CreateGpgSignatureWorker do described_class.new.perform(anything, nonexisting_project_id) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/delete_merged_branches_worker_spec.rb b/spec/workers/delete_merged_branches_worker_spec.rb index 39009d9e4b2..da20d4e7e3f 100644 --- a/spec/workers/delete_merged_branches_worker_spec.rb +++ b/spec/workers/delete_merged_branches_worker_spec.rb @@ -16,4 +16,6 @@ describe DeleteMergedBranchesWorker do expect(worker.perform('unknown', project.owner.id)).to be_falsy end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/delete_user_worker_spec.rb b/spec/workers/delete_user_worker_spec.rb index 36594515005..24fcf41a0c8 100644 --- a/spec/workers/delete_user_worker_spec.rb +++ b/spec/workers/delete_user_worker_spec.rb @@ -17,4 +17,6 @@ describe DeleteUserWorker do described_class.new.perform(current_user.id, user.id, "test" => "test") end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb index e4e77c667b3..d8ffdd4b5ed 100644 --- a/spec/workers/email_receiver_worker_spec.rb +++ b/spec/workers/email_receiver_worker_spec.rb @@ -60,4 +60,6 @@ describe EmailReceiverWorker, :mailer do described_class.new.perform(raw_message) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb index 318aad4bc1e..28031e2292c 100644 --- a/spec/workers/emails_on_push_worker_spec.rb +++ b/spec/workers/emails_on_push_worker_spec.rb @@ -127,4 +127,6 @@ describe EmailsOnPushWorker, :mailer do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index 30908534eb3..34f5bfc8c0c 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -41,4 +41,6 @@ describe 'Every Sidekiq worker' do expect(queue_names).to include(worker.sidekiq_options['queue'].to_s) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/expire_build_artifacts_worker_spec.rb b/spec/workers/expire_build_artifacts_worker_spec.rb index b47b4a02a68..751e4dfebd8 100644 --- a/spec/workers/expire_build_artifacts_worker_spec.rb +++ b/spec/workers/expire_build_artifacts_worker_spec.rb @@ -47,4 +47,6 @@ describe ExpireBuildArtifactsWorker do Sidekiq::Queues.jobs_by_worker['ExpireBuildInstanceArtifactsWorker'] end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/expire_build_instance_artifacts_worker_spec.rb b/spec/workers/expire_build_instance_artifacts_worker_spec.rb index bed5c5e2ecb..e1e6a5434fc 100644 --- a/spec/workers/expire_build_instance_artifacts_worker_spec.rb +++ b/spec/workers/expire_build_instance_artifacts_worker_spec.rb @@ -74,4 +74,6 @@ describe ExpireBuildInstanceArtifactsWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb index 05f971dfd13..f2917986804 100644 --- a/spec/workers/git_garbage_collect_worker_spec.rb +++ b/spec/workers/git_garbage_collect_worker_spec.rb @@ -131,6 +131,8 @@ describe GitGarbageCollectWorker do end end + it_behaves_like 'sidekiq worker' + # Create a new commit on a random new branch def create_objects(project) rugged = project.repository.rugged diff --git a/spec/workers/gitlab_usage_ping_worker_spec.rb b/spec/workers/gitlab_usage_ping_worker_spec.rb index 49b4e04dc7c..f5ff6736993 100644 --- a/spec/workers/gitlab_usage_ping_worker_spec.rb +++ b/spec/workers/gitlab_usage_ping_worker_spec.rb @@ -10,4 +10,6 @@ describe GitlabUsagePingWorker do subject.perform end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/group_destroy_worker_spec.rb b/spec/workers/group_destroy_worker_spec.rb index a170c84ab12..2f0c55b1b91 100644 --- a/spec/workers/group_destroy_worker_spec.rb +++ b/spec/workers/group_destroy_worker_spec.rb @@ -16,4 +16,6 @@ describe GroupDestroyWorker do expect(Dir.exist?(project.path)).to be_falsey end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/invalid_gpg_signature_update_worker_spec.rb b/spec/workers/invalid_gpg_signature_update_worker_spec.rb index 5972696515b..178dc024201 100644 --- a/spec/workers/invalid_gpg_signature_update_worker_spec.rb +++ b/spec/workers/invalid_gpg_signature_update_worker_spec.rb @@ -26,4 +26,6 @@ describe InvalidGpgSignatureUpdateWorker do described_class.new.perform(nonexisting_gpg_key_id) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb index ee51000161a..b63c184fdb1 100644 --- a/spec/workers/merge_worker_spec.rb +++ b/spec/workers/merge_worker_spec.rb @@ -38,4 +38,6 @@ describe MergeWorker do expect { worker.perform(merge_request.id, user.id, {}) } .to change { merge_request.reload.merge_jid }.from(nil).to('999') end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/namespaceless_project_destroy_worker_spec.rb b/spec/workers/namespaceless_project_destroy_worker_spec.rb index f2706254284..6d75e7fbfb8 100644 --- a/spec/workers/namespaceless_project_destroy_worker_spec.rb +++ b/spec/workers/namespaceless_project_destroy_worker_spec.rb @@ -76,4 +76,6 @@ describe NamespacelessProjectDestroyWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/new_issue_worker_spec.rb b/spec/workers/new_issue_worker_spec.rb index 4e15ccc534b..e82302d5cfe 100644 --- a/spec/workers/new_issue_worker_spec.rb +++ b/spec/workers/new_issue_worker_spec.rb @@ -51,4 +51,6 @@ describe NewIssueWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/new_merge_request_worker_spec.rb b/spec/workers/new_merge_request_worker_spec.rb index 9e0cbde45b1..a7e2e4376d6 100644 --- a/spec/workers/new_merge_request_worker_spec.rb +++ b/spec/workers/new_merge_request_worker_spec.rb @@ -53,4 +53,6 @@ describe NewMergeRequestWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/new_note_worker_spec.rb b/spec/workers/new_note_worker_spec.rb index 575361c93d4..d935a0ae3b4 100644 --- a/spec/workers/new_note_worker_spec.rb +++ b/spec/workers/new_note_worker_spec.rb @@ -46,4 +46,6 @@ describe NewNoteWorker do described_class.new.perform(unexistent_note_id) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/pipeline_schedule_worker_spec.rb b/spec/workers/pipeline_schedule_worker_spec.rb index 75197039f5a..4cea91a237c 100644 --- a/spec/workers/pipeline_schedule_worker_spec.rb +++ b/spec/workers/pipeline_schedule_worker_spec.rb @@ -62,4 +62,6 @@ describe PipelineScheduleWorker do expect { subject }.not_to change { project.pipelines.count } end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/pipeline_update_worker_spec.rb b/spec/workers/pipeline_update_worker_spec.rb index 60e7e23f0b4..cd8ae030ab9 100644 --- a/spec/workers/pipeline_update_worker_spec.rb +++ b/spec/workers/pipeline_update_worker_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe PipelineUpdateWorker do - it_behaves_like 'sidekiq worker' - describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } @@ -21,4 +19,6 @@ describe PipelineUpdateWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index af6a3c9f6c7..4968758cb6b 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -140,4 +140,6 @@ describe PostReceive do described_class.new.perform(gl_repository, key_id, base64_changes) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/process_commit_worker_spec.rb b/spec/workers/process_commit_worker_spec.rb index 24f8ca67594..0580ea60742 100644 --- a/spec/workers/process_commit_worker_spec.rb +++ b/spec/workers/process_commit_worker_spec.rb @@ -134,4 +134,6 @@ describe ProcessCommitWorker do expect(commit.authored_date).to be_an_instance_of(Time) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb index 6b1f2ff3227..20d18a433d3 100644 --- a/spec/workers/project_cache_worker_spec.rb +++ b/spec/workers/project_cache_worker_spec.rb @@ -87,4 +87,6 @@ describe ProjectCacheWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/project_destroy_worker_spec.rb b/spec/workers/project_destroy_worker_spec.rb index f19c9dff941..7c2a293c5f3 100644 --- a/spec/workers/project_destroy_worker_spec.rb +++ b/spec/workers/project_destroy_worker_spec.rb @@ -33,4 +33,6 @@ describe ProjectDestroyWorker do end.not_to raise_error end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/propagate_service_template_worker_spec.rb b/spec/workers/propagate_service_template_worker_spec.rb index b8b65ead9b3..21df8eb489e 100644 --- a/spec/workers/propagate_service_template_worker_spec.rb +++ b/spec/workers/propagate_service_template_worker_spec.rb @@ -26,4 +26,6 @@ describe PropagateServiceTemplateWorker do subject.perform(service_template.id) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/prune_old_events_worker_spec.rb b/spec/workers/prune_old_events_worker_spec.rb index ea974355050..e9b3061a1be 100644 --- a/spec/workers/prune_old_events_worker_spec.rb +++ b/spec/workers/prune_old_events_worker_spec.rb @@ -23,4 +23,6 @@ describe PruneOldEventsWorker do expect(exactly_12_months_event).to be_present end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index 5f4453c15d6..44aa520d102 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -12,4 +12,6 @@ describe ReactiveCachingWorker do subject end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/remove_expired_group_links_worker_spec.rb b/spec/workers/remove_expired_group_links_worker_spec.rb index 689bc3d27b4..2615b049650 100644 --- a/spec/workers/remove_expired_group_links_worker_spec.rb +++ b/spec/workers/remove_expired_group_links_worker_spec.rb @@ -21,4 +21,6 @@ describe RemoveExpiredGroupLinksWorker do expect(non_expiring_project_group_link.reload).to be_present end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/remove_expired_members_worker_spec.rb b/spec/workers/remove_expired_members_worker_spec.rb index 058fdf4c009..1b0af031a83 100644 --- a/spec/workers/remove_expired_members_worker_spec.rb +++ b/spec/workers/remove_expired_members_worker_spec.rb @@ -55,4 +55,6 @@ describe RemoveExpiredMembersWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/remove_old_web_hook_logs_worker_spec.rb b/spec/workers/remove_old_web_hook_logs_worker_spec.rb index 6d26ba5dfa0..4a504f34367 100644 --- a/spec/workers/remove_old_web_hook_logs_worker_spec.rb +++ b/spec/workers/remove_old_web_hook_logs_worker_spec.rb @@ -15,4 +15,6 @@ describe RemoveOldWebHookLogsWorker do expect(WebHookLog.all).not_to include(week_old_record, three_days_old_record) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb b/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb index 57f83c1dbe9..fccb64717ad 100644 --- a/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb +++ b/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb @@ -52,4 +52,6 @@ describe RemoveUnreferencedLfsObjectsWorker do expect(LfsObject.where(id: referenced_lfs_object2.id)).to be_empty end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb index d9e9409840f..6550de6f893 100644 --- a/spec/workers/repository_fork_worker_spec.rb +++ b/spec/workers/repository_fork_worker_spec.rb @@ -69,4 +69,6 @@ describe RepositoryForkWorker do expect(project.reload.import_status).to eq('failed') end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/repository_import_worker_spec.rb b/spec/workers/repository_import_worker_spec.rb index 100dfc32bbe..d67891aa388 100644 --- a/spec/workers/repository_import_worker_spec.rb +++ b/spec/workers/repository_import_worker_spec.rb @@ -43,4 +43,6 @@ describe RepositoryImportWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/schedule_update_user_activity_worker_spec.rb b/spec/workers/schedule_update_user_activity_worker_spec.rb index 32c59381b01..362cd2a6d92 100644 --- a/spec/workers/schedule_update_user_activity_worker_spec.rb +++ b/spec/workers/schedule_update_user_activity_worker_spec.rb @@ -22,4 +22,6 @@ describe ScheduleUpdateUserActivityWorker, :clean_gitlab_redis_shared_state do subject.perform(1) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/stuck_ci_jobs_worker_spec.rb b/spec/workers/stuck_ci_jobs_worker_spec.rb index 549635f7f33..f64de2a9c21 100644 --- a/spec/workers/stuck_ci_jobs_worker_spec.rb +++ b/spec/workers/stuck_ci_jobs_worker_spec.rb @@ -132,4 +132,6 @@ describe StuckCiJobsWorker do worker.perform end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/stuck_import_jobs_worker_spec.rb b/spec/workers/stuck_import_jobs_worker_spec.rb index a82eb54ffe4..64a69fc4872 100644 --- a/spec/workers/stuck_import_jobs_worker_spec.rb +++ b/spec/workers/stuck_import_jobs_worker_spec.rb @@ -33,4 +33,6 @@ describe StuckImportJobsWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/stuck_merge_jobs_worker_spec.rb b/spec/workers/stuck_merge_jobs_worker_spec.rb index a5ad78393c9..a989942f913 100644 --- a/spec/workers/stuck_merge_jobs_worker_spec.rb +++ b/spec/workers/stuck_merge_jobs_worker_spec.rb @@ -47,4 +47,6 @@ describe StuckMergeJobsWorker do end end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/system_hook_push_worker_spec.rb b/spec/workers/system_hook_push_worker_spec.rb index b1d446ed25f..e0588e2a1b3 100644 --- a/spec/workers/system_hook_push_worker_spec.rb +++ b/spec/workers/system_hook_push_worker_spec.rb @@ -16,4 +16,6 @@ describe SystemHookPushWorker do subject.perform(push_data, :push_hooks) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/trending_projects_worker_spec.rb b/spec/workers/trending_projects_worker_spec.rb index c3c6fdcf2d5..a9e0c9d1d77 100644 --- a/spec/workers/trending_projects_worker_spec.rb +++ b/spec/workers/trending_projects_worker_spec.rb @@ -8,4 +8,6 @@ describe TrendingProjectsWorker do described_class.new.perform end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/update_merge_requests_worker_spec.rb b/spec/workers/update_merge_requests_worker_spec.rb index 558ff9109ec..f40c9012db9 100644 --- a/spec/workers/update_merge_requests_worker_spec.rb +++ b/spec/workers/update_merge_requests_worker_spec.rb @@ -24,4 +24,6 @@ describe UpdateMergeRequestsWorker do perform end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/update_user_activity_worker_spec.rb b/spec/workers/update_user_activity_worker_spec.rb index 268ca1d81f2..9cd7ffc2ab4 100644 --- a/spec/workers/update_user_activity_worker_spec.rb +++ b/spec/workers/update_user_activity_worker_spec.rb @@ -32,4 +32,6 @@ describe UpdateUserActivityWorker, :clean_gitlab_redis_shared_state do expect(Gitlab::UserActivities.new.to_a).to be_empty end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/upload_checksum_worker_spec.rb b/spec/workers/upload_checksum_worker_spec.rb index 911360da66c..735aeec1046 100644 --- a/spec/workers/upload_checksum_worker_spec.rb +++ b/spec/workers/upload_checksum_worker_spec.rb @@ -16,4 +16,6 @@ describe UploadChecksumWorker do expect(upload).to have_received(:save!) end end + + it_behaves_like 'sidekiq worker' end diff --git a/spec/workers/use_key_worker_spec.rb b/spec/workers/use_key_worker_spec.rb index e50c788b82a..c7de5bb6117 100644 --- a/spec/workers/use_key_worker_spec.rb +++ b/spec/workers/use_key_worker_spec.rb @@ -20,4 +20,6 @@ describe UseKeyWorker do expect(worker.perform(key.id + 1)).to eq false end end + + it_behaves_like 'sidekiq worker' end |