diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-10-05 09:01:12 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-10-05 09:04:13 +0200 |
commit | c468d7fedd88e2474fd74e804a954a154674c8a0 (patch) | |
tree | 85248855b7ee34957257d3809385e1e939cc6093 /activejob/test | |
parent | f854be5e64737a7432570e9ce9d3edc38819e50a (diff) | |
parent | 6e0254e8d3c1dce532208bc868427d17aabbce5a (diff) | |
download | rails-c468d7fedd88e2474fd74e804a954a154674c8a0.tar.gz rails-c468d7fedd88e2474fd74e804a954a154674c8a0.tar.bz2 rails-c468d7fedd88e2474fd74e804a954a154674c8a0.zip |
Merge pull request #21854 from morgoth/fix-serializing-at-option-in-aj-matchers
Fixed serializing `:at` option for `assert_eqnueued_with` and `assert_performed_with`
Diffstat (limited to 'activejob/test')
-rw-r--r-- | activejob/test/cases/test_helper_test.rb | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb index 18cf35562b..a66f5d762c 100644 --- a/activejob/test/cases/test_helper_test.rb +++ b/activejob/test/cases/test_helper_test.rb @@ -218,6 +218,12 @@ class EnqueuedJobsTest < ActiveJob::TestCase end end + def test_assert_enqueued_job_with_at_option + assert_enqueued_with(job: HelloJob, at: Date.tomorrow.noon) do + HelloJob.set(wait_until: Date.tomorrow.noon).perform_later + end + end + def test_assert_enqueued_job_with_global_id_args ricardo = Person.new(9) assert_enqueued_with(job: HelloJob, args: [ricardo]) do @@ -439,14 +445,26 @@ class PerformedJobsTest < ActiveJob::TestCase def test_assert_performed_job_failure assert_raise ActiveSupport::TestCase::Assertion do - assert_performed_with(job: LoggingJob, at: Date.tomorrow.noon, queue: 'default') do - NestedJob.set(wait_until: Date.tomorrow.noon).perform_later + assert_performed_with(job: LoggingJob) do + HelloJob.perform_later end end assert_raise ActiveSupport::TestCase::Assertion do - assert_performed_with(job: NestedJob, at: Date.tomorrow.noon, queue: 'low') do - NestedJob.set(queue: 'low', wait_until: Date.tomorrow.noon).perform_later + assert_performed_with(job: HelloJob, queue: 'low') do + HelloJob.set(queue: 'important').perform_later + end + end + end + + def test_assert_performed_job_with_at_option + assert_performed_with(job: HelloJob, at: Date.tomorrow.noon) do + HelloJob.set(wait_until: Date.tomorrow.noon).perform_later + end + + assert_raise ActiveSupport::TestCase::Assertion do + assert_performed_with(job: HelloJob, at: Date.today.noon) do + HelloJob.set(wait_until: Date.tomorrow.noon).perform_later end end end |