X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67f365843186c4a2214b5d4bcfae47d59aa86309..174eadf2dc0a802e4dcd9f4a4a7e0b839d5d408a:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 8037b93a9..155905ca9 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -18,22 +18,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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 => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email, "test"
 
-    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
@@ -41,22 +27,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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"
+    try_password_login user.email.upcase, "test"
 
-    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", "TEST"
   end
@@ -64,22 +36,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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 => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+    try_password_login user.email.titlecase, "test"
 
-    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
@@ -87,22 +45,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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"
+    try_password_login user.email, "test"
 
-    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
@@ -110,22 +54,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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"
+    try_password_login user.email.upcase, "test"
 
-    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
@@ -133,22 +63,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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
+    try_password_login user.email.titlecase, "test"
 
-    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
@@ -156,223 +72,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_email_password_inactive
     user = users(:inactive_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"
+    try_password_login user.email, "test2"
 
-    post "/login", :username => user.email, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_email_password_inactive_upcase
     user = users(:inactive_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email.upcase, "test2"
 
-    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 => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_email_password_inactive_titlecase
     user = users(:inactive_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"
+    try_password_login user.email.titlecase, "test2"
 
-    post "/login", :username => user.email.titlecase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_email_password_suspended
     user = users(:suspended_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"
+    try_password_login user.email, "test"
 
-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "login"
+    assert_select "span.username", false
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_upcase
     user = users(:suspended_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"
+    try_password_login user.email.upcase, "test"
 
-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "login"
+    assert_select "span.username", false
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_suspended_titlecase
     user = users(:suspended_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email.titlecase, "test"
 
-    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
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_email_password_blocked
     user = users(:blocked_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"
+    try_password_login user.email, "test"
 
-    post "/login", :username => user.email, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "user_blocks/show"
+    assert_select "span.username", "blocked"
   end
 
   def test_login_email_password_blocked_upcase
     user = users(:blocked_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"
+    try_password_login user.email.upcase, "test"
 
-    post "/login", :username => user.email.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "user_blocks/show"
+    assert_select "span.username", "blocked"
   end
 
   def test_login_email_password_blocked_titlecase
     user = users(:blocked_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"
+    try_password_login user.email.titlecase, "test"
 
-    post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "user_blocks/show"
+    assert_select "span.username", "blocked"
   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
+    try_password_login user.display_name, "test"
 
-    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
@@ -380,22 +165,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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"
+    try_password_login user.display_name.upcase, "test"
 
-    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
@@ -403,22 +174,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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"
+    try_password_login user.display_name.titlecase, "test"
 
-    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
@@ -426,22 +183,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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
+    try_password_login user.display_name, "test"
 
-    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
@@ -449,22 +192,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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
+    try_password_login user.display_name.upcase, "test"
 
-    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
@@ -472,22 +201,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   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
+    try_password_login user.display_name.titlecase, "test"
 
-    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
@@ -495,217 +210,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_inactive
     user = users(:inactive_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test2"
 
-    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 => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_username_password_inactive_upcase
     user = users(:inactive_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"
+    try_password_login user.display_name.upcase, "test2"
 
-    post "/login", :username => user.display_name.upcase, :password => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_username_password_inactive_titlecase
     user = users(:inactive_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.titlecase, "test2"
 
-    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 => "test2", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "confirm"
+    assert_select "span.username", false
   end
 
   def test_login_username_password_suspended
     user = users(:suspended_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"
+    try_password_login user.display_name, "test"
 
-    post "/login", :username => user.display_name, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "login"
+    assert_select "span.username", false
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_upcase
     user = users(:suspended_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"
+    try_password_login user.display_name.upcase, "test"
 
-    post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "login"
+    assert_select "span.username", false
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_suspended_titlecase
     user = users(:suspended_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.titlecase, "test"
 
-    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
     assert_select "div.flash.error", /your account has been suspended/
   end
 
   def test_login_username_password_blocked
     user = users(:blocked_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.upcase, "test"
 
-    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 "user_blocks/show"
+    assert_select "span.username", "blocked"
   end
 
   def test_login_username_password_blocked_upcase
     user = users(:blocked_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test"
 
-    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 "user_blocks/show"
+    assert_select "span.username", "blocked"
   end
 
   def test_login_username_password_blocked_titlecase
     user = users(:blocked_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name.titlecase, "test"
 
-    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 "user_blocks/show"
+    assert_select "span.username", "blocked"
   end
 
   def test_login_email_password_remember_me
     user = users(:normal_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.email, "test", "yes"
 
-    post "/login", :username => user.email, :password => "test", :remember_me => true, :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)
@@ -714,16 +304,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_username_password_remember_me
     user = users(:normal_user)
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login user.display_name, "test", "yes"
 
-    post "/login", :username => user.display_name, :password => "test", :remember_me => true, :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
     assert_template "changeset/history"
     assert_select "span.username", "test"
     assert session.key?(:_remember_for)
@@ -1070,7 +652,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/login"
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1090,7 +672,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/login"
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
@@ -1114,7 +696,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/login"
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
@@ -1138,7 +720,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/login"
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1146,4 +728,44 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "user/new"
     assert_select "span.username", false
   end
+
+  private
+
+  def try_password_login(username, password, remember_me = nil)
+    get "/login"
+    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "input#username", 1 do
+      assert_select "[value]", false
+    end
+    assert_select "input#password", 1 do
+      assert_select "[value=?]", ""
+    end
+    assert_select "input#remember_me", 1 do
+      assert_select "[checked]", false
+    end
+
+    post "/login", :username => username, :password => "wrong", :remember_me => remember_me, :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "input#username", 1 do
+      assert_select "[value=?]", username
+    end
+    assert_select "input#password", 1 do
+      assert_select "[value=?]", ""
+    end
+    assert_select "input#remember_me", 1 do
+      assert_select "[checked]", remember_me == "yes"
+    end
+
+    post "/login", :username => username, :password => password, :remember_me => remember_me, :referer => "/history"
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+  end
 end