diff options
author | José Valim <jose.valim@gmail.com> | 2012-05-29 01:35:40 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-05-29 01:35:40 -0700 |
commit | 6ba93ac6f6fa873c510a084c6f178390939841e9 (patch) | |
tree | 07d7e5775de0b4be0bb2bc3b13a05ff4e2bab24f /activesupport/test | |
parent | 2d898cd8b73dc53d1a2a4652482ba1f8e25a83e9 (diff) | |
parent | 7d8e5fac758bebc7199b514b08d4755a6f897435 (diff) | |
download | rails-6ba93ac6f6fa873c510a084c6f178390939841e9.tar.gz rails-6ba93ac6f6fa873c510a084c6f178390939841e9.tar.bz2 rails-6ba93ac6f6fa873c510a084c6f178390939841e9.zip |
Merge pull request #6525 from freerange/minitest-passthrough-exceptions
Exceptions like Interrupt & NoMemoryError should not be rescued in tests.
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/test_case_test.rb | 58 |
1 files changed, 50 insertions, 8 deletions
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb index e5b5547478..c02bfa8497 100644 --- a/activesupport/test/test_case_test.rb +++ b/activesupport/test/test_case_test.rb @@ -18,11 +18,9 @@ module ActiveSupport end end - def test_callback_with_exception + def test_standard_error_raised_within_setup_callback_is_puked tc = Class.new(TestCase) do - def self.name - nil - end + def self.name; nil; end setup :bad_callback def bad_callback; raise 'oh noes' end @@ -41,11 +39,9 @@ module ActiveSupport assert_equal 'oh noes', exception.message end - def test_teardown_callback_with_exception + def test_standard_error_raised_within_teardown_callback_is_puked tc = Class.new(TestCase) do - def self.name - nil - end + def self.name; nil; end teardown :bad_callback def bad_callback; raise 'oh noes' end @@ -63,5 +59,51 @@ module ActiveSupport assert_equal test_name, name assert_equal 'oh noes', exception.message end + + def test_passthrough_exception_raised_within_test_method_is_not_rescued + tc = Class.new(TestCase) do + def self.name; nil; end + + def test_which_raises_interrupt; raise Interrupt; end + end + + test_name = 'test_which_raises_interrupt' + fr = FakeRunner.new + + test = tc.new test_name + assert_raises(Interrupt) { test.run fr } + end + + def test_passthrough_exception_raised_within_setup_callback_is_not_rescued + tc = Class.new(TestCase) do + def self.name; nil; end + + setup :callback_which_raises_interrupt + def callback_which_raises_interrupt; raise Interrupt; end + def test_true; assert true end + end + + test_name = 'test_true' + fr = FakeRunner.new + + test = tc.new test_name + assert_raises(Interrupt) { test.run fr } + end + + def test_passthrough_exception_raised_within_teardown_callback_is_not_rescued + tc = Class.new(TestCase) do + def self.name; nil; end + + teardown :callback_which_raises_interrupt + def callback_which_raises_interrupt; raise Interrupt; end + def test_true; assert true end + end + + test_name = 'test_true' + fr = FakeRunner.new + + test = tc.new test_name + assert_raises(Interrupt) { test.run fr } + end end end |