X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..c6b3cfb22e4b3a4d41611a8dd5d0e4f100c2f036:/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 a48933cf4..89c3a8ac4 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class UserLoginTest < ActionDispatch::IntegrationTest
-  fixtures :users, :user_blocks
-
   def setup
     OmniAuth.config.test_mode = true
   end
@@ -12,788 +10,413 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
     OmniAuth.config.mock_auth[:windowslive] = nil
+    OmniAuth.config.mock_auth[:github] = nil
+    OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false
   end
 
-  def test_login_email_password_normal
-    user = users(:normal_user)
+  # It's possible to have multiple accounts in the database with only differences
+  # in email case, for hysterical raisins. We need to bypass the validation checks to
+  # create users like this nowadays.
+  def test_login_email_password_duplicate
+    # Attempt to log in as one user, it should work
+    user = create(:user)
+    _uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 
-    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"
 
-    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"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
-  def test_login_email_password_normal_upcase
-    user = users(:normal_user)
+  def test_login_email_password_duplicate_upcase
+    # Attempt to log in as the uppercase_user, it should also work
+    user = create(:user)
+    uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login uppercase_user.email, "test"
 
-    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", "TEST"
+    assert_template "changesets/history"
+    assert_select "span.username", uppercase_user.display_name
   end
 
-  def test_login_email_password_normal_titlecase
-    user = users(:normal_user)
+  def test_login_email_password_duplicate_titlecase
+    # When there's no exact match for case, and two possible users, it should fail
+    user = create(:user)
+    _uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 
-    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
 
-  def test_login_email_password_public
-    user = users(:public_user)
+  # When there are no duplicate emails, any variation of cases should work
+  def test_login_email_password
+    user = create(: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"
 
-    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"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
-  def test_login_email_password_public_upcase
-    user = users(:public_user)
+  def test_login_email_password_upcase
+    user = create(: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"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
-  def test_login_email_password_public_titlecase
-    user = users(:public_user)
+  def test_login_email_password_titlecase
+    user = create(: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"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
-  def test_login_email_password_inactive
-    user = users(:inactive_user)
+  def test_login_email_password_pending
+    user = create(:user, :pending)
 
-    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 => "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
+  def test_login_email_password_pending_upcase
+    user = create(:user, :pending)
 
-    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 => "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)
+  def test_login_email_password_pending_titlecase
+    user = create(:user, :pending)
 
-    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 => "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
+    user = create(:user, :suspended)
 
-    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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   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
+    user = create(:user, :suspended)
 
-    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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   end
 
   def test_login_email_password_suspended_titlecase
-    user = users(:suspended_user)
+    user = create(:user, :suspended)
 
-    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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   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
+    user = create(:user)
+    create(:user_block, :needs_view, :user => user)
 
-    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", user.display_name
   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
+    user = create(:user)
+    create(:user_block, :needs_view, :user => user)
 
-    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", user.display_name
   end
 
   def test_login_email_password_blocked_titlecase
-    user = users(:blocked_user)
+    user = create(:user)
+    create(:user_block, :needs_view, :user => 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 "user_blocks/show"
+    assert_select "span.username", user.display_name
   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
+  # As above, it's possible to have multiple accounts in the database with only
+  # differences in display_name case, for hysterical raisins. We need to bypass
+  # the validation checks to create users like this nowadays.
+  def test_login_username_password_duplicate
+    # Attempt to log in as one user, it should work
+    user = create(:user)
+    _uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) }
 
-    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 "changeset/history"
-    assert_select "span.username", "test"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
-  def test_login_username_password_normal_upcase
-    user = users(:normal_user)
+  def test_login_username_password_duplicate_upcase
+    # Attempt to log in as the uppercase_user, it should also work
+    user = create(:user)
+    uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) }
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    try_password_login uppercase_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 "changeset/history"
-    assert_select "span.username", "TEST"
+    assert_template "changesets/history"
+    assert_select "span.username", uppercase_user.display_name
   end
 
