Merge remote-tracking branch 'upstream/pull/2061'

[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 2c3e61be67aeef01a5e88752bcc03789d9726bed..89c3a8ac4184706cf71730520faa2d5d6d073425 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -25,7 +25,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
 
     try_password_login user.email, "test"
 

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


@@ -36,7 +36,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.email, "test"
 
 
     try_password_login uppercase_user.email, "test"
 

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", uppercase_user.display_name
   end
 
     assert_select "span.username", uppercase_user.display_name
   end
 


@@ -57,7 +57,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
 
     try_password_login user.email, "test"
 

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


@@ -66,7 +66,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.upcase, "test"
 
 
     try_password_login user.email.upcase, "test"
 

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


@@ -75,7 +75,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
 
     try_password_login user.email.titlecase, "test"
 

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


@@ -193,7 +193,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.display_name, "test"
 
 
     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
 
     assert_select "span.username", uppercase_user.display_name
   end
 


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


@@ -334,7 +334,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test", "yes"
 
 
     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
     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"
 
 
     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
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    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")
     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")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    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")
     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")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    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")
     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")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    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")
     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")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    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")
     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")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")
     get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "google")


@@ -589,7 +589,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
     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)
     assert_select "span.username", user.display_name
 
     u = User.find_by(:display_name => user.display_name)


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")
     get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "facebook")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")
     get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "windowslive")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")
     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")
     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")
     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")
     get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "github")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")


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

-    assert_template "changeset/history"
+    assert_template "changesets/history"

     assert_select "span.username", user.display_name
   end
 
     assert_select "span.username", user.display_name
   end
 


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")


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

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

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "user/login"
+    assert_template "users/login"

     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
     assert_response :redirect
     assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")


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

-    assert_template "user/new"
+    assert_template "users/new"

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


@@ -958,7 +958,7 @@ 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 => :user, :action => :login, :cookie_test => true
+    assert_redirected_to :controller => :users, :action => :login, :cookie_test => true

     follow_redirect!
     assert_response :success
     assert_template "login"
     follow_redirect!
     assert_response :success
     assert_template "login"