From e9d16dbdb8e8195596b16bdc43ca80d8e67d06d5 Mon Sep 17 00:00:00 2001 From: Cameron McCord Date: Mon, 20 Sep 2021 18:56:07 -0600 Subject: [PATCH] updated Sidekiq::Client.push_bulk to support ActiveSupport::Duration in the at argument (#4996) --- lib/sidekiq/client.rb | 2 +- test/test_client.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/sidekiq/client.rb b/lib/sidekiq/client.rb index c7e098c7..c936f2ed 100644 --- a/lib/sidekiq/client.rb +++ b/lib/sidekiq/client.rb @@ -95,7 +95,7 @@ module Sidekiq return [] if args.empty? # no jobs to push at = items.delete("at") - raise ArgumentError, "Job 'at' must be a Numeric or an Array of Numeric timestamps" if at && (Array(at).empty? || !Array(at).all?(Numeric)) + raise ArgumentError, "Job 'at' must be a Numeric or an Array of Numeric timestamps" if at && (Array(at).empty? || !Array(at).all?{|entry| entry.is_a?(Numeric) }) raise ArgumentError, "Job 'at' Array must have same size as 'args' Array" if at.is_a?(Array) && at.size != args.size normed = normalize_item(items) diff --git a/test/test_client.rb b/test/test_client.rb index f208ece0..5665fcd3 100644 --- a/test/test_client.rb +++ b/test/test_client.rb @@ -148,6 +148,11 @@ describe Sidekiq::Client do assert_equal second_at, Sidekiq::ScheduledSet.new.find_job(second_jid).at end + it 'can push jobs scheduled using ActiveSupport::Duration' do + jids = Sidekiq::Client.push_bulk('class' => QueuedWorker, 'args' => [[1], [2]], 'at' => [1.seconds, 111.seconds]) + assert_equal 2, jids.size + end + it 'returns the jids for the jobs' do Sidekiq::Client.push_bulk('class' => 'QueuedWorker', 'args' => (1..2).to_a.map { |x| Array(x) }).each do |jid| assert_match(/[0-9a-f]{12}/, jid)