Merge pull request #6647 from amatsuda/192_minitest_method_name

MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__
rails · Jun 6, 2012 · 9612397 · 9612397
2 parents 9fb7003 + 7fe6002
commit 9612397
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
@@ -22,8 +22,7 @@ class << self
     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)