Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Execute ConfirmationValidator validation when _confirmation's value is false #31058

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions activemodel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* Execute `ConfirmationValidator` validation when `_confirmation`'s value is `false`.

*bogdanvlviv*

* Allow passing a Proc or Symbol to length validator options.

*Matt Rohrer*
Expand Down
2 changes: 1 addition & 1 deletion activemodel/lib/active_model/validations/confirmation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def initialize(options)
end

def validate_each(record, attribute, value)
if (confirmed = record.send("#{attribute}_confirmation"))
unless (confirmed = record.send("#{attribute}_confirmation")).nil?
unless confirmation_value_equal?(record, attribute, value, confirmed)
human_attribute_name = record.class.human_attribute_name(attribute)
record.errors.add(:"#{attribute}_confirmation", :confirmation, options.except(:case_sensitive).merge!(attribute: human_attribute_name))
Expand Down
13 changes: 13 additions & 0 deletions activemodel/test/cases/validations/confirmation_validation_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ def test_title_confirmation
assert t.valid?
end

def test_validates_confirmation_of_with_boolean_attribute
Topic.validates_confirmation_of(:approved)

t = Topic.new(approved: true, approved_confirmation: nil)
assert t.valid?

t.approved_confirmation = false
assert t.invalid?

t.approved_confirmation = true
assert t.valid?
end

def test_validates_confirmation_of_for_ruby_class
Person.validates_confirmation_of :karma

Expand Down