Download as
Browse Code »

Commit 43810b27c9fb16d9b411f99ea1fb80e4c337c199

Authored by AntonioTerceiro
1 parent 19443585
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem78: testing != cancel instead of == finished 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@691 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @43810b2
... ... @@ -45,9 +45,9 @@ class ChangePassword < Task
45 45 # validations for updating a ChangePassword task
46 46  
47 47 # only require the new password when actually changing it.
48   - validates_presence_of :password, :on => :update, :if => lambda { |change| change.status == Task::Status::FINISHED }
49   - validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status == Task::Status::FINISHED }
50   - validates_confirmation_of :password, :if => lambda { |change| change.status == Task::Status::FINISHED }
  48 + validates_presence_of :password, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
  49 + validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
  50 + validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED }
51 51  
52 52 def initialize(*args)
53 53 super(*args)
... ...
test/unit/change_password_test.rb
  Diff comments   View file @43810b2
... ... @@ -87,6 +87,8 @@ class ChangePasswordTest < Test::Unit::TestCase
87 87 change.password = 'newpass'
88 88 change.password_confirmation = 'newpass'
89 89 change.finish
  90 +
  91 + assert User.find(person.user.id).authenticated?('newpass')
90 92 end
91 93  
92 94 should 'not require password and password confirmation when cancelling' do
... ... @@ -101,7 +103,6 @@ class ChangePasswordTest < Test::Unit::TestCase
101 103 assert_nothing_raised do
102 104 change.cancel
103 105 end
104   -
105 106 end
106 107  
107 108  
... ...