diff options
Diffstat (limited to 'activesupport/test/test_case_test.rb')
-rw-r--r-- | activesupport/test/test_case_test.rb | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb index 756d21b3e4..e5b5547478 100644 --- a/activesupport/test/test_case_test.rb +++ b/activesupport/test/test_case_test.rb @@ -18,44 +18,50 @@ module ActiveSupport end end - if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions - def test_callback_with_exception - tc = Class.new(TestCase) do - setup :bad_callback - def bad_callback; raise 'oh noes' end - def test_true; assert true end + def test_callback_with_exception + tc = Class.new(TestCase) do + def self.name + nil end - test_name = 'test_true' - fr = FakeRunner.new + setup :bad_callback + def bad_callback; raise 'oh noes' end + def test_true; assert true end + end - test = tc.new test_name - test.run fr - klass, name, exception = *fr.puked.first + test_name = 'test_true' + fr = FakeRunner.new - assert_equal tc, klass - assert_equal test_name, name - assert_equal 'oh noes', exception.message - end + test = tc.new test_name + test.run fr + klass, name, exception = *fr.puked.first + + assert_equal tc, klass + assert_equal test_name, name + assert_equal 'oh noes', exception.message + end - def test_teardown_callback_with_exception - tc = Class.new(TestCase) do - teardown :bad_callback - def bad_callback; raise 'oh noes' end - def test_true; assert true end + def test_teardown_callback_with_exception + tc = Class.new(TestCase) do + def self.name + nil end - test_name = 'test_true' - fr = FakeRunner.new + teardown :bad_callback + def bad_callback; raise 'oh noes' end + def test_true; assert true end + end - test = tc.new test_name - test.run fr - klass, name, exception = *fr.puked.first + test_name = 'test_true' + fr = FakeRunner.new - assert_equal tc, klass - assert_equal test_name, name - assert_equal 'oh noes', exception.message - end + test = tc.new test_name + test.run fr + klass, name, exception = *fr.puked.first + + assert_equal tc, klass + assert_equal test_name, name + assert_equal 'oh noes', exception.message end end end |