mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #4242 from castlerock/remove_condition_for_MiniTest
MiniTest condition removed
This commit is contained in:
commit
d3a2c0e183
1 changed files with 3 additions and 9 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue