Add validation on User password presence

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

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'