diff options
Diffstat (limited to 'spec/workers/every_sidekiq_worker_spec.rb')
| -rw-r--r-- | spec/workers/every_sidekiq_worker_spec.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index c75b9b43ef4..ea1f0153f83 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -8,17 +8,17 @@ RSpec.describe 'Every Sidekiq worker' do end it 'does not use the default queue' do - expect(workers_without_defaults.map(&:queue)).not_to include('default') + expect(workers_without_defaults.map(&:generated_queue_name)).not_to include('default') end it 'uses the cronjob queue when the worker runs as a cronjob' do - expect(Gitlab::SidekiqConfig.cron_workers.map(&:queue)).to all(start_with('cronjob:')) + expect(Gitlab::SidekiqConfig.cron_workers.map(&:generated_queue_name)).to all(start_with('cronjob:')) end it 'has its queue in Gitlab::SidekiqConfig::QUEUE_CONFIG_PATHS', :aggregate_failures do file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set - worker_queues = Gitlab::SidekiqConfig.workers.map(&:queue).to_set + worker_queues = Gitlab::SidekiqConfig.workers.map(&:generated_queue_name).to_set worker_queues << ActionMailer::MailDeliveryJob.new.queue_name worker_queues << 'default' @@ -33,7 +33,7 @@ RSpec.describe 'Every Sidekiq worker' do config_queues = Gitlab::SidekiqConfig.config_queues.to_set Gitlab::SidekiqConfig.workers.each do |worker| - queue = worker.queue + queue = worker.generated_queue_name queue_namespace = queue.split(':').first expect(config_queues).to include(queue).or(include(queue_namespace)) @@ -430,7 +430,6 @@ RSpec.describe 'Every Sidekiq worker' do 'StageUpdateWorker' => 3, 'StatusPage::PublishWorker' => 5, 'StoreSecurityReportsWorker' => 3, - 'StoreSecurityScansWorker' => 3, 'SyncSeatLinkRequestWorker' => 20, 'SyncSeatLinkWorker' => 12, 'SystemHookPushWorker' => 3, |