aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2009-07-19 14:36:44 +0900
committerYehuda Katz <wycats@gmail.com>2009-07-21 01:15:51 -0700
commit9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (patch)
tree754b2fc9c333ba09cee96a482691f3b98d01e4ef /activesupport
parent9163b9ac9d0b986cb5de2af63a8ed50ffc8ece71 (diff)
downloadrails-9d7aae710384fb5f04129c35b86c5ea5fb9d83a9.tar.gz
rails-9d7aae710384fb5f04129c35b86c5ea5fb9d83a9.tar.bz2
rails-9d7aae710384fb5f04129c35b86c5ea5fb9d83a9.zip
Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest 1.4.x [#2922 state:resolved]
Signed-off-by: Yehuda Katz <wycats@gmail.com>
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/test_case.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index d5282bad6a..c915bf799d 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -19,7 +19,8 @@ module ActiveSupport
class TestCase < ::Test::Unit::TestCase
if defined? MiniTest
Assertion = MiniTest::Assertion
- alias_method :method_name, :name
+ alias_method :method_name, :name if method_defined? :name
+ alias_method :method_name, :__name__ if method_defined? :__name__
else
# TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
if defined?(Rails) && ENV['BACKTRACE'].nil?