From 7a069dc6f8438b6f635d33dabf3e303c5a113243 Mon Sep 17 00:00:00 2001 From: Juanito Fatas Date: Fri, 10 Jun 2022 00:47:09 +0900 Subject: [PATCH] Work around Sidekiq 6.4 and 6.5 API difference --- .../support/integration/adapters/sidekiq.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index 51cd71b8c9..775c588d73 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -53,11 +53,20 @@ module SidekiqJobsManager require "sidekiq/cli" require "sidekiq/launcher" - config = Sidekiq - config[:queues] = ["integration_tests"] - config[:environment] = "test" - config[:concurrency] = 1 - config[:timeout] = 1 + if Sidekiq.respond_to?(:[]=) + config = Sidekiq + config[:queues] = ["integration_tests"] + config[:environment] = "test" + config[:concurrency] = 1 + config[:timeout] = 1 + else + config = { + queues: ["integration_tests"], + environment: "test", + concurrency: 1, + timeout: 1 + } + end sidekiq = Sidekiq::Launcher.new(config) Sidekiq.average_scheduled_poll_interval = 0.5 Sidekiq.options[:poll_interval_average] = 1