aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-06-27 13:06:40 -0400
committerGitHub <noreply@github.com>2017-06-27 13:06:40 -0400
commit200b01ca413a43b0f874c81bc02024c1b6f0d7fc (patch)
tree9a095660c7a7083ba331aa633748a19b8ebfd3a1
parent8b42fce25038e87dd65bf32b331c7b3d4394654e (diff)
parentb58d73fc5771338a10fcdac7beea577b7a23ea78 (diff)
downloadrails-200b01ca413a43b0f874c81bc02024c1b6f0d7fc.tar.gz
rails-200b01ca413a43b0f874c81bc02024c1b6f0d7fc.tar.bz2
rails-200b01ca413a43b0f874c81bc02024c1b6f0d7fc.zip
Merge pull request #26587 from utilum/active_job_serialize_provider_job_id
ActiveJob::Core#serialize stores provider_job_id (fixes #26581).
-rw-r--r--activejob/lib/active_job/core.rb1
-rw-r--r--activejob/test/cases/job_serialization_test.rb8
2 files changed, 9 insertions, 0 deletions
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