diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 15:10:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 15:10:29 +0300 |
commit | a84766a28a87c0342c6b048f5ea2eab2f3216fcf (patch) | |
tree | c929643b8b21e05da13692620bd508a869d6fbe7 /spec/workers | |
parent | f5f1f221ba08228dbbdd7080509028a7cac2fce2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/every_sidekiq_worker_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index c75b9b43ef4..7db1064405b 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)) |