-  def test_login_username_password_normal_titlecase
-    user = users(:normal_user)
+  def test_login_username_password_duplicate_downcase
+    # When there's no exact match for case, and two possible users, it should fail
+    user = create(:user)
+    _uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) }
 
-    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.downcase, "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
 
-  def test_login_username_password_public
-    user = users(:public_user)
+  # When there are no duplicate emails, any variation of cases should work
+  def test_login_username_password
+    user = create(: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"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   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
+  def test_login_username_password_upcase
+    user = create(:user)
 
-    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", "test2"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   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_username_password_downcase
+    user = create(:user)
 
-  def test_login_username_password_inactive
-    user = users(:inactive_user)
+    try_password_login user.display_name.downcase, "test"
 
-    get "/login"
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
-    follow_redirect!
-    assert_response :success
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
+  end
 
-    post "/login", :username => user.display_name, :password => "wrong", :referer => "/history"
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
+  def test_login_username_password_pending
+    user = create(:user, :pending)
+
+    try_password_login user.display_name, "test"
 
-    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
+  def test_login_username_password_pending_upcase
+    user = create(:user, :pending)
 
-    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 => "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
+  def test_login_username_password_pending_downcase
+    user = create(:user, :pending)
 
-    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.downcase, "test"
 
-    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)
+    user = create(:user, :suspended)
 
-    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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   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
+    user = create(:user, :suspended)
 
-    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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   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
+  def test_login_username_password_suspended_downcase
+    user = create(:user, :suspended)
 
-    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.downcase, "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 "div.flash.error", /your account has been suspended/
+    assert_select "span.username", false
+    assert_select "div.flash.error", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"
+    end
   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
+    user = create(:user)
+    create(:user_block, :needs_view, :user => user)
 
-    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.upcase, "test"
 
-    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", user.display_name
   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
+    user = create(:user)
+    create(:user_block, :needs_view, :user => user)
 
-    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, "test"
 
-    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", user.display_name
   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
+  def test_login_username_password_blocked_downcase
+    user = create(:user)
+    create(:user_block, :needs_view, :user => user)
 
-    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.downcase, "test"
 
-    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", user.display_name
   end
 
   def test_login_email_password_remember_me
