提交 a7680ab4 编写于 作者: G Godfrey Chan

Merge pull request #13795 from bobbus/errors-has-key

Fix ActiveModel::Errors#has_key? returning nil
...@@ -94,7 +94,7 @@ def clear ...@@ -94,7 +94,7 @@ def clear
# person.errors.include?(:name) # => true # person.errors.include?(:name) # => true
# person.errors.include?(:age) # => false # person.errors.include?(:age) # => false
def include?(attribute) def include?(attribute)
(v = messages[attribute]) && v.any? messages[attribute].present?
end end
# aliases include? # aliases include?
alias :has_key? :include? alias :has_key? :include?
......
...@@ -51,7 +51,12 @@ def test_dup ...@@ -51,7 +51,12 @@ def test_dup
def test_has_key? def test_has_key?
errors = ActiveModel::Errors.new(self) errors = ActiveModel::Errors.new(self)
errors[:foo] = 'omg' errors[:foo] = 'omg'
assert errors.has_key?(:foo), 'errors should have key :foo' assert_equal true, errors.has_key?(:foo), 'errors should have key :foo'
end
def test_has_no_key
errors = ActiveModel::Errors.new(self)
assert_equal false, errors.has_key?(:name), 'errors should not have key :name'
end end
test "clear errors" do test "clear errors" do
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册