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

[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 57b4a8b0c97d3bb68604ef3d498cc4355f459713..7188afd7a967dea14dacb646a99798e96aaeb45e 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -11,27 +11,13 @@ 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 "users/login"
+    assert_template "sessions/new"

     # 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

-    # print @response.body
-    # Check that there is some payload alerting the user to the redirect
-    # and allowing them to get to the page they are being directed to
-    assert_select "html:root" do
-      assert_select "body" do
-        assert_select "a[href='http://www.example.com/diary/new']"
-      end
-    end
-    # Required due to a bug in the rails testing framework
-    # http://markmail.org/message/wnslvi5xv5moqg7g
-    @html_document = nil

     follow_redirect!
     follow_redirect!

-

     assert_response :success
     assert_response :success

-    assert_template "diary_entry/edit"
-    # print @response.body
-    # print @html_document.to_yaml
+    assert_template "diary_entries/new"

 
     # We will make sure that the form exists here, full
     # assert testing of the full form should be done in the
 
     # We will make sure that the form exists here, full
     # assert testing of the full form should be done in the


@@ -42,7 +28,7 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
       assert_select "h1", "New Diary Entry"
     end
     assert_select "div#content" do
       assert_select "h1", "New Diary Entry"
     end
     assert_select "div#content" do

-      assert_select "form[action='/diary/new']" do
+      assert_select "form[action='/diary']" do

         assert_select "input[id=diary_entry_title]"
       end
     end
         assert_select "input[id=diary_entry_title]"
       end
     end