Commit c84a470b authored by Jan Provaznik's avatar Jan Provaznik

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.
parent 69966fcb
...@@ -13,7 +13,7 @@ describe 'Every Sidekiq worker' do ...@@ -13,7 +13,7 @@ describe 'Every Sidekiq worker' do
file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set
worker_queues = Gitlab::SidekiqConfig.workers.map(&:queue).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' worker_queues << 'default'
missing_from_file = worker_queues - file_worker_queues missing_from_file = worker_queues - file_worker_queues
......
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