From b58d73fc5771338a10fcdac7beea577b7a23ea78 Mon Sep 17 00:00:00 2001
From: utilum <oz@utilum.com>
Date: Thu, 22 Sep 2016 17:17:28 +0200
Subject: ActiveJob::Core#serialize stores provider_job_id (fixes #26581).

---
 activejob/lib/active_job/core.rb               | 1 +
 activejob/test/cases/job_serialization_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb
index 548ec89ee2..e3e63f227e 100644
--- a/activejob/lib/active_job/core.rb
+++ b/activejob/lib/active_job/core.rb
@@ -80,6 +80,7 @@ module ActiveJob
       {
         "job_class"  => self.class.name,
         "job_id"     => job_id,
+        "provider_job_id" => provider_job_id,
         "queue_name" => queue_name,
         "priority"   => priority,
         "arguments"  => serialize_arguments(arguments),
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index 3f2e300dfa..c737557ece 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -44,4 +44,12 @@ class JobSerializationTest < ActiveSupport::TestCase
     job.deserialize({})
     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
 end
-- 
cgit v1.2.3