Merge pull request rails#52188 from fatkodima/activejob-rescue_from-i18n

Preserve timezone and locale in ActiveJob exception handlers

Author: byroot

activejob/lib/active_job/base.rb

@@ -11,8 +11,7 @@
 require "active_job/log_subscriber"
 require "active_job/logging"
 require "active_job/instrumentation"
-require "active_job/timezones"
-require "active_job/translation"
+require "active_job/execution_state"
 
 module ActiveJob # :nodoc:
   # = Active Job \Base
@@ -71,8 +70,7 @@ class Base
     include Exceptions
     include Instrumentation
     include Logging
-    include Timezones
-    include Translation
+    include ExecutionState
 
     ActiveSupport.run_load_hooks(:active_job, self)
   end

activejob/lib/active_job/execution_state.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveJob
+  module ExecutionState # :nodoc:
+    def perform_now
+      I18n.with_locale(locale) do
+        Time.use_zone(timezone) { super }
+      end
+    end
+  end
+end

activejob/lib/active_job/timezones.rb

@@ -2,6 +2,7 @@
 
 require "helper"
 require "jobs/timezone_dependent_job"
+require "jobs/timezone_raising_job"
 
 class TimezonesTest < ActiveSupport::TestCase
   setup do
@@ -35,4 +36,17 @@ class TimezonesTest < ActiveSupport::TestCase
   ensure
     Time.zone = nil
   end
+
+  test "it runs the exception handler in the given locale" do
+    Time.zone = "America/New_York"
+
+    Time.use_zone("London") do
+      job = TimezoneRaisingJob.new
+      job.perform_now
+    end
+
+    assert_equal "London", JobBuffer.last_value
+  ensure
+    Time.zone = nil
+  end
 end

activejob/lib/active_job/translation.rb

@@ -2,21 +2,29 @@
 
 require "helper"
 require "jobs/translated_hello_job"
+require "jobs/translated_raising_job"
 
 class TranslationTest < ActiveSupport::TestCase
   setup do
     JobBuffer.clear
     I18n.available_locales = [:en, :de]
-    @job = TranslatedHelloJob.new("Johannes")
   end
 
   teardown do
     I18n.available_locales = [:en]
   end
 
   test "it performs the job in the given locale" do
-    @job.locale = :de
-    @job.perform_now
+    job = TranslatedHelloJob.new("Johannes")
+    job.locale = :de
+    job.perform_now
     assert_equal "Johannes says Guten Tag", JobBuffer.last_value
   end
+
+  test "it runs the exception handler in the given locale" do
+    job = TranslatedRaisingJob.new
+    job.locale = :de
+    job.perform_now
+    assert_equal :de, JobBuffer.last_value
+  end
 end

activejob/test/cases/timezones_test.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative "../support/job_buffer"
+require "active_support/time"
+
+class TimezoneRaisingJob < ActiveJob::Base
+  rescue_from(StandardError) do
+    JobBuffer.add(Time.zone.name)
+  end
+
+  def perform
+    raise "boom"
+  end
+end

activejob/test/cases/translation_test.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "../support/job_buffer"
+
+class TranslatedRaisingJob < ActiveJob::Base
+  rescue_from(StandardError) do
+    JobBuffer.add(I18n.locale)
+  end
+
+  def perform
+    raise "boom"
+  end
+end