Merge pull request #4354 from rafaelfranca/patch-1

Remove some checks if MiniTest is defined

activesupport/test/deprecation_test.rb

@@ -166,22 +166,4 @@ def test_deprecation_with_alternate_method
   def test_deprecation_with_explicit_message
     assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
   end
-
-  unless defined?(::MiniTest)
-    def test_assertion_failed_error_doesnt_spout_deprecation_warnings
-      error_class = Class.new(StandardError) do
-        def message
-          ActiveSupport::Deprecation.warn 'warning in error message'
-          super
-        end
-      end
-
-      raise error_class.new('hmm')
-
-    rescue => e
-      error = Test::Unit::Error.new('testing ur doodz', e)
-      assert_not_deprecated { error.message }
-      assert_nil @last_message
-    end
-  end
 end

activesupport/test/test_case_test.rb

@@ -18,44 +18,42 @@ def options
       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