Make sure we show errors correctly when resetting a password

[rails.git] / test / controllers / user_controller_test.rb

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 4dcb1108a8ae4bb0b41de22bed38997a2f596b50..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
@@ -784,6 +790,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "form#accountForm" do |form|
       assert_equal "post", form.attr("method").to_s
+      assert_select "input[name='_method']", false
       assert_equal "/user/#{URI.encode(user.display_name)}/account", form.attr("action").to_s
     end