diff options
Diffstat (limited to 'activesupport')
| -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 |