X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..2c262b9bb4fd14db4a656c6125f5760f332723d2:/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 6d8e3e7e0..cea92466a 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
 
 class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users
@@ -10,346 +10,361 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_normal
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test"
   end
 
   def test_login_email_password_normal_upcase
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email.upcase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email.upcase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "changeset/history"
+    assert_select "span.username", "TEST"
   end
 
   def test_login_email_password_normal_titlecase
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email.titlecase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email.titlecase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
+    assert_select "span.username", false
   end
 
   def test_login_email_password_public
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_email_password_public_upcase
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email.upcase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email.upcase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_email_password_public_titlecase
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.email.titlecase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.email.titlecase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_username_password_normal
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test"
   end
 
   def test_login_username_password_normal_upcase
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name.upcase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name.upcase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "changeset/history"
+    assert_select "span.username", "TEST"
   end
 
   def test_login_username_password_normal_titlecase
     user = users(:normal_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name.titlecase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name.titlecase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
+    assert_select "span.username", false
   end
 
   def test_login_username_password_public
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_username_password_public_upcase
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name.upcase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name.upcase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_username_password_public_titlecase
     user = users(:public_user)
 
-    get '/login'
+    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"}
+    post "/login", "username" => user.display_name.titlecase, "password" => "wrong", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
 
-    post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"}
+    post "/login", "username" => user.display_name.titlecase, "password" => "test", :referer => "/history"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "test2"
   end
 
   def test_login_openid_success
-    get '/login'
+    get "/login"
     assert_response :redirect
     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 => "/history"}
+    post "/login", "openid_url" => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"
     assert_response :redirect
 
-    res = openid_request(@response.redirect_url)
-    res2 = post '/login', res
+    post "/login", openid_request(@response.redirect_url)
 
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'changeset/history'
+    assert_template "changeset/history"
+    assert_select "span.username", "openIDuser"
   end
 
   def test_login_openid_cancel
-    get '/login'
+    get "/login"
     assert_response :redirect
     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)
-    post '/login', res
+    post "/login", openid_request(@response.redirect_url)
 
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'login'
+    assert_template "login"
+    assert_select "span.username", false
   end
 
   def test_login_openid_invalid_provider
-    get '/login'
+    get "/login"
     assert_response :redirect
     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_template "login"
+    assert_select "span.username", false
   end
 
   def test_login_openid_invalid_url
-    get '/login'
+    get "/login"
     assert_response :redirect
     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_template "login"
+    assert_select "span.username", false
   end
 
   def test_login_openid_unknown
-    get '/login'
+    get "/login"
     assert_response :redirect
     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)
-    res2 = post '/login', res
+    post "/login", res
 
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'user/new'
+    assert_template "user/new"
+    assert_select "span.username", false
   end
 end