diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 0a9ca3a81432711394aa37c6d3d0efd18fe16be8..0ab3c5126ddf933c87202c83edd9b642e4abf272 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -322,8 +322,8 @@ def assert_enqueued_with(job: nil, args: nil, at: nil, queue: nil) jobs = enqueued_jobs end - matching_job = jobs.find do |in_block_job| - serialized_args.all? { |key, value| value == in_block_job[key] } + matching_job = jobs.find do |enqueued_job| + serialized_args.all? { |key, value| value == enqueued_job[key] } end assert matching_job, "No enqueued job found with #{expected}" diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb index 3fcac61bedfe85ce127a91a63b17932d17233ddf..76d12bee82bde46ee83f1439c81efbc7a8fd9aef 100644 --- a/activejob/test/cases/test_helper_test.rb +++ b/activejob/test/cases/test_helper_test.rb @@ -471,6 +471,12 @@ def test_assert_enqueued_with_with_no_block_args end end + def test_assert_enqueued_with_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_with_with_no_block_with_at_option HelloJob.set(wait_until: Date.tomorrow.noon).perform_later assert_enqueued_with(job: HelloJob, at: Date.tomorrow.noon) @@ -501,7 +507,7 @@ def test_assert_enqueued_with_failure_with_global_id_args assert_equal "No enqueued job found with {:job=>HelloJob, :args=>[#{wilma.inspect}]}", error.message end - def test_assert_enqueued_with_with_failure_with_no_block_with_global_id_args + def test_assert_enqueued_with_failure_with_no_block_with_global_id_args ricardo = Person.new(9) wilma = Person.new(11) error = assert_raise ActiveSupport::TestCase::Assertion do @@ -512,7 +518,7 @@ def test_assert_enqueued_with_with_failure_with_no_block_with_global_id_args assert_equal "No enqueued job found with {:job=>HelloJob, :args=>[#{wilma.inspect}]}", error.message end - def test_assert_enqueued_job_does_not_change_jobs_count + def test_assert_enqueued_with_does_not_change_jobs_count HelloJob.perform_later assert_enqueued_with(job: HelloJob) do HelloJob.perform_later