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

[rails.git] / test / controllers / diary_entries_controller_test.rb

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 8681717528a98bb47667288cadf26541b9038127..b1e9b72f2ba5dc48cef62358286a12421acc9485 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -113,7 +113,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     # are not logged in
     get new_diary_entry_path
     assert_response :redirect
     # are not logged in
     get new_diary_entry_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"
+    assert_redirected_to login_path(:referer => "/diary/new")

   end
 
   def test_new_form
   end
 
   def test_new_form


@@ -257,7 +257,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     # not logged in, without and with the id of the entry you want to edit
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :redirect
     # not logged in, without and with the id of the entry you want to edit
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+    assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit")

 
     session_for(other_user)
 
 
     session_for(other_user)
 


@@ -273,7 +273,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+      assert_select "h1", :text => "No entry with the id: 9999", :count => 1

     end
 
     # Now pass the id, and check that you can edit it, when using the same
     end
 
     # Now pass the id, and check that you can edit it, when using the same


@@ -314,12 +314,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"
     get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"

-    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "title", :text => /Users' Diaries | /, :count => 1

     assert_select "div.content-heading", :count => 1 do
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
     end
     assert_select "div#content", :count => 1 do

-      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      assert_select "h2", :text => /#{new_title}/, :count => 1

       # This next line won't work if the text has been run through the htmlize function
       # due to formatting that could be introduced
       assert_select "p", :text => /#{new_body}/, :count => 1
       # This next line won't work if the text has been run through the htmlize function
       # due to formatting that could be introduced
       assert_select "p", :text => /#{new_body}/, :count => 1


@@ -334,12 +334,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"
     get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"

-    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "title", :text => /Users' Diaries | /, :count => 1

     assert_select "div.content-heading", :count => 1 do
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
     end
     assert_select "div#content", :count => 1 do

-      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      assert_select "h2", :text => /#{new_title}/, :count => 1

       # This next line won't work if the text has been run through the htmlize function
       # due to formatting that could be introduced
       assert_select "p", :text => /#{new_body}/, :count => 1
       # This next line won't work if the text has been run through the htmlize function
       # due to formatting that could be introduced
       assert_select "p", :text => /#{new_body}/, :count => 1


@@ -374,7 +374,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     post comment_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
     post comment_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+      assert_select "h1", :text => "No entry with the id: 9999", :count => 1

     end
 
     # Now try an invalid comment with an empty body
     end
 
     # Now try an invalid comment with an empty body


@@ -506,7 +506,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     # Try a list of diary entries for your friends when not logged in
     get friends_diary_entries_path
     assert_response :redirect
     # Try a list of diary entries for your friends when not logged in
     get friends_diary_entries_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"
+    assert_redirected_to login_path(:referer => "/diary/friends")

 
     # Try a list of diary entries for your friends when logged in
     session_for(user)
 
     # Try a list of diary entries for your friends when logged in
     session_for(user)


@@ -526,7 +526,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     # Try a list of diary entries for nearby users when not logged in
     get nearby_diary_entries_path
     assert_response :redirect
     # Try a list of diary entries for nearby users when not logged in
     get nearby_diary_entries_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"
+    assert_redirected_to login_path(:referer => "/diary/nearby")

 
     # Try a list of diary entries for nearby users when logged in
     session_for(nearby_user)
 
     # Try a list of diary entries for nearby users when logged in
     session_for(nearby_user)


@@ -848,9 +848,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     get diary_comments_path(:display_name => user.display_name)
     assert_response :success
     assert_template :comments
     get diary_comments_path(:display_name => user.display_name)
     assert_response :success
     assert_template :comments

-    assert_select "table.table-striped" do
-      assert_select "tr", :count => 1 # header, no comments
-    end
+    assert_select "h4", :html => "No diary comments"

 
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 
     # Test a user with a comment
     create(:diary_comment, :user => other_user)