diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-12-31 09:13:40 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-12-31 09:13:40 -0800 |
| commit | d3a2c0e183e52364103c3f60afe0db46417de430 (patch) | |
| tree | 36fcb6dade9662bed2faf18b10732e28e2ea45a9 /activesupport | |
| parent | 86705b60a3bdbaaf39bc24cbc284a72eb533f9c1 (diff) | |
| parent | c20a74da4f6109e640590576b08228df3f953a38 (diff) | |
| download | rails-d3a2c0e183e52364103c3f60afe0db46417de430.tar.gz rails-d3a2c0e183e52364103c3f60afe0db46417de430.tar.bz2 rails-d3a2c0e183e52364103c3f60afe0db46417de430.zip | |
Merge pull request #4242 from castlerock/remove_condition_for_MiniTest
MiniTest condition removed
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 8d6c27e381..707544e594 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -10,15 +10,9 @@ require 'active_support/core_ext/kernel/reporting' module ActiveSupport class TestCase < ::Test::Unit::TestCase - if defined? MiniTest - Assertion = MiniTest::Assertion - alias_method :method_name, :name if method_defined? :name - alias_method :method_name, :__name__ if method_defined? :__name__ - else - Assertion = Test::Unit::AssertionFailedError - - undef :default_test - end + Assertion = MiniTest::Assertion + alias_method :method_name, :name if method_defined? :name + alias_method :method_name, :__name__ if method_defined? :__name__ $tags = {} def self.for_tag(tag) |