aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-20 15:20:54 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-20 15:20:54 -0300
commit88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbb (patch)
treedebbe0646cc28306e11b68bdd68a7e8b02cb0370 /activesupport/test
parent74a847771ff35689ab4a98401ca83e0a0c4b0efa (diff)
parent6cc5a86a54b8eef361e65c871204099e3afcbba7 (diff)
downloadrails-88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbb.tar.gz
rails-88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbb.tar.bz2
rails-88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbb.zip
Merge pull request #15187 from v-yarotsky/fix_confusing_delegation_exception
Fix confusing exception in ActiveSupport delegation
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/module_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index ff6e21854e..380f5ad42b 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -72,7 +72,7 @@ Product = Struct.new(:name) do
def type
@type ||= begin
- nil.type_name
+ :thing_without_same_method_name_as_delegated.name
end
end
end