From c45c84db72b1448ca4a8a01a7d705ad0286d2277 Mon Sep 17 00:00:00 2001 From: John Crepezzi Date: Wed, 7 Aug 2019 17:09:23 +0200 Subject: [PATCH] Add CHANGELOG entry for ActiveJob change In #36864 we made a change to an ActiveJob test helper to add a new parameter for testing jobs delayed into the future. This commit adds a CHANGELOG entry for that change as well as fixing a circular argument error. --- activejob/CHANGELOG.md | 4 ++++ activejob/lib/active_job/test_helper.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index 542a4eb2db..52acf381cb 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add `at` argument to the `perform_enqueued_jobs` test helper. + + *John Crepezzi*, *Eileen Uchitelle* + * `assert_enqueued_with` and `assert_performed_with` can now test jobs with relative delay. *Vlado Cingel* diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 4d9b4d84ee..a9103ffc25 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -117,7 +117,7 @@ module ActiveJob # HelloJob.perform_later('elfassy') # end # end - def assert_enqueued_jobs(number, only: nil, except: nil, queue: nil, at: at) + def assert_enqueued_jobs(number, only: nil, except: nil, queue: nil) if block_given? original_count = enqueued_jobs_with(only: only, except: except, queue: queue)