From c84a470bab08abce2ac9ad268e57c1c90fb7755e Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Thu, 14 Jun 2018 23:21:12 +0200 Subject: Fix queue_name in Rails 5 In Rails 5 DeliveryJob.queue_name may return Proc (probably if block is used for queue name definition). Instance method takes handles this already and returns string as expected. --- spec/workers/every_sidekiq_worker_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index 9e3b99b3502..2106959e23c 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -13,7 +13,7 @@ describe 'Every Sidekiq worker' do file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set worker_queues = Gitlab::SidekiqConfig.workers.map(&:queue).to_set - worker_queues << ActionMailer::DeliveryJob.queue_name + worker_queues << ActionMailer::DeliveryJob.new.queue_name worker_queues << 'default' missing_from_file = worker_queues - file_worker_queues -- cgit v1.2.1