Merge pull request #24123 from mperham/master

Job payload should be symmetric across JSON dump/load

2 files changed, 21 insertions, 6 deletions

diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb
index 19b900a285..f7f882c998 100644
--- a/activejob/lib/active_job/core.rb
+++ b/activejob/lib/active_job/core.rb
@@ -79,7 +79,7 @@ module ActiveJob
         'queue_name' => queue_name,
         'priority'   => priority,
         'arguments'  => serialize_arguments(arguments),
-        'locale'     => I18n.locale
+        'locale'     => I18n.locale.to_s
       }
     end
 
@@ -108,7 +108,7 @@ module ActiveJob
       self.queue_name           = job_data['queue_name']
       self.priority             = job_data['priority']
       self.serialized_arguments = job_data['arguments']
-      self.locale               = job_data['locale'] || I18n.locale
+      self.locale               = job_data['locale'] || I18n.locale.to_s
     end
 
     private
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index 229517774e..fa94209889 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -2,6 +2,7 @@ require 'helper'
 require 'jobs/gid_job'
 require 'jobs/hello_job'
 require 'models/person'
+require 'json'
 
 class JobSerializationTest < ActiveSupport::TestCase
   setup do
@@ -15,18 +16,32 @@ class JobSerializationTest < ActiveSupport::TestCase
   end
 
   test 'serialize includes current locale' do
-    assert_equal :en, HelloJob.new.serialize['locale']
+    assert_equal 'en', HelloJob.new.serialize['locale']
+  end
+
+  test 'serialize and deserialize are symmetric' do
+    # Round trip a job in memory only
+    h1 = HelloJob.new
+    h1.deserialize(h1.serialize)
+
+    # Now verify it's identical to a JSON round trip.
+    # We don't want any non-native JSON elements in the job hash,
+    # like symbols.
+    payload = JSON.dump(h1.serialize)
+    h2 = HelloJob.new
+    h2.deserialize(JSON.load(payload))
+    assert_equal h1.serialize, h2.serialize
   end
 
   test 'deserialize sets locale' do
     job = HelloJob.new
-    job.deserialize 'locale' => :es
-    assert_equal :es, job.locale
+    job.deserialize 'locale' => 'es'
+    assert_equal 'es', job.locale
   end
 
   test 'deserialize sets default locale' do
     job = HelloJob.new
     job.deserialize({})
-    assert_equal :en, job.locale
+    assert_equal 'en', job.locale
   end
 end