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

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

diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index 5f655c4811ebb7856ff988a9622b5c5acf5baf20..2953f5fe2a98661653384fffb4c362f69033337d 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -30,7 +30,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     follow_redirect!
     # We should now be at the login page
     assert_response :success
     follow_redirect!
     # We should now be at the login page
     assert_response :success

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

     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test" }
     assert_response :redirect
     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test" }
     assert_response :redirect