From 43810b27c9fb16d9b411f99ea1fb80e4c337c199 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Sat, 13 Oct 2007 13:36:36 +0000 Subject: [PATCH] ActionItem78: testing != cancel instead of == finished --- app/models/change_password.rb | 6 +++--- test/unit/change_password_test.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/change_password.rb b/app/models/change_password.rb index 842fec3..1e57af3 100644 --- a/app/models/change_password.rb +++ b/app/models/change_password.rb @@ -45,9 +45,9 @@ class ChangePassword < Task # validations for updating a ChangePassword task # only require the new password when actually changing it. - validates_presence_of :password, :on => :update, :if => lambda { |change| change.status == Task::Status::FINISHED } - validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status == Task::Status::FINISHED } - validates_confirmation_of :password, :if => lambda { |change| change.status == Task::Status::FINISHED } + validates_presence_of :password, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED } + validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED } + validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED } def initialize(*args) super(*args) diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb index cecfca9..a53e094 100644 --- a/test/unit/change_password_test.rb +++ b/test/unit/change_password_test.rb @@ -87,6 +87,8 @@ class ChangePasswordTest < Test::Unit::TestCase change.password = 'newpass' change.password_confirmation = 'newpass' change.finish + + assert User.find(person.user.id).authenticated?('newpass') end should 'not require password and password confirmation when cancelling' do @@ -101,7 +103,6 @@ class ChangePasswordTest < Test::Unit::TestCase assert_nothing_raised do change.cancel end - end -- libgit2 0.21.2