From ad7f9cdf008e1261fdcdc8e8152462f69b48c20d Mon Sep 17 00:00:00 2001 From: Robby Grossman Date: Tue, 31 Jul 2012 16:16:21 -0400 Subject: has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped. --- activemodel/lib/active_model/secure_password.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 3eab745c89..dc89efd2d1 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -43,9 +43,9 @@ module ActiveModel if options.fetch(:validations, true) validates_confirmation_of :password validates_presence_of :password, :on => :create + + before_create { raise "Password digest missing on new record" if password_digest.blank? } end - - before_create { raise "Password digest missing on new record" if password_digest.blank? } include InstanceMethodsOnActivation -- cgit v1.2.3