Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Upgrade oj gem (#11516)

This commit is contained in:
Robin Ward 2020-12-16 19:18:45 -05:00 committed by GitHub
parent c54217f33d
commit 8c9675c913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -213,7 +213,7 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
oj (3.10.16) oj (3.10.17)
omniauth (1.9.1) omniauth (1.9.1)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)

4
spec/support/sidekiq_helpers.rb
View File

@ -77,8 +77,8 @@ module SidekiqHelpers
matched_job ||= args.all? do |key, value| matched_job ||= args.all? do |key, value|
value = value.to_s if value.is_a?(Symbol) value = value.to_s if value.is_a?(Symbol)
if key == :at && !job_args.has_key?(:at) if key == :at
value == job_args[:enqueued_at] value.to_f == (job_args[:at] || job_args[:enqueued_at]).to_f
else else
value == job_args[key] value == job_args[key]
end end