aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-22 20:37:06 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-22 20:37:06 +0200
commit26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a (patch)
treef5eb36ae2efbb3a753c4dba5c0592a85e4544efa /test
parentef4aff07a41f1249baade695e68c75a8db3ded58 (diff)
downloadrails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.tar.gz
rails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.tar.bz2
rails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.zip
Rename #perform_with_hooks to #execution
Diffstat (limited to 'test')
-rw-r--r--test/cases/callbacks_test.rb2
-rw-r--r--test/cases/rescue_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cases/callbacks_test.rb b/test/cases/callbacks_test.rb
index 104519dcb7..01a9b9d26b 100644
--- a/test/cases/callbacks_test.rb
+++ b/test/cases/callbacks_test.rb
@@ -5,7 +5,7 @@ require 'active_support/core_ext/object/inclusion'
class CallbacksTest < ActiveSupport::TestCase
test 'perform callbacks' do
- performed_callback_job = CallbackJob.new.tap { |j| j.perform_with_hooks }
+ performed_callback_job = CallbackJob.new.tap { |j| j.execute }
assert "CallbackJob ran before_perform".in? performed_callback_job.history
assert "CallbackJob ran after_perform".in? performed_callback_job.history
assert "CallbackJob ran around_perform_start".in? performed_callback_job.history
diff --git a/test/cases/rescue_test.rb b/test/cases/rescue_test.rb
index ca4c69f91b..a91ed01f45 100644
--- a/test/cases/rescue_test.rb
+++ b/test/cases/rescue_test.rb
@@ -10,7 +10,7 @@ class RescueTest < ActiveSupport::TestCase
test 'rescue perform exception with retry' do
job = RescueJob.new
- job.perform_with_hooks("david")
+ job.execute("david")
assert_equal [ "rescued from StandardError", "performed beautifully" ], $BUFFER
end
end