diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-14 23:21:12 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-14 23:21:12 +0200 |
| commit | c84a470bab08abce2ac9ad268e57c1c90fb7755e (patch) | |
| tree | 1314da5f7bcd9e1130088823ca1a23c4d8314b06 | |
| parent | 69966fcb8d19f0ce219a498efb2855902a2895b1 (diff) | |
| download | gitlab-ce-rails5-queue-name.tar.gz | |
Fix queue_name in Rails 5rails5-queue-name
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.
| -rw-r--r-- | spec/workers/every_sidekiq_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |