X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/113506bf5159bd06c218653a7d30d5a3c8d5c4e1..b493dc8b469e877564b67c7080d15757164c97f0:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 0470ad842..a9c64bea4 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -9,7 +9,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
     OmniAuth.config.mock_auth[:facebook] = nil
-    OmniAuth.config.mock_auth[:windowslive] = nil
+    OmniAuth.config.mock_auth[:microsoft] = nil
     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
     OmniAuth.config.test_mode = false
@@ -25,7 +25,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -36,7 +36,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", uppercase_user.display_name
   end
 
@@ -47,7 +47,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
   end
 
@@ -57,7 +57,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -66,7 +66,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.upcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -75,7 +75,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -111,9 +111,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_email_password_suspended_upcase
@@ -121,9 +123,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.upcase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_email_password_suspended_titlecase
@@ -131,9 +135,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_email_password_blocked
@@ -176,7 +182,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -187,7 +193,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", uppercase_user.display_name
   end
 
@@ -198,7 +204,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
   end
 
@@ -208,7 +214,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -217,7 +223,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.upcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -226,7 +232,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -262,9 +268,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_username_password_suspended_upcase
@@ -272,9 +280,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.upcase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_username_password_suspended_downcase
@@ -282,9 +292,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "span.username", false
-    assert_select "div.flash.error", /your account has been suspended/
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
   def test_login_username_password_blocked
