X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2a635ab28f3f567f984ec21f6fa724db9b673851..ed54379218d21b9bd52933903e8cb504a15dfe7e:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index f76f3ca2d..3dedddb6a 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -7,6 +7,36 @@ class UserLoginTest < ActionController::IntegrationTest
     openid_setup
   end
 
+  def test_login_password_success
+    user = users(:normal_user)
+
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_password_fail
+    user = users(:normal_user)
+
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+  end
+
   def test_login_openid_success
     get '/login'
     assert_response :redirect