Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Use MiniTest in Ruby 1.8 if it is available."

This reverts commit c3e186e.

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.
  • Loading branch information...
commit 267fb61277ac960ad443d239febcb3136a007d24 1 parent cd5b2e1
@carlosantoniodasilva carlosantoniodasilva authored
View
5 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
View
4 activesupport/lib/active_support/test_case.rb
@@ -9,9 +9,7 @@
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

4 comments on commit 267fb61

@floehopper

You might want to consider this pull request as an alternative.

@carlosantoniodasilva

@floehopper that has been merged, do you think this should be reverted now? I can try and see if everything is working, if it's necessary. Thanks.

@floehopper

Sorry. I think my comment above might have been confusing. The (now merged) pull request (#8933) was an alternative to the commit (c3e186e) that this commit (267fb61) reverted. So I do not think this commit should be reverted. Does that make sense?

@carlosantoniodasilva

Perfect, I didn't understand they were interchangeable, sorry, I though the pull request was an addition to this one. Thank you!

Please sign in to comment.
Something went wrong with that request. Please try again.