From b2fca9533e6450d6e50d5ee6850dd91e3a9b085a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 6 Jan 2012 13:30:27 -0300
Subject: No need to check if MiniTest::Assertions is defined

---
 activesupport/test/test_case_test.rb | 62 +++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

(limited to 'activesupport')

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
-- 
cgit v1.2.3