X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ae17e46adb861fc7167dfed7bcf5968dbf3f9a2..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 905812901..10c0f63b8 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,13 +1,13 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class UserLoginTest < ActionController::IntegrationTest
+class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup
     openid_setup
   end
 
-  def test_login_password_success
+  def test_login_email_password_normal
     user = users(:normal_user)
 
     get '/login'
@@ -15,14 +15,45 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"}
+
+    post '/login', 'username' => user.email, 'password' => "wrong", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.email, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.email.upcase, 'password' => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/list'
+    assert_template 'changeset/history'
+    assert_select "span.username", "TEST"
   end
 
-  def test_login_password_fail
+  def test_login_email_password_normal_titlecase
     user = users(:normal_user)
 
     get '/login'
@@ -30,11 +61,226 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"}
+
+    post '/login', 'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.email.titlecase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+    assert_select "span.username", false
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.email, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
+  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 => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template 'login'
+
+    post '/login', 'username' => user.email.upcase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.email.titlecase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "TEST"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+    assert_select "span.username", false
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
+  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 => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'
+
+    post '/login', 'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'changeset/history'
+    assert_select "span.username", "test2"
   end
 
   def test_login_openid_success
@@ -43,7 +289,7 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}
+    post '/login', 'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"
     assert_response :redirect
 
     res = openid_request(@response.redirect_url)
@@ -52,7 +298,8 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/list'
+    assert_template 'changeset/history'
+    assert_select "span.username", "openIDuser"
   end
 
   def test_login_openid_cancel
@@ -61,7 +308,7 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post '/login', {'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"}
+    post '/login', 'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"
     assert_response :redirect
 
     res = openid_request(@response.redirect_url)
@@ -71,6 +318,7 @@ class UserLoginTest < ActionController::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template 'login'
+    assert_select "span.username", false
   end
 
   def test_login_openid_invalid_provider
@@ -79,12 +327,13 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    #Use a different port that doesn't have the OpenID provider running on to test an invalid openID
-    post '/login', {'openid_url' => "http://localhost:1124/john.doe", :referer => "/diary"}
+    # Use a different port that doesn't have the OpenID provider running on to test an invalid openID
+    post '/login', 'openid_url' => "http://localhost:1124/john.doe", :referer => "/diary"
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template 'login'
+    assert_select "span.username", false
   end
 
   def test_login_openid_invalid_url
@@ -93,12 +342,13 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    #Use a url with an invalid protocol to make sure it handles that correctly too
-    post '/login', {'openid_url' => "htt://localhost:1123/john.doe", :referer => "/diary"}
+    # Use a url with an invalid protocol to make sure it handles that correctly too
+    post '/login', 'openid_url' => "htt://localhost:1123/john.doe", :referer => "/diary"
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_template 'login'
+    assert_select "span.username", false
   end
 
   def test_login_openid_unknown
@@ -107,7 +357,7 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"}
+    post '/login', 'openid_url' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"
     assert_response :redirect
 
     res = openid_request(@response.redirect_url)
@@ -117,5 +367,6 @@ class UserLoginTest < ActionController::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template 'user/new'
+    assert_select "span.username", false
   end
 end