diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-10-24 15:49:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 15:49:10 -0400 |
| commit | d76d66fb554fc3267de93d780344815d05ae6533 (patch) | |
| tree | f504440be674c1f5b82a788a58aa7564c28721fc /activejob/lib | |
| parent | d3e646595fb33fce131750fb558b72560afdeb3f (diff) | |
| parent | 3ebc22903433b97b38935778b955b53bc90447f6 (diff) | |
| download | rails-d76d66fb554fc3267de93d780344815d05ae6533.tar.gz rails-d76d66fb554fc3267de93d780344815d05ae6533.tar.bz2 rails-d76d66fb554fc3267de93d780344815d05ae6533.zip | |
Merge pull request #34204 from XrXr/aj-test-helper-args
Include deserialized arguments in jobs returned by AJ test helpers
Diffstat (limited to 'activejob/lib')
| -rw-r--r-- | activejob/lib/active_job/test_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 229855c5d9..0deb68d0d2 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -594,8 +594,7 @@ module ActiveJob def flush_enqueued_jobs(only: nil, except: nil, queue: nil) enqueued_jobs_with(only: only, except: except, queue: queue) do |payload| - args = ActiveJob::Arguments.deserialize(payload[:args]) - instantiate_job(payload.merge(args: args)).perform_now + instantiate_job(payload).perform_now queue_adapter.performed_jobs << payload end end @@ -613,7 +612,8 @@ module ActiveJob end def instantiate_job(payload) - job = payload[:job].new(*payload[:args]) + args = ActiveJob::Arguments.deserialize(payload[:args]) + job = payload[:job].new(*args) job.scheduled_at = Time.at(payload[:at]) if payload.key?(:at) job.queue_name = payload[:queue] job |