cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we show errors correctly when resetting a password

Browse source
This commit is contained in:
Tom Hughes 2017-08-11 17:45:57 +01:00
parent 7fd1e55938
commit a70898be6d
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/user/reset_password.html.erb
View file

@ -2,7 +2,7 @@
<h1><%= t 'user.reset_password.heading', :user => current_user.display_name %></h1>
<% end %>
<%= error_messages_for :user %>
<%= error_messages_for current_user %>
<%= form_tag do %>
<%= hidden_field_tag(:token, params[:token]) %>

6
test/controllers/user_controller_test.rb
View file

@ -749,6 +749,12 @@ class UserControllerTest < ActionController::TestCase
assert_response :success
assert_template :reset_password
# Test that errors are reported for erroneous submissions
post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "different_password" } }
assert_response :success
assert_template :reset_password
assert_select "div#errorExplanation"
# Test setting a new password
post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } }
assert_response :redirect