dont use kwargs to avoid stupid problems with rspec-mocks

paladinsoftware · May 1, 2024 · ba51177 · ba51177
1 parent 2435c38
commit ba51177
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/sidekiq/debouncer/enq.rb b/lib/sidekiq/debouncer/enq.rb
@@ -27,8 +27,8 @@ def initialize(config)
 
       def enqueue_jobs
         @redis.call do |conn|
-          while !@done && (job, score = zpopbyscore_withscore(conn, keys: [SET], argv: [Time.now.to_f.to_s]))
-            job_args = zpopbyscore_multi(conn, keys: [job], argv: [score])
+          while !@done && (job, score = zpopbyscore_withscore(conn, [SET], [Time.now.to_f.to_s]))
+            job_args = zpopbyscore_multi(conn, [job], [score])
 
             final_args = job_args.map { |elem| Sidekiq.load_json(elem.split("-", 2)[1]) }
             job_class = job.split("/")[1]

diff --git a/lib/sidekiq/debouncer/lua_commands.rb b/lib/sidekiq/debouncer/lua_commands.rb
@@ -9,7 +9,7 @@ module LuaCommands
 
       def define_lua_command(command, script)
         sha = Digest::SHA1.hexdigest(script)
-        define_method(command) do |conn, keys: nil, argv: nil|
+        define_method(command) do |conn, keys, argv|
           retryable = true
           begin
             conn.call("EVALSHA", sha, keys.size, *keys, *argv)

diff --git a/lib/sidekiq/debouncer/middleware/client.rb b/lib/sidekiq/debouncer/middleware/client.rb
@@ -45,7 +45,7 @@ def debounce(klass, job)
           args_stringified = "#{SecureRandom.hex(12)}-#{Sidekiq.dump_json(job["args"])}"
 
           redis do |connection|
-            redis_debounce(connection, keys: [Sidekiq::Debouncer::Enq::SET, key], argv: [args_stringified, time, @debounce_key_ttl])
+            redis_debounce(connection, [Sidekiq::Debouncer::Enq::SET, key], [args_stringified, time, @debounce_key_ttl])
           end
 
           # prevent normal sidekiq flow

diff --git a/spec/sidekiq/debouncer/lua/zpopbyscore_multi_spec.rb b/spec/sidekiq/debouncer/lua/zpopbyscore_multi_spec.rb
@@ -26,7 +26,7 @@
 
   it "pops element from sorted set and returns it with score" do
     result = Sidekiq.redis do |connection|
-      fake_class.new.zpopbyscore_multi(connection, keys: ["sample_set"], argv: [11111112])
+      fake_class.new.zpopbyscore_multi(connection, ["sample_set"], [11111112])
     end
     expect(result).to eq(["key1", "key2"])
 

diff --git a/spec/sidekiq/debouncer/lua/zpopbyscore_withscore_spec.rb b/spec/sidekiq/debouncer/lua/zpopbyscore_withscore_spec.rb
@@ -25,7 +25,7 @@
 
   it "pops element from sorted set and returns it with score" do
     result = Sidekiq.redis do |connection|
-      fake_class.new.zpopbyscore_withscore(connection, keys: ["sample_set"], argv: ["11111112"])
+      fake_class.new.zpopbyscore_withscore(connection, ["sample_set"], ["11111112"])
     end
     expect(result).to eq(["key1", "11111111"])