github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-04-28 03:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "update_with_password doesn't change encrypted password when it is invalid"

Browse Source 
This reverts commit 10235f9d72.
This commit is contained in:
José Valim
2013-01-11 19:12:53 +01:00
parent bd9bf326c0
commit 33fb89340a
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/devise/models/database_authenticatable.rb
View File

@@ -64,7 +64,6 @@ module Devise
result = if valid_password?(current_password)
update_attributes(params, *options)
else
params.delete(:password)
self.assign_attributes(params, *options)
self.valid?
self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)

7
test/models/database_authenticatable_test.rb
View File

@@ -132,13 +132,6 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
assert_match "is invalid", user.errors[:current_password].join
end
test 'should not change encrypted password when it is invalid' do
user = create_user
assert_not user.update_with_password(:current_password => 'other',
:password => 'pass4321', :password_confirmation => 'pass4321')
assert_not user.encrypted_password_changed?
end
test 'should add an error to current password when it is blank' do
user = create_user
assert_not user.update_with_password(:password => 'pass4321',