From d34b063cf75a5b7ef09ae2dc406e087c22722d84 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sun, 14 Jan 2024 11:31:44 +0900
Subject: [PATCH] Support Sidekiq 7.0+

---
 test/support/sidekiq/test_helper.rb | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/test/support/sidekiq/test_helper.rb b/test/support/sidekiq/test_helper.rb
index 00460c1..7a13012 100644
--- a/test/support/sidekiq/test_helper.rb
+++ b/test/support/sidekiq/test_helper.rb
@@ -7,13 +7,28 @@
 end
 
 def execute_with_launcher
-  sidekiq = Sidekiq::Launcher.new({queues: [FailJob.queue_name.call],
-                                   environment: "test",
-                                   concurrency: 1,
-                                   timeout: 1,
-                                  })
-  Sidekiq.average_scheduled_poll_interval = 3
-  Sidekiq.options[:poll_interval_average] = 1
+  if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7")
+    config = Sidekiq.default_configuration
+    config.queues = [FailJob.queue_name.call]
+    config.concurrency = 1
+    config.average_scheduled_poll_interval = 0.5
+    config.merge!(
+      environment: "test",
+      timeout: 1,
+      poll_interval_average: 3
+    )
+  else
+    config = {
+      queues: [FailJob.queue_name.call],
+      environment: "test",
+      concurrency: 1,
+      timeout: 1,
+      average_scheduled_poll_interval: 0.5,
+      poll_interval_average: 3
+    }
+  end
+
+  sidekiq = Sidekiq::Launcher.new(config)
   sidekiq.run
   yield
   sidekiq.stop