kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Include deserialized arguments in jobs returned by AJ test helpers

Browse source 
`assert_enqueued_with` and `assert_performed_with` return a instantiated
instance of the matching job for further assertion (#21010).

Before this commit the `arguments` method on the returned instance
returns a serialized version of the arguments.
This commit is contained in:
Alan Wu 2018-10-09 13:46:16 -04:00
parent c9e0a61db1
commit 3ebc229034
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activejob/CHANGELOG.md
View file

@ -1,3 +1,8 @@
* Include deserialized arguments in job instances returned from
`assert_enqueued_with` and `assert_performed_with`
*Alan Wu*
* Allow `assert_enqueued_with`/`assert_performed_with` methods to accept
a proc for the `args` argument. This is useful to check if only a subset of arguments
matches your expectations.

6
activejob/lib/active_job/test_helper.rb
View file

@ -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

24
activejob/test/cases/test_helper_test.rb
View file

@ -476,23 +476,23 @@ class EnqueuedJobsTest < ActiveJob::TestCase
def test_assert_enqueued_with_returns
job = assert_enqueued_with(job: LoggingJob) do
LoggingJob.set(wait_until: 5.minutes.from_now).perform_later(1, 2, 3)
LoggingJob.set(wait_until: 5.minutes.from_now).perform_later(1, 2, 3, keyword: true)
end
assert_instance_of LoggingJob, job
assert_in_delta 5.minutes.from_now, job.scheduled_at, 1
assert_equal "default", job.queue_name
assert_equal [1, 2, 3], job.arguments
assert_equal [1, 2, 3, { keyword: true }], job.arguments
end
def test_assert_enqueued_with_with_no_block_returns
LoggingJob.set(wait_until: 5.minutes.from_now).perform_later(1, 2, 3)
LoggingJob.set(wait_until: 5.minutes.from_now).perform_later(1, 2, 3, keyword: true)
job = assert_enqueued_with(job: LoggingJob)
assert_instance_of LoggingJob, job
assert_in_delta 5.minutes.from_now, job.scheduled_at, 1
assert_equal "default", job.queue_name
assert_equal [1, 2, 3], job.arguments
assert_equal [1, 2, 3, { keyword: true }], job.arguments
end
def test_assert_enqueued_with_failure
@ -1515,26 +1515,26 @@ class PerformedJobsTest < ActiveJob::TestCase
end
def test_assert_performed_with_returns
job = assert_performed_with(job: NestedJob, queue: "default") do
NestedJob.perform_later
job = assert_performed_with(job: LoggingJob, queue: "default") do
LoggingJob.perform_later(keyword: :sym)
end
assert_instance_of NestedJob, job
assert_instance_of LoggingJob, job
assert_nil job.scheduled_at
assert_equal [], job.arguments
assert_equal [{ keyword: :sym }], job.arguments
assert_equal "default", job.queue_name
end
def test_assert_performed_with_without_block_returns
NestedJob.perform_later
LoggingJob.perform_later(keyword: :sym)
perform_enqueued_jobs
job = assert_performed_with(job: NestedJob, queue: "default")
job = assert_performed_with(job: LoggingJob, queue: "default")
assert_instance_of NestedJob, job
assert_instance_of LoggingJob, job
assert_nil job.scheduled_at
assert_equal [], job.arguments
assert_equal [{ keyword: :sym }], job.arguments
assert_equal "default", job.queue_name
end