Make sure we show errors correctly when resetting a password

diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb
index 4cb94374ade7f47069d80448106efad3320194c2..895bd98b6fef24b5fc4993578dbc92e903e7aa43 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -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]) %>

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 1404fc7953522955ff0bcd466000d13335140e39..1561a9ebe25a88a63584eac99497ca9aed6749f2 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -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