From b98323549a725b2cbe1e1b537ea9a327732f0ba3 Mon Sep 17 00:00:00 2001
From: Aushadhee Mahakumarage <3639239+aushm@users.noreply.github.com>
Date: Tue, 5 Sep 2023 19:50:30 -0500
Subject: [PATCH] sidekiq > 7 does not return timeout with queues_cmd

---
 spec/sidekiq-rate-limiter/fetch_spec.rb  | 5 ++++-
 spec/sidekiq-rate-limiter/server_spec.rb | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/spec/sidekiq-rate-limiter/fetch_spec.rb b/spec/sidekiq-rate-limiter/fetch_spec.rb
index bdb4fa8..a0b51b9 100644
--- a/spec/sidekiq-rate-limiter/fetch_spec.rb
+++ b/spec/sidekiq-rate-limiter/fetch_spec.rb
@@ -63,13 +63,16 @@ def perform(arg1, arg2); end
       timeout = _timeout
     end
 
+    expected = [ "queue:#{queue}", "queue:#{another_queue}" ]
+
     if !Sidekiq::VERSION.start_with?('7.')
       options.merge!(strict: true)
+      expected.push(timeout)
     end
 
     fetch = described_class.new(options)
 
-    expect(fetch.queues_cmd).to eql(["queue:#{queue}", "queue:#{another_queue}", timeout])
+    expect(fetch.queues_cmd).to eql(expected)
   end
 
   it 'should retrieve work', queuing: true do
diff --git a/spec/sidekiq-rate-limiter/server_spec.rb b/spec/sidekiq-rate-limiter/server_spec.rb
index a7dbf56..ef47978 100644
--- a/spec/sidekiq-rate-limiter/server_spec.rb
+++ b/spec/sidekiq-rate-limiter/server_spec.rb
@@ -8,8 +8,10 @@
 
   it 'should set Sidekiq.options[:fetch] as desired' do
     Sidekiq.configure_server do |config|
-      if Sidekiq::VERSION =~ /^(4|5|6.0)/
+      if Sidekiq::VERSION =~ /^(4|5|6\.0)/
         expect(Sidekiq.options[:fetch]).to eql(Sidekiq::RateLimiter::Fetch)
+      elsif Sidekiq::VERSION =~ /^7\./
+        expect(Sidekiq.default_configuration[:fetch_class]).to eq(Sidekiq::RateLimiter::Fetch)
       else
         expect(Sidekiq.options[:fetch]).to be_a(Sidekiq::RateLimiter::Fetch)
       end
@@ -18,8 +20,10 @@
 
   it 'should inherit from Sidekiq::BasicFetch' do
     Sidekiq.configure_server do |config|
-      if Sidekiq::VERSION =~ /^(4|5|6.0)/
+      if Sidekiq::VERSION =~ /^(4|5|6\.0)/
         expect(Sidekiq.options[:fetch]).to be < Sidekiq::BasicFetch
+      elsif Sidekiq::VERSION =~ /^7\./
+        expect(Sidekiq.default_configuration[:fetch_class]).to be < Sidekiq::BasicFetch
       else
         expect(Sidekiq.options[:fetch].class.ancestors[1]).to be(Sidekiq::BasicFetch)
       end