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

[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 df070dd37d1d3f167b88b700127940e8ec804758..57b4a8b0c97d3bb68604ef3d498cc4355f459713 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -11,9 +11,9 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
     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", "username" => user.email, "password" => "test", :referer => "/diary/new"
+    post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/diary/new" }
     assert_response :redirect
     # print @response.body
     # Check that there is some payload alerting the user to the redirect