Download as
Browse Code »

Commit 8400b7b994c21d76393c366d67ce33d28a434025

Authored by AntonioTerceiro
1 parent d0c92dcf
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem9: enhancing change_password a little but 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@157 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 0 deletions   Show diff stats
app/controllers/account_controller.rb
  Diff comments   View file @8400b7b
@@ -58,6 +58,7 @@ class AccountController < ApplicationController @@ -58,6 +58,7 @@ class AccountController < ApplicationController
58 flash[:notice] = _('Your password has been changed successfully!') 58 flash[:notice] = _('Your password has been changed successfully!')
59 redirect_to :action => 'index' 59 redirect_to :action => 'index'
60 rescue User::IncorrectPassword => e 60 rescue User::IncorrectPassword => e
  61 + flash[:notice] = _('The supplied current password is incorrect.')
61 render :action => 'change_password' 62 render :action => 'change_password'
62 end 63 end
63 else 64 else
test/functional/account_controller_test.rb
  Diff comments   View file @8400b7b
@@ -138,6 +138,7 @@ class AccountControllerTest < Test::Unit::TestCase @@ -138,6 +138,7 @@ class AccountControllerTest < Test::Unit::TestCase
138 post :change_password, :current_password => 'test', :new_password => 'blabla', :new_password_confirmation => 'blabla' 138 post :change_password, :current_password => 'test', :new_password => 'blabla', :new_password_confirmation => 'blabla'
139 assert_response :redirect 139 assert_response :redirect
140 assert_redirected_to :action => 'index' 140 assert_redirected_to :action => 'index'
  141 + assert flash[:notice] =~ /success/
141 assert User.find_by_login('ze').authenticated?('blabla') 142 assert User.find_by_login('ze').authenticated?('blabla')
142 assert_equal users(:ze), @controller.send(:current_user) 143 assert_equal users(:ze), @controller.send(:current_user)
143 end 144 end
@@ -147,6 +148,7 @@ class AccountControllerTest < Test::Unit::TestCase @@ -147,6 +148,7 @@ class AccountControllerTest < Test::Unit::TestCase
147 post :change_password, :current_password => 'wrong', :new_password => 'blabla', :new_password_confirmation => 'blabla' 148 post :change_password, :current_password => 'wrong', :new_password => 'blabla', :new_password_confirmation => 'blabla'
148 assert_response :success 149 assert_response :success
149 assert_template 'change_password' 150 assert_template 'change_password'
  151 + assert flash[:notice] =~ /incorrect/
150 assert ! User.find_by_login('ze').authenticated?('blabla') 152 assert ! User.find_by_login('ze').authenticated?('blabla')
151 assert_equal users(:ze), @controller.send(:current_user) 153 assert_equal users(:ze), @controller.send(:current_user)
152 end 154 end