4 files changed, 29 insertions, 13 deletions
diff --git a/activejob/activejob.gemspec b/activejob/activejob.gemspec
index bc1671b508..e97bb40abf 100644
--- a/activejob/activejob.gemspec
+++ b/activejob/activejob.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.author   = 'David Heinemeier Hansson'
   s.email    = 'david@loudthinking.com'
-  s.homepage = 'http://www.rubyonrails.org'
+  s.homepage = 'http://rubyonrails.org'
 
   s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.md', 'lib/**/*']
   s.require_path = 'lib'
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/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index eb8ad185aa..59dc3d7f78 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -62,13 +62,14 @@ class ArgumentSerializationTest < ActiveSupport::TestCase
     assert_raises ActiveJob::SerializationError do
       ActiveJob::Arguments.serialize [ { :a => [{ 2 => 3 }] } ]
     end
+  end
 
-    assert_raises ActiveJob::SerializationError do
-      ActiveJob::Arguments.serialize [ '_aj_globalid' => 1 ]
-    end
-
-    assert_raises ActiveJob::SerializationError do
-      ActiveJob::Arguments.serialize [ :_aj_globalid => 1 ]
+  test 'should not allow reserved hash keys' do
+    ['_aj_globalid', :_aj_globalid, '_aj_symbol_keys', :_aj_symbol_keys,
+     '_aj_hash_with_indifferent_access', :_aj_hash_with_indifferent_access].each do |key|
+      assert_raises ActiveJob::SerializationError do
+        ActiveJob::Arguments.serialize [key => 1]
+      end
     end
   end
 
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