Merge pull request rails#52121 from Intrepidd/activejob-serialize-locale

Include the actual ActiveJob locale when serializing rather than I18n locale

Author: fatkodima

activejob/lib/active_job/core.rb

@@ -124,7 +124,7 @@ def serialize
         "arguments"  => serialize_arguments_if_needed(arguments),
         "executions" => executions,
         "exception_executions" => exception_executions,
-        "locale"     => I18n.locale.to_s,
+        "locale"     => locale || I18n.locale.to_s,
         "timezone"   => timezone,
         "enqueued_at" => Time.now.utc.iso8601(9),
         "scheduled_at" => scheduled_at ? scheduled_at.utc.iso8601(9) : nil,

activejob/test/cases/job_serialization_test.rb

@@ -21,6 +21,25 @@ class JobSerializationTest < ActiveSupport::TestCase
     assert_equal "en", HelloJob.new.serialize["locale"]
   end
 
+  test "a deserialized job keeps its locale even if I18n.locale changes" do
+    old_locales = I18n.available_locales
+    begin
+      I18n.available_locales = [:en, :es]
+      I18n.locale = :es
+      payload = HelloJob.new.serialize
+      assert_equal "es", payload["locale"]
+
+      I18n.locale = :en
+
+      new_job = HelloJob.new
+      new_job.deserialize(payload)
+
+      assert_equal "es", new_job.serialize["locale"]
+    ensure
+      I18n.available_locales = old_locales
+    end
+  end
+
   test "serialize and deserialize are symmetric" do
     # Ensure `enqueued_at` does not change between serializations
     freeze_time