3 files changed, 9 insertions, 9 deletions
diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index bc33d79f61..15938e3fc7 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -61,7 +61,7 @@ class ExceptionsTest < ActiveJob::TestCase
   test "custom handling of discarded job" do
     perform_enqueued_jobs do
       RetryJob.perform_later "CustomDiscardableError", 2
-      assert_equal "Dealt with a job that was discarded in a custom way", JobBuffer.last_value
+      assert_equal "Dealt with a job that was discarded in a custom way. Message: CustomDiscardableError", JobBuffer.last_value
     end
   end
 
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index 5c9994508e..86f3651564 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -23,16 +23,16 @@ class JobSerializationTest < ActiveSupport::TestCase
 
   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
diff --git a/activejob/test/jobs/retry_job.rb b/activejob/test/jobs/retry_job.rb
index 82b80fe12b..a12c65015b 100644
--- a/activejob/test/jobs/retry_job.rb
+++ b/activejob/test/jobs/retry_job.rb
@@ -18,9 +18,9 @@ class RetryJob < ActiveJob::Base
   retry_on ShortWaitTenAttemptsError, wait: 1.second, attempts: 10
   retry_on ExponentialWaitTenAttemptsError, wait: :exponentially_longer, attempts: 10
   retry_on CustomWaitTenAttemptsError, wait: ->(executions) { executions * 2 }, attempts: 10
-  retry_on(CustomCatchError) { |job, exception| JobBuffer.add("Dealt with a job that failed to retry in a custom way after #{job.arguments.second} attempts. Message: #{exception.message}") }
+  retry_on(CustomCatchError) { |job, error| JobBuffer.add("Dealt with a job that failed to retry in a custom way after #{job.arguments.second} attempts. Message: #{error.message}") }
   discard_on DiscardableError
-  discard_on(CustomDiscardableError) { |job, exception| JobBuffer.add("Dealt with a job that was discarded in a custom way") }
+  discard_on(CustomDiscardableError) { |job, error| JobBuffer.add("Dealt with a job that was discarded in a custom way. Message: #{error.message}") }
 
   def perform(raising, attempts)
     if executions < attempts