@@ -322,7 +334,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test", "yes"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
@@ -332,7 +344,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test", "yes"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
@@ -341,65 +353,100 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     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 login_path(: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 "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    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 "changesets/history"
+    assert_select "span.username", user.display_name
+  end
+
+  def test_login_openid_pending
+    user = create(:user, :pending, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
+    OmniAuth.config.add_mock(:openid, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")
     follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     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", user.display_name
+    assert_template "confirm"
   end
 
-  def test_login_openid_remember_me
-    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
+  def test_login_openid_suspended
+    user = create(:user, :suspended, :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 login_path(:cookie_test => true, :referer => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => user.auth_uid, :remember_me_openid => true, :referer => "/history"
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    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
-    assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
+  end
+
+  def test_login_openid_blocked
+    user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:openid, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    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_template "user_blocks/show"
     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 login_path(:cookie_test => true, :referer => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => user.auth_uid, :referer => "/history"
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
-    follow_redirect!
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
@@ -409,8 +456,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
 
@@ -418,16 +465,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     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 login_path(:cookie_test => true, :referer => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    post "/login", :openid_url => user.auth_uid, :referer => "/history"
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
-    follow_redirect!
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!
@@ -437,31 +481,28 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
   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 login_path(: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_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
-    follow_redirect!
+    assert_template "sessions/new"
+    post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     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
 
@@ -471,33 +512,105 @@ 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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "changesets/history"
+    assert_select "span.username", user.display_name
+  end
+
+  def test_login_google_pending
+    user = create(:user, :pending, :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", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "confirm"
+  end
+
+  def test_login_google_suspended
+    user = create(:user, :suspended, :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", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "sessions/new"
+    assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
+  end
+
+  def test_login_google_blocked
+    user = create(:user, :auth_provider => "google", :auth_uid => "1234567890")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:google, :uid => user.auth_uid, :extra => {
+                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
+                             })
+
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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_template "user_blocks/show"
     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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
@@ -507,21 +620,21 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
 
   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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!
@@ -531,8 +644,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
@@ -541,20 +654,20 @@ 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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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
 
@@ -564,20 +677,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest
                                :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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_template "changesets/history"
     assert_select "span.username", user.display_name
 
     u = User.find_by(:display_name => user.display_name)
@@ -589,33 +702,99 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "changesets/history"
+    assert_select "span.username", user.display_name
+  end
+
+  def test_login_facebook_pending
+    user = create(:user, :pending, :auth_provider => "facebook", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "confirm"
+  end
+
+  def test_login_facebook_suspended
+    user = create(:user, :suspended, :auth_provider => "facebook", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "sessions/new"
+    assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
+  end
+
+  def test_login_facebook_blocked
+    user = create(:user, :auth_provider => "facebook", :auth_uid => "1234567890")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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_template "user_blocks/show"
     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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
@@ -625,21 +804,21 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
 
   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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!
@@ -649,117 +828,183 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
   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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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_microsoft_success
+    user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "microsoft")
+    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_microsoft_pending
+    user = create(:user, :pending, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "microsoft")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "confirm"
+  end
+
+  def test_login_microsoft_suspended
+    user = create(:user, :suspended, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "microsoft")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
     assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
   end
 
-  def test_login_windowslive_success
-    user = create(:user, :auth_provider => "windowslive", :auth_uid => "1234567890")
-    OmniAuth.config.add_mock(:windowslive, :uid => user.auth_uid)
+  def test_login_microsoft_blocked
+    user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:microsoft, :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "user_blocks/show"
     assert_select "span.username", user.display_name
   end
 
-  def test_login_windowslive_connection_failed
-    OmniAuth.config.mock_auth[:windowslive] = :connection_failed
+  def test_login_microsoft_connection_failed
+    OmniAuth.config.mock_auth[:microsoft] = :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
+    assert_redirected_to auth_failure_path(:strategy => "microsoft", :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_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
 
-  def test_login_windowslive_invalid_credentials
-    OmniAuth.config.mock_auth[:windowslive] = :invalid_credentials
+  def test_login_microsoft_invalid_credentials
+    OmniAuth.config.mock_auth[:microsoft] = :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")
     follow_redirect!
     assert_response :redirect
-    assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
+    assert_redirected_to auth_failure_path(:strategy => "microsoft", :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_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
-  def test_login_windowslive_unknown
-    OmniAuth.config.add_mock(:windowslive, :uid => "987654321")
+  def test_login_microsoft_unknown
+    OmniAuth.config.add_mock(:microsoft, :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "windowslive")
+    assert_redirected_to auth_success_path(:provider => "microsoft")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
@@ -767,35 +1012,101 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     user = create(:user, :auth_provider => "github", :auth_uid => "1234567890")
     OmniAuth.config.add_mock(:github, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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_pending
+    user = create(:user, :pending, :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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "confirm"
+  end
+
+  def test_login_github_suspended
+    user = create(:user, :suspended, :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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "sessions/new"
+    assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
+  end
+
+  def test_login_github_blocked
+    user = create(:user, :auth_provider => "github", :auth_uid => "1234567890")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:github, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "user_blocks/show"
     assert_select "span.username", user.display_name
   end
 
   def test_login_github_connection_failed
     OmniAuth.config.mock_auth[:github] = :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    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")
@@ -803,23 +1114,23 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "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", :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    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")
@@ -827,28 +1138,28 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
   def test_login_github_unknown
     OmniAuth.config.add_mock(:github, :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
-    assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
@@ -856,33 +1167,99 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     user = create(:user, :auth_provider => "wikipedia", :auth_uid => "1234567890")
     OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid)
 
-    get "/login", :referer => "/history"
+    get "/login", :params => { :referer => "/history" }
+    assert_response :redirect
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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_pending
+    user = create(:user, :pending, :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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "confirm"
+  end
+
+  def test_login_wikipedia_suspended
+    user = create(:user, :suspended, :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 login_path("cookie_test" => "true", "referer" => "/history")
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post 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 "sessions/new"
+    assert_select "span.username", false
+    assert_select "div.alert.alert-danger", /your account has been suspended/ do
+      assert_select "a[href='mailto:openstreetmap@example.com']", "support"
+    end
+  end
+
+  def test_login_wikipedia_blocked
+    user = create(:user, :auth_provider => "wikipedia", :auth_uid => "1234567890")
+    create(:user_block, :needs_view, :user => user)
+    OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid)
+
+    get "/login", :params => { :referer => "/history" }
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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 "changeset/history"
+    assert_template "user_blocks/show"
     assert_select "span.username", user.display_name
   end
 
   def test_login_wikipedia_connection_failed
     OmniAuth.config.mock_auth[:wikipedia] = :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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!
@@ -892,21 +1269,21 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "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", :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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!
@@ -916,28 +1293,28 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "login"
-    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_template "sessions/new"
+    assert_select "div.alert.alert-danger", "Invalid authentication credentials"
     assert_select "span.username", false
   end
 
   def test_login_wikipedia_unknown
     OmniAuth.config.add_mock(:wikipedia, :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 login_path("cookie_test" => "true", "referer" => "/history")
     follow_redirect!
     assert_response :success
-    assert_template "user/login"
-    get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post 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 "user/new"
+    assert_template "users/new"
     assert_select "span.username", false
   end
 
@@ -946,10 +1323,10 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def try_password_login(username, password, remember_me = nil)
     get "/login"
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
+    assert_redirected_to login_path(:cookie_test => true)
     follow_redirect!
     assert_response :success
-    assert_template "login"
+    assert_template "sessions/new"
     assert_select "input#username", 1 do
       assert_select "[value]", false
     end
@@ -960,11 +1337,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
       assert_select "[checked]", false
     end
 
-    post "/login", :username => username, :password => "wrong", :remember_me => remember_me, :referer => "/history"
+    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_template "sessions/new"
     assert_select "input#username", 1 do
       assert_select "[value=?]", username
     end
@@ -975,7 +1352,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
       assert_select "[checked]", remember_me == "yes"
     end
 
-    post "/login", :username => username, :password => password, :remember_me => remember_me, :referer => "/history"
+    post "/login", :params => { :username => username, :password => password, :remember_me => remember_me, :referer => "/history" }
     assert_response :redirect
     follow_redirect!
     assert_response :success