X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/652dbf5044d3f7fdb5f7af1b7e8393c2a79246c6..e756dbae7f3715561de5688e6503b60fdfe0327d:/test/integration/user_login_test.rb?ds=sidebyside

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index f76f3ca2d..cd6762dca 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -7,6 +7,270 @@ class UserLoginTest < ActionController::IntegrationTest
     openid_setup
   end
 
+  def test_login_email_password_normal
+    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'
+
+    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_email_password_normal_upcase
+    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.upcase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+  end
+
+  def test_login_email_password_normal_titlecase
+    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.titlecase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+  end
+
+  def test_login_email_password_public
+    user = users(:public_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'
+
+    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_email_password_public_upcase
+    user = users(:public_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.upcase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_email_password_public_titlecase
+    user = users(:public_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.titlecase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_username_password_normal
+    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.display_name, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_username_password_normal_upcase
+    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.display_name.upcase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+  end
+
+  def test_login_username_password_normal_titlecase
+    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.display_name.titlecase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+  end
+
+  def test_login_username_password_public
+    user = users(:public_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.display_name, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_username_password_public_upcase
+    user = users(:public_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.display_name.upcase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
+  def test_login_username_password_public_titlecase
+    user = users(:public_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.display_name.titlecase, 'password' => "wrong", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"}
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/list'
+  end
+
   def test_login_openid_success
     get '/login'
     assert_response :redirect
@@ -16,7 +280,7 @@ class UserLoginTest < ActionController::IntegrationTest
     post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}
     assert_response :redirect
 
-    res = openid_request(@response.redirected_to)
+    res = openid_request(@response.redirect_url)
     res2 = post '/login', res
 
     assert_response :redirect
@@ -34,7 +298,7 @@ class UserLoginTest < ActionController::IntegrationTest
     post '/login', {'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"}
     assert_response :redirect
 
-    res = openid_request(@response.redirected_to)
+    res = openid_request(@response.redirect_url)
     post '/login', res
 
     assert_response :redirect
@@ -80,7 +344,7 @@ class UserLoginTest < ActionController::IntegrationTest
     post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"}
     assert_response :redirect
 
-    res = openid_request(@response.redirected_to)
+    res = openid_request(@response.redirect_url)
     res2 = post '/login', res
 
     assert_response :redirect