diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-05 18:54:28 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-05 18:54:28 +0200 |
commit | f2400de8013c4d9798e7f69c44b1c987e719a5a4 (patch) | |
tree | 2ab0d3b2b2530ad296c34cc57df66c715ee7be0b /actionpack/test/controller/rescue_test.rb | |
parent | a8f4568f5396b68ae81eddc636604bb78bb6632a (diff) | |
parent | 81bc771e7cccb8a43f067a89f721f83798e63483 (diff) | |
download | rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.tar.gz rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.tar.bz2 rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.zip |
Merge pull request #21506 from rodzyn/remove_mocha_part_3
Remove mocha from ActionPack tests
Diffstat (limited to 'actionpack/test/controller/rescue_test.rb')
-rw-r--r-- | actionpack/test/controller/rescue_test.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb index e767323773..f53f061e10 100644 --- a/actionpack/test/controller/rescue_test.rb +++ b/actionpack/test/controller/rescue_test.rb @@ -246,12 +246,15 @@ class RescueControllerTest < ActionController::TestCase end def test_rescue_handler_with_argument - @controller.expects(:show_errors).once.with { |e| e.is_a?(Exception) } - get :record_invalid + assert_called_with @controller, :show_errors, [Exception] do + get :record_invalid + end end + def test_rescue_handler_with_argument_as_string - @controller.expects(:show_errors).once.with { |e| e.is_a?(Exception) } - get :record_invalid_raise_as_string + assert_called_with @controller, :show_errors, [Exception] do + get :record_invalid_raise_as_string + end end def test_proc_rescue_handler |