X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e31376e28da8f656e33508cc899da465b63673c5..e3c88b073660381241bf11ef902d44c4cfbbc1c8:/test/integration/user_login_test.rb?ds=sidebyside diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 2c3e61be6..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,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 @@ -182,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 @@ -193,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 @@ -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 @@ -214,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 @@ -223,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 @@ -232,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 @@ -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 @@ -334,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 @@ -344,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 @@ -355,47 +355,85 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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", :params => { :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_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_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_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", :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", :params => { :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 "changeset/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 "user_blocks/show" assert_select "span.username", user.display_name - assert session.key?(:_remember_for) end def test_login_openid_connection_failed @@ -404,14 +442,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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", :params => { :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! @@ -421,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 @@ -432,14 +467,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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", :params => { :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! @@ -449,8 +481,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 @@ -459,21 +491,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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", :params => { :openid_url => "http://localhost:1123/fred.bloggs", :referer => "/history" } - assert_response :redirect - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?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 @@ -485,18 +514,90 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 + 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 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 "user_blocks/show" assert_select "span.username", user.display_name end @@ -505,11 +606,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -519,8 +620,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 @@ -529,11 +630,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -543,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 @@ -555,18 +656,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 @@ -578,18 +679,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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) @@ -603,18 +704,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 "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 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 @@ -623,11 +790,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -637,8 +804,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 @@ -647,11 +814,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -661,8 +828,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 @@ -671,107 +838,173 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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", :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", :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", :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", :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 @@ -781,18 +1014,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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") 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 + 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 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 "user_blocks/show" assert_select "span.username", user.display_name end @@ -801,11 +1100,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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") follow_redirect! @@ -815,8 +1114,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 @@ -825,11 +1124,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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") follow_redirect! @@ -839,8 +1138,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 @@ -849,18 +1148,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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") follow_redirect! assert_response :redirect follow_redirect! assert_response :success - assert_template "user/new" + assert_template "users/new" assert_select "span.username", false end @@ -870,18 +1169,84 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 "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 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 "user_blocks/show" assert_select "span.username", user.display_name end @@ -890,11 +1255,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -904,8 +1269,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 @@ -914,11 +1279,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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! @@ -928,8 +1293,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 @@ -938,18 +1303,18 @@ class UserLoginTest < ActionDispatch::IntegrationTest 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 @@ -958,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 @@ -976,7 +1341,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