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

[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 a0b084f923bb84588b1dc0db5c75d1c4c5279f8b..026028d5f23d83e44073a2a814966c4160ef9ec7 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,17 +1,19 @@
 require "test_helper"
 
 class UserDiariesTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class UserDiariesTest < ActionDispatch::IntegrationTest

-  fixtures :users, :diary_entries
-

   # Test the creation of a diary entry, making sure that you are redirected to
   # login page when not logged in
   def test_showing_create_diary_entry
   # Test the creation of a diary entry, making sure that you are redirected to
   # login page when not logged in
   def test_showing_create_diary_entry

-    get_via_redirect "/diary/new"
+    user = create(:user)
+
+    get "/diary/new"
+    follow_redirect!
+    follow_redirect!

     # We should now be at the login page
     assert_response :success
     # We should now be at the login page
     assert_response :success

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

     # We can now login
     # We can now login

-    post "/login", "username" => "test@openstreetmap.org", "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
     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
     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