diff options
Diffstat (limited to 'activejob/test')
-rw-r--r-- | activejob/test/jobs/timezone_dependent_job.rb | 1 | ||||
-rw-r--r-- | activejob/test/support/integration/dummy_app_template.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activejob/test/jobs/timezone_dependent_job.rb b/activejob/test/jobs/timezone_dependent_job.rb index f63ff95b95..358c3aa859 100644 --- a/activejob/test/jobs/timezone_dependent_job.rb +++ b/activejob/test/jobs/timezone_dependent_job.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require_relative "../support/job_buffer" +require "active_support/time" class TimezoneDependentJob < ActiveJob::Base def perform(now) diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb index b56dd3e591..65229ba397 100644 --- a/activejob/test/support/integration/dummy_app_template.rb +++ b/activejob/test/support/integration/dummy_app_template.rb @@ -21,7 +21,7 @@ class TestJob < ActiveJob::Base File.open(Rails.root.join("tmp/\#{x}.new"), "wb+") do |f| f.write Marshal.dump({ "locale" => I18n.locale.to_s || "en", - "timezone" => Time.zone.try(:name) || "UTC", + "timezone" => Time.zone&.name || "UTC", "executed_at" => Time.now.to_r }) end |