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

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

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 2c1e651450a30d3246c1acee890591f760cf8399..026028d5f23d83e44073a2a814966c4160ef9ec7 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -11,7 +11,7 @@ class UserDiariesTest < 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", :referer => "/diary/new" }
     assert_response :redirect
     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/diary/new" }
     assert_response :redirect


@@ -29,7 +29,7 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
     follow_redirect!
 
     assert_response :success
     follow_redirect!
 
     assert_response :success

-    assert_template "diary_entry/edit"
+    assert_template "diary_entries/edit"

     # print @response.body
     # print @html_document.to_yaml
 
     # print @response.body
     # print @html_document.to_yaml