Add retry_on/discard_on for better exception handling

2 files changed, 68 insertions, 0 deletions

diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
new file mode 100644
index 0000000000..42d4dd78a5
--- /dev/null
+++ b/activejob/test/cases/exceptions_test.rb
@@ -0,0 +1,47 @@
+require 'helper'
+require 'jobs/retry_job'
+
+class ExceptionsTest < ActiveSupport::TestCase
+  setup do
+    JobBuffer.clear
+  end
+
+  test "successfully retry job throwing exception against defaults" do
+    RetryJob.perform_later 'SeriousError', 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",
+      "Successfully completed job" ], JobBuffer.values
+  end
+
+  test "successfully retry job throwing exception against higher limit" do
+    RetryJob.perform_later 'VerySeriousError', 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
+      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 SeriousError
+      pass
+    end
+  end
+
+  test "discard job" do
+    RetryJob.perform_later 'NotSeriousError', 2
+    assert_equal "Raised NotSeriousError 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
new file mode 100644
index 0000000000..2e05f95bf6
--- /dev/null
+++ b/activejob/test/jobs/retry_job.rb
@@ -0,0 +1,21 @@
+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 RetryJob < ActiveJob::Base
+  retry_on SeriousError
+  retry_on VerySeriousError, wait: 1.second, attempts: 10
+  discard_on NotSeriousError
+
+  def perform(raising, attempts)
+    if executions < attempts
+      JobBuffer.add("Raised #{raising} for the #{executions.ordinalize} time")
+      raise raising.constantize
+    else
+      JobBuffer.add("Successfully completed job")
+    end
+  end
+end