diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-15 17:45:36 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-15 17:45:36 -0800 |
| commit | fd990f24df87c0a445ea6a2a2df6fa8fbd3556b1 (patch) | |
| tree | 9857310ee82e2baa38e756c2233a3f2a813ecee0 | |
| parent | 9669aa7cf1c50964c4729fbd50a8776a1e815b44 (diff) | |
| parent | 48f9999fc3377f5e97513319313a70cf953fd617 (diff) | |
| download | rails-fd990f24df87c0a445ea6a2a2df6fa8fbd3556b1.tar.gz rails-fd990f24df87c0a445ea6a2a2df6fa8fbd3556b1.tar.bz2 rails-fd990f24df87c0a445ea6a2a2df6fa8fbd3556b1.zip | |
Merge pull request #8933 from freerange/3-2-stable-with-minitest-fix
Make tests for the presence of MiniTest consistent
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 8d6c27e381..573736ede7 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -10,7 +10,7 @@ require 'active_support/core_ext/kernel/reporting' module ActiveSupport class TestCase < ::Test::Unit::TestCase - if defined? MiniTest + if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions Assertion = MiniTest::Assertion alias_method :method_name, :name if method_defined? :name alias_method :method_name, :__name__ if method_defined? :__name__ |