From 8c9675c913ba89efa4736ac0b2c10225bbbe0c17 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 16 Dec 2020 19:18:45 -0500 Subject: [PATCH] DEV: Upgrade oj gem (#11516) --- Gemfile.lock | 2 +- spec/support/sidekiq_helpers.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e74ccf5f28e..d8b148d5674 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.10.16) + oj (3.10.17) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) diff --git a/spec/support/sidekiq_helpers.rb b/spec/support/sidekiq_helpers.rb index 790bbaf59ec..815badebe73 100644 --- a/spec/support/sidekiq_helpers.rb +++ b/spec/support/sidekiq_helpers.rb @@ -77,8 +77,8 @@ module SidekiqHelpers matched_job ||= args.all? do |key, value| value = value.to_s if value.is_a?(Symbol) - if key == :at && !job_args.has_key?(:at) - value == job_args[:enqueued_at] + if key == :at + value.to_f == (job_args[:at] || job_args[:enqueued_at]).to_f else value == job_args[key] end