diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 10:08:43 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 11:01:35 -0200 |
| commit | 267fb61277ac960ad443d239febcb3136a007d24 (patch) | |
| tree | feec65cd4fa76598e196b8ce44a9f8a6d74c6b7d | |
| parent | cd5b2e1e56419c6871105eeabfe4dd177f8303bf (diff) | |
| download | rails-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.
| -rw-r--r-- | activesupport/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index d7cbaa6093..a3e1854ada 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -2,11 +2,6 @@ * Fix mocha v0.13.0 compatibility. *James Mead* -* `ActiveSupport::TestCase` now inherits from `Minitest::Unit::TestCase` in Ruby 1.8 - if available, otherwise it inherits from the default `Test::Unit::TestCase`. - - *James Mead* - * `#as_json` isolates options when encoding a hash. [Backport #8185] Fix #8182 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 |