Permalink
Browse files

Merge pull request #8933 from freerange/3-2-stable-with-minitest-fix

Make tests for the presence of MiniTest consistent
  • Loading branch information...
2 parents 9669aa7 + 48f9999 commit fd990f24df87c0a445ea6a2a2df6fa8fbd3556b1 @rafaelfranca rafaelfranca committed Jan 16, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/test_case.rb
@@ -10,7 +10,7 @@
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__

0 comments on commit fd990f2

Please sign in to comment.