diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index 4ff01094f5c..7a6abd8d308 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,7 @@ +* Do not trigger immediate loading of `ActiveJob::Base` when loading `ActiveJob::TestHelper`. + + *Maxime Réty* + * Preserve the serialized timezone when deserializing `ActiveSupport::TimeWithZone` arguments. *Joshua Young* diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 8b556a9cf6c..e4f376944c5 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -34,7 +34,9 @@ module ActiveJob end end - ActiveJob::Base.include(TestQueueAdapter) + ActiveSupport.on_load(:active_job) do + ActiveJob::Base.include(TestQueueAdapter) + end def before_setup # :nodoc: test_adapter = queue_adapter_for_test