X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7158426ebb50d990445f475af7f6c31212d9dd03..12d4d3fb65b888c3d83cc9e27b4a7a511da02ff5:/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 255b43997..b47446878 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -135,7 +135,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_select "input[name=commit][type=submit][value=Publish]", :count => 1 assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 - assert_select "input", :count => 7 + assert_select "input", :count => 6 end end end @@ -164,7 +164,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :new - assert_nil UserPreference.where(:user_id => user.id, :k => "diary.default_language").first + assert_nil UserPreference.find_by(:user => user, :k => "diary.default_language") end def test_create @@ -189,7 +189,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # checks if user was subscribed assert_equal 1, entry.subscribers.length - assert_equal "en", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v + assert_equal "en", UserPreference.find_by(:user => user, :k => "diary.default_language").v end def test_create_german @@ -216,7 +216,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # checks if user was subscribed assert_equal 1, entry.subscribers.length - assert_equal "de", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v + assert_equal "de", UserPreference.find_by(:user => user, :k => "diary.default_language").v end def test_new_spammy @@ -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 @@ -294,7 +294,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_select "input[name=commit][type=submit][value=Update]", :count => 1 assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 - assert_select "input", :count => 8 + assert_select "input", :count => 7 end end @@ -314,18 +314,17 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest 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 "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 @@ -334,12 +333,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest 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 "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 @@ -564,12 +563,37 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Try and get the index get diary_entries_path assert_response :success - assert_select "div.diary_post", :count => 20 + assert_select "article.diary_post", :count => 20 + assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1 + assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1 # Try and get the second page - get diary_entries_path(:page => 2) + get css_select("li.page-item .page-link").last["href"] assert_response :success - assert_select "div.diary_post", :count => 20 + assert_select "article.diary_post", :count => 20 + assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1 + assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1 + + # Try and get the third page + get css_select("li.page-item .page-link").last["href"] + assert_response :success + assert_select "article.diary_post", :count => 10 + assert_select "li.page-item.disabled span.page-link", :text => "Older Entries", :count => 1 + assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1 + + # Go back to the second page + get css_select("li.page-item .page-link").first["href"] + assert_response :success + assert_select "article.diary_post", :count => 20 + assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1 + assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1 + + # Go back to the first page + get css_select("li.page-item .page-link").first["href"] + assert_response :success + assert_select "article.diary_post", :count => 20 + assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1 + assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1 end def test_rss @@ -670,20 +694,37 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :show + # Try a non-integer ID + get "/user/#{CGI.escape(user.display_name)}/diary/#{diary_entry.id})" + assert_response :not_found + assert_template "rescues/routing_error" + # Try a deleted entry diary_entry_deleted = create(:diary_entry, :user => user, :visible => false) get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted) assert_response :not_found # Try an entry by a suspended user - diary_entry_suspended = create(:diary_entry, :user => suspended_user) - get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended) + diary_entry_suspended_user = create(:diary_entry, :user => suspended_user) + get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended_user) assert_response :not_found # Try an entry by a deleted user - diary_entry_deleted = create(:diary_entry, :user => deleted_user) - get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted) + diary_entry_deleted_user = create(:diary_entry, :user => deleted_user) + get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted_user) assert_response :not_found + + # Now try as a moderator + session_for(create(:moderator_user)) + get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted) + assert_response :success + assert_template :show + + # Finally try as an administrator + session_for(create(:administrator_user)) + get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted) + assert_response :success + assert_template :show end def test_show_hidden_comments @@ -760,8 +801,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) assert_response :redirect - assert_redirected_to :controller => :errors, :action => :forbidden - assert_not DiaryEntry.find(diary_entry.id).visible + assert_redirected_to :action => :index, :display_name => user.display_name + assert DiaryEntry.find(diary_entry.id).visible + + # Reset + diary_entry.reload.update(:visible => true) # Finally try as an administrator session_for(create(:administrator_user)) @@ -827,8 +871,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) assert_response :redirect - assert_redirected_to :controller => :errors, :action => :forbidden - assert_not DiaryComment.find(diary_comment.id).visible + assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id + assert DiaryComment.find(diary_comment.id).visible + + # Reset + diary_comment.reload.update(:visible => true) # Finally try as an administrator session_for(create(:administrator_user)) @@ -950,7 +997,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "index" assert_no_missing_translations - assert_select "div.diary_post", entries.count + assert_select "article.diary_post", entries.count entries.each do |entry| assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"