1 files changed, 48 insertions, 20 deletions
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index fa94209889..c1cec1f1d6 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -1,8 +1,10 @@
-require 'helper'
-require 'jobs/gid_job'
-require 'jobs/hello_job'
-require 'models/person'
-require 'json'
+# frozen_string_literal: true
+
+require "helper"
+require "jobs/gid_job"
+require "jobs/hello_job"
+require "models/person"
+require "json"
 
 class JobSerializationTest < ActiveSupport::TestCase
   setup do
@@ -10,38 +12,64 @@ class JobSerializationTest < ActiveSupport::TestCase
     @person = Person.find(5)
   end
 
-  test 'serialize job with gid' do
+  test "serialize job with gid" do
     GidJob.perform_later @person
     assert_equal "Person with ID: 5", JobBuffer.last_value
   end
 
-  test 'serialize includes current locale' do
-    assert_equal 'en', HelloJob.new.serialize['locale']
+  test "serialize includes current locale" do
+    assert_equal "en", HelloJob.new.serialize["locale"]
   end
 
-  test 'serialize and deserialize are symmetric' do
+  test "serialize and deserialize are symmetric" do
     # Round trip a job in memory only
-    h1 = HelloJob.new
-    h1.deserialize(h1.serialize)
+    h1 = HelloJob.new("Rafael")
+    h2 = HelloJob.deserialize(h1.serialize)
+    assert_equal h1.serialize, h2.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
+    payload = JSON.dump(h2.serialize)
+    h3 = HelloJob.deserialize(JSON.load(payload))
+    assert_equal h2.serialize, h3.serialize
   end
 
-  test 'deserialize sets locale' do
+  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
+  test "deserialize sets default locale" do
     job = HelloJob.new
     job.deserialize({})
-    assert_equal 'en', job.locale
+    assert_equal "en", job.locale
+  end
+
+  test "serialize stores provider_job_id" do
+    job = HelloJob.new
+    assert_nil job.serialize["provider_job_id"]
+
+    job.provider_job_id = "some value set by adapter"
+    assert_equal job.provider_job_id, job.serialize["provider_job_id"]
+  end
+
+  test "serialize stores the current timezone" do
+    Time.use_zone "Hawaii" do
+      job = HelloJob.new
+      assert_equal "Hawaii", job.serialize["timezone"]
+    end
+  end
+
+  test "serialize stores the enqueued_at time" do
+    h1 = HelloJob.new
+    type = h1.serialize["enqueued_at"].class
+    assert_equal String, type
+
+    h2 = HelloJob.deserialize(h1.serialize)
+    # We should be able to parse a timestamp
+    type = Time.parse(h2.enqueued_at).class
+    assert_equal Time, type
   end
 end