diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
| commit | f32c3709830eb8d9f68a59c94f6791621c2b52ac (patch) | |
| tree | b34cf0b9321dfd40b795cc761b158be4cbde48f6 /activesupport/lib/active_support/test_case.rb | |
| parent | 9a28bd787660b08aae36155066e61d3608d0b4dd (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2 rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 3 |
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? |