diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-06 00:34:39 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-06 00:37:15 +0200 |
| commit | 82d41c969897cca28bb318f7caf301d520a2fbf3 (patch) | |
| tree | 8a663fae4280827c8c551073bb8bd9f42a31333c | |
| parent | 2e9e647fee59d975c9564d96c924d29ffe57f2a2 (diff) | |
| download | rails-82d41c969897cca28bb318f7caf301d520a2fbf3.tar.gz rails-82d41c969897cca28bb318f7caf301d520a2fbf3.tar.bz2 rails-82d41c969897cca28bb318f7caf301d520a2fbf3.zip | |
Revert "don't raise NoMethodError the tried method doesn't exists"
This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/try.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/object_and_class_ext_test.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb index 4797c93e63..e77a9da0ec 100644 --- a/activesupport/lib/active_support/core_ext/object/try.rb +++ b/activesupport/lib/active_support/core_ext/object/try.rb @@ -28,8 +28,6 @@ class Object def try(*a, &b) if a.empty? && block_given? yield self - elsif !a.empty? && !respond_to?(a.first) - nil else __send__(*a, &b) end diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb index beb371d987..920be4a846 100644 --- a/activesupport/test/core_ext/object_and_class_ext_test.rb +++ b/activesupport/test/core_ext/object_and_class_ext_test.rb @@ -99,7 +99,7 @@ class ObjectTryTest < Test::Unit::TestCase def test_nonexisting_method method = :undefined_method assert !@string.respond_to?(method) - assert_nil @string.try(method) + assert_raise(NoMethodError) { @string.try(method) } end def test_nonexisting_method_with_arguments |