aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-13 10:08:43 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-13 11:01:35 -0200
commit267fb61277ac960ad443d239febcb3136a007d24 (patch)
treefeec65cd4fa76598e196b8ce44a9f8a6d74c6b7d /activesupport/lib
parentcd5b2e1e56419c6871105eeabfe4dd177f8303bf (diff)
downloadrails-267fb61277ac960ad443d239febcb3136a007d24.tar.gz
rails-267fb61277ac960ad443d239febcb3136a007d24.tar.bz2
rails-267fb61277ac960ad443d239febcb3136a007d24.zip
Revert "Use MiniTest in Ruby 1.8 if it is available."
This reverts commit c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f. Reason: too many incompatibilities make a lot of Rails tests fail in 1.9. Might need more work to get this done properly in 3-2 if necessary.
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/test_case.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 8f75cf98f4..8d6c27e381 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -9,9 +9,7 @@ require 'active_support/testing/mochaing'
require 'active_support/core_ext/kernel/reporting'
module ActiveSupport
- test_library = defined?(MiniTest) ? ::MiniTest : ::Test
-
- class TestCase < test_library::Unit::TestCase
+ class TestCase < ::Test::Unit::TestCase
if defined? MiniTest
Assertion = MiniTest::Assertion
alias_method :method_name, :name if method_defined? :name