diff options
| author | thedarkone <thedarkone2@gmail.com> | 2011-07-27 18:07:47 +0200 |
|---|---|---|
| committer | thedarkone <thedarkone2@gmail.com> | 2011-07-27 18:07:47 +0200 |
| commit | efe4cbe5f273dc5eb16dda9a9363a8dd7c6b3bad (patch) | |
| tree | 4eec09f135119b44af1b2f239f594947df6c9580 /activemodel | |
| parent | 02691d3516e68b2de5545ec7a495024a377f89fc (diff) | |
| download | rails-efe4cbe5f273dc5eb16dda9a9363a8dd7c6b3bad.tar.gz rails-efe4cbe5f273dc5eb16dda9a9363a8dd7c6b3bad.tar.bz2 rails-efe4cbe5f273dc5eb16dda9a9363a8dd7c6b3bad.zip | |
Handle the empty array correctly.
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/cases/errors_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 71ece15b71..1cf8144e98 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -86,7 +86,7 @@ module ActiveModel # Do the error messages include an error with key +error+? def include?(error) - messages.include? error + (v = messages[error]) && v.any? end # Get messages for +key+ diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb index a24cac40ad..85ca8ca835 100644 --- a/activemodel/test/cases/errors_test.rb +++ b/activemodel/test/cases/errors_test.rb @@ -38,6 +38,7 @@ class ErrorsTest < ActiveModel::TestCase person.errors[:foo] assert person.errors.empty? assert person.errors.blank? + assert !person.errors.include?(:foo) end test "method validate! should work" do |