1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Fix secure_password password_confirmation validations

This commit is contained in:
Vladimir Kiselev 2013-06-26 04:46:21 +04:00
parent f38b544442
commit 3be0cdfa55
3 changed files with 18 additions and 2 deletions

View file

@ -1,3 +1,8 @@
* Fix has_secure_password. `password_confirmation` validations are triggered
even if no `password_confirmation` is set.
*Vladimir Kiselev*
* `inclusion` / `exclusion` validations with ranges will only use the faster
`Range#cover` for numerical ranges, and the more accurate `Range#include?`
for non-numerical ones.

View file

@ -56,9 +56,9 @@ module ActiveModel
include InstanceMethodsOnActivation
if options.fetch(:validations, true)
validates_confirmation_of :password, if: lambda { |m| m.password.present? }
validates_confirmation_of :password, if: :should_confirm_password?
validates_presence_of :password, on: :create
validates_presence_of :password_confirmation, if: lambda { |m| m.password.present? }
validates_presence_of :password_confirmation, if: :should_confirm_password?
before_create { raise "Password digest missing on new record" if password_digest.blank? }
end
@ -109,6 +109,12 @@ module ActiveModel
def password_confirmation=(unencrypted_password)
@password_confirmation = unencrypted_password
end
private
def should_confirm_password?
password_confirmation && password.present?
end
end
end
end

View file

@ -95,6 +95,11 @@ class SecurePasswordTest < ActiveModel::TestCase
assert @user.valid?(:update), "user should be valid"
end
test "password_confirmation validations will not be triggered if password_confirmation is not sent" do
@user.password = "password"
assert @user.valid?(:create)
end
test "will not save if confirmation is blank but password is not" do
@user.password = "password"
@user.password_confirmation = ""