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

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

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index c786b4f4a87eee2092a287f3cee3bd1eed7645f0..b50a990c688a1b5e54960682fa1a9ad7a2c94444 100644 (file)
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -9,17 +9,17 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
 
     get "/login"
     assert_response :redirect
 
     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
     post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success
     post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" }
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "user/show"
+    assert_template "users/show"

     get "/user/#{ERB::Util.u(user.display_name)}/account"
     assert_response :success
     get "/user/#{ERB::Util.u(user.display_name)}/account"
     assert_response :success

-    assert_template "user/account"
+    assert_template "users/account"

 
     # check that the form to allow new client application creations exists
     assert_in_heading do
 
     # check that the form to allow new client application creations exists
     assert_in_heading do