Localisation updates from https://translatewiki.net.

[rails.git] / test / integration / user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 89c3a8ac4184706cf71730520faa2d5d6d073425..589f19a236d27e7b8609bfe0626293d29fb88fa2 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -47,7 +47,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
 
     try_password_login user.email.titlecase, "test"
 

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "span.username", false
   end
 
     assert_select "span.username", false
   end
 


@@ -111,7 +111,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -123,7 +123,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.upcase, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -135,7 +135,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -204,7 +204,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
 
     try_password_login user.display_name.downcase, "test"
 

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "span.username", false
   end
 
     assert_select "span.username", false
   end
 


@@ -268,7 +268,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -280,7 +280,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.upcase, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -292,7 +292,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
 
     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 "span.username", false
     assert_select "div.flash.error", /your account has been suspended/ do
       assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster"


@@ -355,14 +355,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    post "/login", :params => { :openid_url => "http://localhost:1123/john.doe", :referer => "/history" }
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
-    follow_redirect!
+    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
     assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -373,45 +370,17 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 

-  def test_login_openid_remember_me
-    user = create(:user, :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 => :users, :action => :login, :cookie_test => true, :referer => "/history"
-    follow_redirect!
-    assert_response :success
-    assert_template "users/login"
-    post "/login", :params => { :openid_url => user.auth_uid, :remember_me_openid => true, :referer => "/history" }
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :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 :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "changesets/history"
-    assert_select "span.username", user.display_name
-    assert session.key?(:_remember_for)
-  end
-

   def test_login_openid_connection_failed
     user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
     OmniAuth.config.mock_auth[:openid] = :connection_failed
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
   def test_login_openid_connection_failed
     user = create(:user, :auth_provider => "openid", :auth_uid => "http://example.com/john.doe")
     OmniAuth.config.mock_auth[:openid] = :connection_failed
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => 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!
     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,7 +390,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -432,14 +401,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => 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!
     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,7 +415,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -459,14 +425,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
+    assert_redirected_to login_path(:cookie_test => true, :referer => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    post "/login", :params => { :openid_url => "http://localhost:1123/fred.bloggs", :referer => "/history" }
-    assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?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
     assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -485,11 +448,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!


@@ -505,11 +468,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!


@@ -519,7 +482,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -529,11 +492,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!


@@ -543,7 +506,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -555,11 +518,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!


@@ -578,11 +541,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "google")
     follow_redirect!


@@ -603,11 +566,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!


@@ -623,11 +586,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!


@@ -637,7 +600,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -647,11 +610,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!


@@ -661,7 +624,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -671,11 +634,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "facebook")
     follow_redirect!


@@ -692,11 +655,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!


@@ -712,11 +675,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!


@@ -726,7 +689,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -736,11 +699,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!


@@ -750,7 +713,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -760,11 +723,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/login"
-    get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
+    assert_template "sessions/new"
+    post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")

     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     follow_redirect!


@@ -781,11 +744,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!


@@ -801,11 +764,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!


@@ -815,7 +778,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -825,11 +788,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!


@@ -839,7 +802,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -849,11 +812,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "github")
     follow_redirect!


@@ -870,11 +833,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -890,11 +853,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -904,7 +867,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Connection to authentication provider failed"
     assert_select "span.username", false
   end


@@ -914,11 +877,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -928,7 +891,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end
     assert_select "div.flash.error", "Invalid authentication credentials"
     assert_select "span.username", false
   end


@@ -938,11 +901,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect
 
     get "/login", :params => { :referer => "/history" }
     assert_response :redirect

-    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history")

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "users/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
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     follow_redirect!


@@ -958,10 +921,10 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def try_password_login(username, password, remember_me = nil)
     get "/login"
     assert_response :redirect
   def try_password_login(username, password, remember_me = nil)
     get "/login"
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true
+    assert_redirected_to login_path(:cookie_test => true)

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "login"
+    assert_template "sessions/new"

     assert_select "input#username", 1 do
       assert_select "[value]", false
     end
     assert_select "input#username", 1 do
       assert_select "[value]", false
     end


@@ -976,7 +939,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     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
     assert_select "input#username", 1 do
       assert_select "[value=?]", username
     end