aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 13:30:27 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 13:31:39 -0300
commitb2fca9533e6450d6e50d5ee6850dd91e3a9b085a (patch)
tree21258a2ab890ac44b754e016aa5a7f4a6512ae3d /activesupport/test
parent3ca7fa96f7160ae67c289504d7984dcebdedbeae (diff)
downloadrails-b2fca9533e6450d6e50d5ee6850dd91e3a9b085a.tar.gz
rails-b2fca9533e6450d6e50d5ee6850dd91e3a9b085a.tar.bz2
rails-b2fca9533e6450d6e50d5ee6850dd91e3a9b085a.zip
No need to check if MiniTest::Assertions is defined
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/test_case_test.rb62
1 files changed, 30 insertions, 32 deletions
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 756d21b3e4..20982d089d 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -18,44 +18,42 @@ 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
- end
-
- test_name = 'test_true'
- fr = FakeRunner.new
-
- 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
+ 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
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
- end
+ test_name = 'test_true'
+ fr = FakeRunner.new
- test_name = 'test_true'
- fr = FakeRunner.new
+ test = tc.new test_name
+ test.run fr
+ klass, name, exception = *fr.puked.first
- 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
- assert_equal tc, klass
- assert_equal test_name, name
- assert_equal 'oh noes', exception.message
+ 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
end
+
+ test_name = 'test_true'
+ fr = FakeRunner.new
+
+ 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