X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ae83554929f3841c36fa543c58cad07d4d13013f..d2ff1491b4b6f8fa3b64ab88414d0dbf01cc520e:/test/integration/user_diaries_test.rb

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index e6d4327fd..026028d5f 100644
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -6,12 +6,14 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
   def test_showing_create_diary_entry
     user = create(:user)
 
-    get_via_redirect "/diary/new"
+    get "/diary/new"
+    follow_redirect!
+    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
@@ -27,7 +29,7 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
     follow_redirect!
 
     assert_response :success
-    assert_template "diary_entry/edit"
+    assert_template "diary_entries/edit"
     # print @response.body
     # print @html_document.to_yaml