Rework testing extensions to reflect the recent miniunit upheaval

3 files changed, 25 insertions, 17 deletions

diff --git a/activesupport/test/core_ext/module/model_naming_test.rb b/activesupport/test/core_ext/module/model_naming_test.rb
index fc73fa5c36..d08349dd97 100644
--- a/activesupport/test/core_ext/module/model_naming_test.rb
+++ b/activesupport/test/core_ext/module/model_naming_test.rb
@@ -2,18 +2,18 @@ require 'abstract_unit'
 
 class ModelNamingTest < Test::Unit::TestCase
   def setup
-    @name = ActiveSupport::ModelName.new('Post::TrackBack')
+    @model_name = ActiveSupport::ModelName.new('Post::TrackBack')
   end
 
   def test_singular
-    assert_equal 'post_track_back', @name.singular
+    assert_equal 'post_track_back', @model_name.singular
   end
 
   def test_plural
-    assert_equal 'post_track_backs', @name.plural
+    assert_equal 'post_track_backs', @model_name.plural
   end
 
   def test_partial_path
-    assert_equal 'post/track_backs/track_back', @name.partial_path
+    assert_equal 'post/track_backs/track_back', @model_name.partial_path
   end
 end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 5697ab26af..73a1f9959c 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -143,19 +143,21 @@ class DeprecationTest < ActiveSupport::TestCase
     assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
   end
 
-  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
+  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
-    end
 
-    raise error_class.new('hmm')
+      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
+    rescue => e
+      error = Test::Unit::Error.new('testing ur doodz', e)
+      assert_not_deprecated { error.message }
+      assert_nil @last_message
+    end
   end
 end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index d4ae221f4f..f3d29e6de4 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -66,6 +66,8 @@ class AssertDifferenceTest < ActiveSupport::TestCase
         @object.increment
       end
       fail 'should not get to here'
+    rescue MiniTest::Assertion => e
+      assert_equal "<3> expected but was\n<2>.", e.message
     rescue Test::Unit::AssertionFailedError => e
       assert_equal "<1 + 1> was the expression that failed.\n<3> expected but was\n<2>.", e.message
     end
@@ -75,6 +77,8 @@ class AssertDifferenceTest < ActiveSupport::TestCase
         @object.increment
       end
       fail 'should not get to here'
+    rescue MiniTest::Assertion => e
+      assert_equal "something went wrong.\n<3> expected but was\n<2>.", e.message
     rescue Test::Unit::AssertionFailedError => e
       assert_equal "something went wrong.\n<1 + 1> was the expression that failed.\n<3> expected but was\n<2>.", e.message
     end
@@ -84,8 +88,10 @@ class AssertDifferenceTest < ActiveSupport::TestCase
 end
 
 # These should always pass
-class NotTestingThingsTest < Test::Unit::TestCase
-  include ActiveSupport::Testing::Default
+if defined? ActiveSupport::Testing::Default
+  class NotTestingThingsTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Default
+  end
 end
 
 class AlsoDoingNothingTest < ActiveSupport::TestCase