aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorPhil Calvin <pncalvin@gmail.com>2013-05-20 12:13:21 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-05-30 11:18:43 -0700
commit5d93ef8f459254f075616d37763611ad87d86b30 (patch)
tree36d1f98418cb7ef3408c2335795130fa2fa1e2b6 /activemodel/test
parent6a6eae200d584ce059cff0496675ef382ff5303d (diff)
downloadrails-5d93ef8f459254f075616d37763611ad87d86b30.tar.gz
rails-5d93ef8f459254f075616d37763611ad87d86b30.tar.bz2
rails-5d93ef8f459254f075616d37763611ad87d86b30.zip
Fix regression in has_secure_password.
If the confirmation was blank, but the password wasn't, it would still save.
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/secure_password_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 02cd3b8a93..0b900d934d 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -94,4 +94,13 @@ class SecurePasswordTest < ActiveModel::TestCase
@user.password_confirmation = ""
assert @user.valid?(:update), "user should be valid"
end
+
+ test "will not save if confirmation is blank but password is not" do
+ @user.password = "password"
+ @user.password_confirmation = ""
+ assert_not @user.valid?(:create)
+
+ @user.password_confirmation = "password"
+ assert @user.valid?(:create)
+ end
end