-    user = users(:normal_user)
+    user = create(: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_template "changesets/history"
+    assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
 
   def test_login_username_password_remember_me
-    user = users(:normal_user)
+    user = create(: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_template "changesets/history"
+    assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
 
   def test_login_openid_success
-    OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/john.doe")
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
+    OmniAuth.config.add_mock(:openid, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => "http://localhost:1123/john.doe", :referer => "/history"
+    assert_template "users/login"
+    post "/login", :params => { :openid_url => "http://localhost:1123/john.doe", :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "openIDuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
   def test_login_openid_remember_me
-    OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/john.doe")
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
+    OmniAuth.config.add_mock(:openid, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => "http://localhost:1123/john.doe", :remember_me_openid => true, :referer => "/history"
+    assert_template "users/login"
+    post "/login", :params => { :openid_url => user.auth_uid, :remember_me_openid => true, :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "openIDuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
 
   def test_login_openid_connection_failed
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
     OmniAuth.config.mock_auth[:openid] = :connection_failed
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => "http://localhost:1123/john.doe", :referer => "/history"
+    assert_template "users/login"
+    post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -804,23 +427,24 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   end
 
   def test_login_openid_invalid_credentials
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
     OmniAuth.config.mock_auth[:openid] = :invalid_credentials
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => "http://localhost:1123/john.doe", :referer => "/history"
+    assert_template "users/login"
+    post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login")
+    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "openid", :message => "invalid_credentials", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "openid", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -833,63 +457,64 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_openid_unknown
     OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/fred.bloggs")
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => "http://localhost:1123/fred.bloggs", :referer => "/history"
+    assert_template "users/login"
+    post "/login", :params => { :openid_url => "http://localhost:1123/fred.bloggs", :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login")
+    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login")
+    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
   def test_login_google_success
-    OmniAuth.config.add_mock(:google, :uid => "123456789", :extra => {
+    user = create(:user, :auth_provider => "google", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:google, :uid => user.auth_uid, :extra => {
                                :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
                              })
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "googleuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
   def test_login_google_connection_failed
     OmniAuth.config.mock_auth[:google] = :connection_failed
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -902,18 +527,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_google_invalid_credentials
     OmniAuth.config.mock_auth[:google] = :invalid_credentials
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "google", :message => "invalid_credentials", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "google", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -928,84 +553,86 @@ class UserLoginTest < ActionDispatch::IntegrationTest
                                :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
                              })
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
   def test_login_google_upgrade
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
     OmniAuth.config.add_mock(:google, :uid => "987654321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/john.doe" }
+                               :id_info => { "openid_id" => user.auth_uid }
                              })
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "openIDuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
 
-    user = User.find_by_display_name("openIDuser")
-    assert_equal "google", user.auth_provider
-    assert_equal "987654321", user.auth_uid
+    u = User.find_by(:display_name => user.display_name)
+    assert_equal "google", u.auth_provider
+    assert_equal "987654321", u.auth_uid
   end
 
   def test_login_facebook_success
-    OmniAuth.config.add_mock(:facebook, :uid => "123456789")
+    user = create(:user, :auth_provider => "facebook", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "facebookuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
   def test_login_facebook_connection_failed
     OmniAuth.config.mock_auth[:facebook] = :connection_failed
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1018,18 +645,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_facebook_invalid_credentials
     OmniAuth.config.mock_auth[:facebook] = :invalid_credentials
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "invalid_credentials", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1042,58 +669,59 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_facebook_unknown
     OmniAuth.config.add_mock(:facebook, :uid => "987654321")
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
   def test_login_windowslive_success
-    OmniAuth.config.add_mock(:windowslive, :uid => "123456789")
+    user = create(:user, :auth_provider => "windowslive", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
-    assert_select "span.username", "windowsliveuser"
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
   end
 
   def test_login_windowslive_connection_failed
     OmniAuth.config.mock_auth[:windowslive] = :connection_failed
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1106,18 +734,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_windowslive_invalid_credentials
     OmniAuth.config.mock_auth[:windowslive] = :invalid_credentials
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login")
+    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
@@ -1130,20 +758,238 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def test_login_windowslive_unknown
     OmniAuth.config.add_mock(:windowslive, :uid => "987654321")
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login")
+    assert_template "users/login"
+    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
+    assert_select "span.username", false
+  end
+
+  def test_login_github_success
+    user = create(:user, :auth_provider => "github", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:github, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
+  end
+
+  def test_login_github_connection_failed
+    OmniAuth.config.mock_auth[:github] = :connection_failed
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "span.username", false
+  end
+
+  def test_login_github_invalid_credentials
+    OmniAuth.config.mock_auth[:github] = :invalid_credentials
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "github", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "span.username", false
+  end
+
+  def test_login_github_unknown
+    OmniAuth.config.add_mock(:github, :uid => "987654321")
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "github")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "users/new"
+    assert_select "span.username", false
+  end
+
+  def test_login_wikipedia_success
+    user = create(:user, :auth_provider => "wikipedia", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "changesets/history"
+    assert_select "span.username", user.display_name
+  end
+
+  def test_login_wikipedia_connection_failed
+    OmniAuth.config.mock_auth[:wikipedia] = :connection_failed
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "span.username", false
+  end
+
+  def test_login_wikipedia_invalid_credentials
+    OmniAuth.config.mock_auth[:wikipedia] = :invalid_credentials
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "span.username", false
+  end
+
+  def test_login_wikipedia_unknown
+    OmniAuth.config.add_mock(:wikipedia, :uid => "987654321")
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "users/login"
+    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "users/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 => :users, :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", :params => { :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", :params => { :username => username, :password => password, :remember_me => remember_me, :referer => "/history" }
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+  end
 end