From 08a92d47b08b25356b8bfea31c91ceb68cfae3ee Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 1 Aug 2016 16:09:16 -0700
Subject: [PATCH] Use descriptive exception names

---
 activejob/test/cases/exceptions_test.rb | 28 ++++++++++++-------------
 activejob/test/jobs/retry_job.rb        | 12 +++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index b120a580fa..f6ca528362 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -7,41 +7,41 @@ class ExceptionsTest < ActiveSupport::TestCase
   end
 
   test "successfully retry job throwing exception against defaults" do
-    RetryJob.perform_later 'SeriousError', 5
+    RetryJob.perform_later 'DefaultsError', 5
 
     assert_equal [
-      "Raised SeriousError for the 1st time",
-      "Raised SeriousError for the 2nd time",
-      "Raised SeriousError for the 3rd time",
-      "Raised SeriousError for the 4th time",
+      "Raised DefaultsError for the 1st time",
+      "Raised DefaultsError for the 2nd time",
+      "Raised DefaultsError for the 3rd time",
+      "Raised DefaultsError for the 4th time",
       "Successfully completed job" ], JobBuffer.values
   end
 
   test "successfully retry job throwing exception against higher limit" do
-    RetryJob.perform_later 'VerySeriousError', 9
+    RetryJob.perform_later 'ShortWaitTenAttemptsError', 9
     assert_equal 9, JobBuffer.values.count
   end
 
   test "failed retry job when exception kept occurring against defaults" do
     begin
-      RetryJob.perform_later 'SeriousError', 6
-      assert_equal "Raised SeriousError for the 5th time", JobBuffer.last_value
-    rescue SeriousError
+      RetryJob.perform_later 'DefaultsError', 6
+      assert_equal "Raised DefaultsError for the 5th time", JobBuffer.last_value
+    rescue DefaultsError
       pass
     end
   end
 
   test "failed retry job when exception kept occurring against higher limit" do
     begin
-      RetryJob.perform_later 'VerySeriousError', 11
-      assert_equal "Raised VerySeriousError for the 10th time", JobBuffer.last_value
-    rescue VerySeriousError
+      RetryJob.perform_later 'ShortWaitTenAttemptsError', 11
+      assert_equal "Raised ShortWaitTenAttemptsError for the 10th time", JobBuffer.last_value
+    rescue ShortWaitTenAttemptsError
       pass
     end
   end
 
   test "discard job" do
-    RetryJob.perform_later 'NotSeriousError', 2
-    assert_equal "Raised NotSeriousError for the 1st time", JobBuffer.last_value
+    RetryJob.perform_later 'DiscardableError', 2
+    assert_equal "Raised DiscardableError for the 1st time", JobBuffer.last_value
   end
 end
diff --git a/activejob/test/jobs/retry_job.rb b/activejob/test/jobs/retry_job.rb
index 2e05f95bf6..91be37f106 100644
--- a/activejob/test/jobs/retry_job.rb
+++ b/activejob/test/jobs/retry_job.rb
@@ -1,14 +1,14 @@
 require_relative '../support/job_buffer'
 require 'active_support/core_ext/integer/inflections'
 
-class SeriousError < StandardError; end
-class VerySeriousError < StandardError; end
-class NotSeriousError < StandardError; end
+class DefaultsError < StandardError; end
+class ShortWaitTenAttemptsError < StandardError; end
+class DiscardableError < StandardError; end
 
 class RetryJob < ActiveJob::Base
-  retry_on SeriousError
-  retry_on VerySeriousError, wait: 1.second, attempts: 10
-  discard_on NotSeriousError
+  retry_on DefaultsError
+  retry_on ShortWaitTenAttemptsError, wait: 1.second, attempts: 10
+  discard_on DiscardableError
 
   def perform(raising, attempts)
     if executions < attempts