From 638d379ec6641de8aeb7ef4e235435d148cbc0db Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Tue, 13 Sep 2011 20:10:38 +0000 Subject: [PATCH] Add validation on User password presence --- app/models/user.rb | 4 +++- spec/models/user_spec.rb | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3e13cc3..de20fe3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,8 +11,10 @@ class User < ActiveRecord::Base validates :email, :presence => true, :uniqueness => true + validates :password, + :presence => true, + :confirmation => true validates_presence_of :password_hash - validates_confirmation_of :password def password=(plain_password) @password = plain_password diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 3135783..1d290a6 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -16,6 +16,14 @@ describe User do it { should_not be_valid } end + context 'when password empty' do + before do + user.password = '' + end + + it { should_not be_valid } + end + context 'when password_confirmation does not match password' do before do user.password_confirmation = user.password + 'INVALID'