X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/abd98757b69e298898b8a88372f417163eaaf422..b6869e2a43084da6fe39d74a6d68b04d703c13e5:/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 142363b60..2003f9a08 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -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 - 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 @@ -316,16 +316,15 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_template "show" assert_select "title", :text => /Users' Diaries | /, :count => 1 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 - 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 assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1 # As we're not logged in, check that you cannot edit - # print @response.body assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 end @@ -336,10 +335,10 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_template "show" assert_select "title", :text => /Users' Diaries | /, :count => 1 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 - 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 @@ -374,7 +373,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 - 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