aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-06 06:24:21 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-06 06:24:21 -0700
commit96123978ff5cbfe1ce56c2a3203b02007823335b (patch)
tree6342945a792c72f4d1ff82b55fada5c1b3116ae3
parent9fb70033d36f467d4eb858e9fac1282a0394876a (diff)
parent7fe6002793fd14f57fc2d7bd4506c82afb18aec4 (diff)
downloadrails-96123978ff5cbfe1ce56c2a3203b02007823335b.tar.gz
rails-96123978ff5cbfe1ce56c2a3203b02007823335b.tar.bz2
rails-96123978ff5cbfe1ce56c2a3203b02007823335b.zip
Merge pull request #6647 from amatsuda/192_minitest_method_name
MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__
-rw-r--r--activesupport/lib/active_support/test_case.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 9a52c916ec..14ceb7072e 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -22,8 +22,7 @@ module ActiveSupport
end
Assertion = MiniTest::Assertion
- alias_method :method_name, :name if method_defined? :name
- alias_method :method_name, :__name__ if method_defined? :__name__
+ alias_method :method_name, :__name__
$tags = {}
def self.for_tag(tag)