Download as
Browse Code »

Commit 08b30ebf9132671923ff4bf78b002b810abcc634

Authored by Rodrigo Souto
2 parents 198eff75 f4e937f6
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

Merge remote branch 'junior/change-password' into stable

Showing 3 changed files with 18 additions and 10 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @08b30eb
... ... @@ -130,17 +130,13 @@ class AccountController < ApplicationController
130 130 if request.post?
131 131 @user = current_user
132 132 begin
133   - @user.change_password!(params[:current_password],
134   - params[:new_password],
135   - params[:new_password_confirmation])
136   - session[:notice] = _('Your password has been changed successfully!')
137   - redirect_to :action => 'index'
138   - rescue User::IncorrectPassword => e
139   - session[:notice] = _('The supplied current password is incorrect.')
140   - render :action => 'change_password'
  133 + @user.change_password!(params[:current_password],
  134 + params[:new_password],
  135 + params[:new_password_confirmation])
  136 + session[:notice] = _('Your password has been changed successfully!')
  137 + redirect_to :action => 'index'
  138 + rescue
141 139 end
142   - else
143   - render :action => 'change_password'
144 140 end
145 141 end
146 142  
... ...
app/views/account/change_password.rhtml
  Diff comments   View file @08b30eb
1 1 <h1><%= _('Change password') %></h1>
2 2  
  3 +<%= error_messages_for :user %>
  4 +
3 5 <% form_tag do %>
4 6  
5 7 <p><label for="password"><%= _('Current password') %></label><br/>
... ...
test/functional/account_controller_test.rb
  Diff comments   View file @08b30eb
... ... @@ -203,6 +203,16 @@ class AccountControllerTest &lt; ActionController::TestCase
203 203 assert_equal users(:ze), @controller.send(:current_user)
204 204 end
205 205  
  206 + should "not change password when new password and new password confirmation don't match" do
  207 + login_as 'ze'
  208 + post :change_password, :current_password => 'test', :new_password => 'blabla', :new_password_confirmation => 'blibli'
  209 + assert_response :success
  210 + assert_template 'change_password'
  211 + assert !assigns(:current_user).authenticated?('blabla')
  212 + assert !assigns(:current_user).authenticated?('blibli')
  213 + assert_equal users(:ze), @controller.send(:current_user)
  214 + end
  215 +
206 216 should 'provide a "I forget my password" link at the login page' do
207 217 get :login
208 218 assert_tag :tag => 'a', :attributes => {
... ...