3 files changed, 31 insertions, 1 deletions
diff --git a/test/cases/callbacks_test.rb b/test/cases/callbacks_test.rb
index 06e2ea4a2e..104519dcb7 100644
--- a/test/cases/callbacks_test.rb
+++ b/test/cases/callbacks_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'active_job/arguments'
 require 'jobs/callback_job'
 
 require 'active_support/core_ext/object/inclusion'
diff --git a/test/cases/rescue_test.rb b/test/cases/rescue_test.rb
new file mode 100644
index 0000000000..ca4c69f91b
--- /dev/null
+++ b/test/cases/rescue_test.rb
@@ -0,0 +1,16 @@
+require 'helper'
+require 'jobs/rescue_job'
+
+require 'active_support/core_ext/object/inclusion'
+
+class RescueTest < ActiveSupport::TestCase
+  setup do
+    $BUFFER = []
+  end
+  
+  test 'rescue perform exception with retry' do
+    job = RescueJob.new
+    job.perform_with_hooks("david")
+    assert_equal [ "rescued from StandardError", "performed beautifully" ], $BUFFER
+  end
+end
diff --git a/test/jobs/rescue_job.rb b/test/jobs/rescue_job.rb
new file mode 100644
index 0000000000..66b28d768e
--- /dev/null
+++ b/test/jobs/rescue_job.rb
@@ -0,0 +1,15 @@
+class RescueJob < ActiveJob::Base
+  rescue_from(StandardError) do
+    $BUFFER << "rescued from StandardError"
+    arguments[0] = "DIFFERENT!"
+    retry_now
+  end
+
+  def perform(person = "david")
+    if person == "david"
+      raise "Hair too good"
+    else
+      $BUFFER << "performed beautifully"
+    end
+  end
+end