X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8e5deafd854b05086296513b318df1626dc41967..4087f393a8bf82d44752151ca7215f01a418c8d5:/test/integration/user_login_test.rb diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 509d2525c..a7301233d 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 @@ -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 @@ -111,10 +111,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -123,10 +123,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -135,10 +135,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -204,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 @@ -268,10 +268,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -280,10 +280,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -292,10 +292,10 @@ 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/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "div.alert.alert-danger", /your account has been suspended/ do + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -354,19 +354,77 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => user.auth_uid) get "/login", :params => { :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_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_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :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 + follow_redirect! + assert_response :success + assert_template "confirm" + end + + 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", :params => { :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_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_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_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_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 "user_blocks/show" assert_select "span.username", user.display_name end @@ -375,23 +433,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:openid] = :connection_failed 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 "users/login" + 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! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "openid", :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 @@ -400,23 +455,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:openid] = :invalid_credentials 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 "users/login" + 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! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "openid", :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 @@ -424,13 +476,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => "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 "users/login" + 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 @@ -447,13 +497,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) 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 "users/login" + 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 @@ -463,27 +511,90 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_select "span.username", user.display_name end - def test_login_google_connection_failed - OmniAuth.config.mock_auth[:google] = :connection_failed + 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_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_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_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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_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_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect + follow_redirect! + assert_response :success + 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", :params => { :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 => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! assert_redirected_to auth_failure_path(:strategy => "google", :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 @@ -491,23 +602,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:google] = :invalid_credentials 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 "users/login" + 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 assert_redirected_to auth_failure_path(:strategy => "google", :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 @@ -517,13 +625,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) 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 "users/login" + 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 @@ -540,13 +646,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) 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 "users/login" + 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 @@ -565,13 +669,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 "users/login" + 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 @@ -581,27 +683,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_select "span.username", user.display_name end - def test_login_facebook_connection_failed - OmniAuth.config.mock_auth[:facebook] = :connection_failed + 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_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_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_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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_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_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect + follow_redirect! + assert_response :success + 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", :params => { :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 => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! assert_redirected_to auth_failure_path(:strategy => "facebook", :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 @@ -609,23 +768,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:facebook] = :invalid_credentials 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 "users/login" + 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 assert_redirected_to auth_failure_path(:strategy => "facebook", :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 @@ -633,13 +789,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => "987654321") 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 "users/login" + 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 @@ -649,19 +803,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_select "span.username", false 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_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 "users/login" - post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_template "sessions/new" + post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect follow_redirect! @@ -670,66 +822,118 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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_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 "users/login" - post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_template "sessions/new" + post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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") + 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_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_redirected_to auth_success_path(:provider => "microsoft") 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 "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_invalid_credentials - OmniAuth.config.mock_auth[:windowslive] = :invalid_credentials + 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", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success - assert_template "users/login" - post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_template "sessions/new" + post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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") + follow_redirect! + assert_response :success + assert_template "user_blocks/show" + assert_select "span.username", user.display_name + end + + def test_login_microsoft_connection_failed + OmniAuth.config.mock_auth[:microsoft] = :connection_failed + + get "/login", :params => { :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 => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + 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", "Invalid authentication credentials" + 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_unknown - OmniAuth.config.add_mock(:windowslive, :uid => "987654321") + def test_login_microsoft_invalid_credentials + OmniAuth.config.mock_auth[:microsoft] = :invalid_credentials 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 "users/login" - post 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_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") + follow_redirect! assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + follow_redirect! + assert_response :success + assert_template "sessions/new" + assert_select "div.alert.alert-danger", "Invalid authentication credentials" + assert_select "span.username", false + end + + def test_login_microsoft_unknown + OmniAuth.config.add_mock(:microsoft, :uid => "987654321") + + get "/login", :params => { :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 => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect follow_redirect! @@ -743,13 +947,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 "users/login" + 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 @@ -759,27 +961,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_select "span.username", user.display_name end - def test_login_github_connection_failed - OmniAuth.config.mock_auth[:github] = :connection_failed + 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_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_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_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post auth_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 "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_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_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect + follow_redirect! + assert_response :success + 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", :params => { :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 => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "github") + follow_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_template "sessions/new" + assert_select "div.alert.alert-danger", "Connection to authentication provider failed" assert_select "span.username", false end @@ -787,23 +1046,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:github] = :invalid_credentials 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 "users/login" + 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 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_template "sessions/new" + assert_select "div.alert.alert-danger", "Invalid authentication credentials" assert_select "span.username", false end @@ -811,13 +1067,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => "987654321") 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 "users/login" + 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 @@ -832,13 +1086,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 "users/login" + 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 @@ -848,27 +1100,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_select "span.username", user.display_name end - def test_login_wikipedia_connection_failed - OmniAuth.config.mock_auth[:wikipedia] = :connection_failed + 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_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_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_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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_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_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_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", :params => { :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 => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + follow_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_template "sessions/new" + assert_select "div.alert.alert-danger", "Connection to authentication provider failed" assert_select "span.username", false end @@ -876,23 +1185,20 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:wikipedia] = :invalid_credentials 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 "users/login" + 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 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_template "sessions/new" + assert_select "div.alert.alert-danger", "Invalid authentication credentials" assert_select "span.username", false end @@ -900,13 +1206,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => "987654321") 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 "users/login" + 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 @@ -920,11 +1224,10 @@ class UserLoginTest < ActionDispatch::IntegrationTest def try_password_login(username, password, remember_me = nil) get "/login" - assert_response :redirect 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 @@ -939,7 +1242,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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