X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7fc00c9314b6d774616ec9bb298f7a4dd2c63b8d..c81d343d8d77a7936624f0a2d7b4df40af305d46:/test/controllers/diary_entries_controller_test.rb?ds=sidebyside diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index 88a67ef12..aad759b5b 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -1,9 +1,10 @@ require "test_helper" -class DiaryEntriesControllerTest < ActionController::TestCase +class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest include ActionView::Helpers::NumberHelper def setup + super # Create the default language for diary entries create(:language, :code => "en") # Stub nominatim response for diary entry locations @@ -48,15 +49,6 @@ class DiaryEntriesControllerTest < ActionController::TestCase { :controller => "diary_entries", :action => "rss", :display_name => "username", :format => :rss } ) - assert_routing( - { :path => "/user/username/diary/comments", :method => :get }, - { :controller => "diary_entries", :action => "comments", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/diary/comments/1", :method => :get }, - { :controller => "diary_entries", :action => "comments", :display_name => "username", :page => "1" } - ) - assert_routing( { :path => "/diary/new", :method => :get }, { :controller => "diary_entries", :action => "new" } @@ -77,22 +69,26 @@ class DiaryEntriesControllerTest < ActionController::TestCase { :path => "/user/username/diary/1", :method => :put }, { :controller => "diary_entries", :action => "update", :display_name => "username", :id => "1" } ) - assert_routing( - { :path => "/user/username/diary/1/newcomment", :method => :post }, - { :controller => "diary_entries", :action => "comment", :display_name => "username", :id => "1" } - ) assert_routing( { :path => "/user/username/diary/1/hide", :method => :post }, { :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" } ) assert_routing( - { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, - { :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } + { :path => "/user/username/diary/1/unhide", :method => :post }, + { :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/subscribe", :method => :get }, + { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" } ) assert_routing( { :path => "/user/username/diary/1/subscribe", :method => :post }, { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" } ) + assert_routing( + { :path => "/user/username/diary/1/unsubscribe", :method => :get }, + { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" } + ) assert_routing( { :path => "/user/username/diary/1/unsubscribe", :method => :post }, { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" } @@ -102,14 +98,14 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_new_no_login # Make sure that you are redirected to the login page when you # are not logged in - get :new - assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new" + get new_diary_entry_path + assert_redirected_to login_path(:referer => "/diary/new") end def test_new_form # Now try again when logged in - get :new, :session => { :user => create(:user) } + session_for(create(:user)) + get new_diary_entry_path assert_response :success assert_select "title", :text => /New Diary Entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -123,21 +119,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 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 "button[type=button]", :text => "Edit", :count => 1 + assert_select "button[type=button]", :text => "Preview", :count => 1 + assert_select "input", :count => 4 end end end def test_new_get_with_params # Now try creating a diary entry using get + session_for(create(:user)) assert_difference "DiaryEntry.count", 0 do - get :new, - :params => { :commit => "save", - :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", - :longitude => "2.2", :language_code => "en" } }, - :session => { :user => create(:user).id } + get new_diary_entry_path(:commit => "save", + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" }) end assert_response :success assert_template :new @@ -146,32 +141,29 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_create_no_body # Now try creating a invalid diary entry with an empty body user = create(:user) + session_for(user) assert_no_difference "DiaryEntry.count" do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", - :longitude => "2.2", :language_code => "en" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" }) end 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 # Now try creating a diary entry user = create(:user) + session_for(user) assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", - :longitude => "2.2", :language_code => "en" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name - entry = DiaryEntry.order(:id).last + entry = DiaryEntry.last assert_equal user.id, entry.user_id assert_equal "New Title", entry.title assert_equal "This is a new body for the diary entry", entry.body @@ -182,24 +174,22 @@ class DiaryEntriesControllerTest < ActionController::TestCase # 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 create(:language, :code => "de") user = create(:user) + session_for(user) # Now try creating a diary entry in a different language assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", - :longitude => "2.2", :language_code => "de" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "de" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name - entry = DiaryEntry.order(:id).last + entry = DiaryEntry.last assert_equal user.id, entry.user_id assert_equal "New Title", entry.title assert_equal "This is a new body for the diary entry", entry.body @@ -210,25 +200,24 @@ class DiaryEntriesControllerTest < ActionController::TestCase # 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 user = create(:user) + session_for(user) + # Generate some spammy content spammy_title = "Spam Spam Spam Spam Spam" spammy_body = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") # Try creating a spammy diary entry assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name - entry = DiaryEntry.order(:id).last + entry = DiaryEntry.last assert_equal user.id, entry.user_id assert_equal spammy_title, entry.title assert_equal spammy_body, entry.body @@ -236,10 +225,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_equal "suspended", User.find(user.id).status # Follow the redirect - get :index, - :params => { :display_name => user.display_name }, - :session => { :user => user } - assert_response :redirect + get diary_entries_path(:display_name => user.display_name) assert_redirected_to :controller => :users, :action => :suspended end @@ -251,33 +237,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase # Make sure that you are redirected to the login page when you are # not logged in, without and with the id of the entry you want to edit - get :edit, - :params => { :display_name => entry.user.display_name, :id => entry.id } - assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit" + get edit_diary_entry_path(entry.user, entry) + assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit") - # Verify that you get a not found error, when you pass a bogus id - get :edit, - :params => { :display_name => entry.user.display_name, :id => 9999 }, - :session => { :user => entry.user } - assert_response :not_found - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end + session_for(other_user) # Verify that you get redirected to show if you are not the user # that created the entry - get :edit, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => other_user } - assert_response :redirect + get edit_diary_entry_path(entry.user, entry) assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id + session_for(entry.user) + + # Verify that you get a not found error, when you pass a bogus id + get edit_diary_entry_path(entry.user, :id => 9999) + assert_response :not_found + assert_select "div.content-heading", :count => 1 do + 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 # user as the person who created the entry - get :edit, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => entry.user } + get edit_diary_entry_path(entry.user, entry) assert_response :success assert_select "title", :text => /Edit Diary Entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -291,9 +272,9 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 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 "button[type=button]", :text => "Edit", :count => 1 + assert_select "button[type=button]", :text => "Preview", :count => 1 + assert_select "input", :count => 5 end end @@ -303,47 +284,40 @@ class DiaryEntriesControllerTest < ActionController::TestCase new_latitude = "1.1" new_longitude = "2.2" new_language_code = "en" - put :update, - :params => { :display_name => entry.user.display_name, :id => entry.id, :commit => "save", - :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude, - :longitude => new_longitude, :language_code => new_language_code } }, - :session => { :user => entry.user.id } - assert_response :redirect + put diary_entry_path(entry.user, entry, :commit => "save", + :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude, + :longitude => new_longitude, :language_code => new_language_code }) assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id # Now check that the new data is rendered, when logged in - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => entry.user } + get diary_entry_path(entry.user, 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 # and when not logged in as the user who wrote the entry - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => create(:user) } + session_for(create(:user)) + get diary_entry_path(entry.user, 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 @@ -356,137 +330,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_edit_i18n user = create(:user) diary_entry = create(:diary_entry, :language_code => "en", :user => user) - get :edit, - :params => { :display_name => user.display_name, :id => diary_entry.id }, - :session => { :user => user } + session_for(user) + get edit_diary_entry_path(user, diary_entry) assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end - def test_comment + def test_update user = create(:user) other_user = create(:user) - entry = create(:diary_entry, :user => user) + diary_entry = create(:diary_entry, :language_code => "en", :user => user, :title => "Original Title") - # Make sure that you are denied when you are not logged in - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id } + put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" }) assert_response :forbidden + diary_entry.reload + assert_equal "Original Title", diary_entry.title - # Verify that you get a not found error, when you pass a bogus id - post :comment, - :params => { :display_name => entry.user.display_name, :id => 9999 }, - :session => { :user => other_user } - assert_response :not_found - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end - - post :subscribe, - :params => { :id => entry.id, :display_name => entry.user.display_name }, - :session => { :user => user } - - # Now try an invalid comment with an empty body - assert_no_difference "ActionMailer::Base.deliveries.size" do - assert_no_difference "DiaryComment.count" do - assert_no_difference "entry.subscribers.count" do - perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, - :session => { :user => other_user } - end - end - end - end - assert_response :success - assert_template :show - - # Now try again with the right id - assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do - assert_difference "DiaryComment.count", 1 do - assert_difference "entry.subscribers.count", 1 do - perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, - :session => { :user => other_user } - end - end - end - end - assert_response :redirect - assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id - email = ActionMailer::Base.deliveries.first - assert_equal [user.email], email.to - assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject - assert_match(/New comment/, email.text_part.decoded) - assert_match(/New comment/, email.html_part.decoded) - ActionMailer::Base.deliveries.clear - comment = DiaryComment.order(:id).last - assert_equal entry.id, comment.diary_entry_id - assert_equal other_user.id, comment.user_id - assert_equal "New comment", comment.body - - # Now show the diary entry, and check the new comment is present - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id } - assert_response :success - assert_select ".diary-comment", :count => 1 do - assert_select "#comment#{comment.id}", :count => 1 do - assert_select "a[href='/user/#{ERB::Util.u(other_user.display_name)}']", :text => other_user.display_name, :count => 1 - end - assert_select ".richtext", :text => /New comment/, :count => 1 - end - end - - def test_comment_spammy - user = create(:user) - other_user = create(:user) - - # Find the entry to comment on - entry = create(:diary_entry, :user => user) - post :subscribe, - :params => { :id => entry.id, :display_name => entry.user.display_name }, - :session => { :user => user } - - # Generate some spammy content - spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") - - # Try creating a spammy comment - assert_difference "ActionMailer::Base.deliveries.size", 1 do - assert_difference "DiaryComment.count", 1 do - perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } }, - :session => { :user => other_user } - end - end - end - assert_response :redirect - assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id - email = ActionMailer::Base.deliveries.first - assert_equal [user.email], email.to - assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject - assert_match %r{http://example.com/spam}, email.text_part.decoded - assert_match %r{http://example.com/spam}, email.html_part.decoded - ActionMailer::Base.deliveries.clear - comment = DiaryComment.order(:id).last - assert_equal entry.id, comment.diary_entry_id - assert_equal other_user.id, comment.user_id - assert_equal spammy_text, comment.body - assert_equal "suspended", User.find(other_user.id).status - - # Follow the redirect - get :index, - :params => { :display_name => user.display_name }, - :session => { :user => other_user } - assert_response :redirect - assert_redirected_to :controller => :users, :action => :suspended + session_for(other_user) + put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" }) + assert_redirected_to diary_entry_path(user, diary_entry) + diary_entry.reload + assert_equal "Original Title", diary_entry.title - # Now show the diary entry, and check the new comment is not present - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id } - assert_response :success - assert_select ".diary-comment", :count => 0 + session_for(user) + put diary_entry_path(user, diary_entry, :diary_entry => { :title => "Updated Title" }) + assert_redirected_to diary_entry_path(user, diary_entry) + diary_entry.reload + assert_equal "Updated Title", diary_entry.title end def test_index_all @@ -495,7 +365,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase public_entry = create(:diary_entry, :user => create(:user)) # Try a list of all diary entries - get :index + get diary_entries_path check_diary_index diary_entry, geo_entry, public_entry end @@ -508,11 +378,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase _other_entry = create(:diary_entry, :user => other_user) # Try a list of diary entries for a valid user - get :index, :params => { :display_name => user.display_name } + get diary_entries_path(:display_name => user.display_name) check_diary_index diary_entry, geo_entry # Try a list of diary entries for an invalid user - get :index, :params => { :display_name => "No Such User" } + get diary_entries_path(:display_name => "No Such User") assert_response :not_found assert_template "users/no_such_user" end @@ -520,19 +390,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_index_friends user = create(:user) other_user = create(:user) - friend = create(:friend, :befriender => user) - diary_entry = create(:diary_entry, :user => friend.befriendee) + friendship = create(:friendship, :befriender => user) + diary_entry = create(:diary_entry, :user => friendship.befriendee) _other_entry = create(:diary_entry, :user => other_user) # Try a list of diary entries for your friends when not logged in - get :index, :params => { :friends => true } - assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends" + get friends_diary_entries_path + assert_redirected_to login_path(:referer => "/diary/friends") # Try a list of diary entries for your friends when logged in - get :index, :params => { :friends => true }, :session => { :user => user } + session_for(user) + get friends_diary_entries_path check_diary_index diary_entry - get :index, :params => { :friends => true }, :session => { :user => other_user } + session_for(other_user) + get friends_diary_entries_path check_diary_index end @@ -543,14 +414,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase diary_entry = create(:diary_entry, :user => user) # Try a list of diary entries for nearby users when not logged in - get :index, :params => { :nearby => true } - assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby" + get nearby_diary_entries_path + assert_redirected_to login_path(:referer => "/diary/nearby") # Try a list of diary entries for nearby users when logged in - get :index, :params => { :nearby => true }, :session => { :user => nearby_user } + session_for(nearby_user) + get nearby_diary_entries_path check_diary_index diary_entry - get :index, :params => { :nearby => true }, :session => { :user => user } + session_for(user) + get nearby_diary_entries_path check_diary_index end @@ -562,15 +434,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase diary_entry_de = create(:diary_entry, :language_code => "de") # Try a list of diary entries in english - get :index, :params => { :language => "en" } + get diary_entries_path(:language => "en") check_diary_index diary_entry_en, diary_entry_en2 # Try a list of diary entries in german - get :index, :params => { :language => "de" } + get diary_entries_path(:language => "de") check_diary_index diary_entry_de # Try a list of diary entries in slovenian - get :index, :params => { :language => "sl" } + get diary_entries_path(:language => "sl") check_diary_index end @@ -579,14 +451,50 @@ class DiaryEntriesControllerTest < ActionController::TestCase create_list(:diary_entry, 50) # Try and get the index - get :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 :index, :params => { :page => 2 } + get css_select("li.page-item .page-link").last["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 + + # 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 "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 + end + + def test_index_invalid_paged + # Try some invalid paged accesses + %w[-1 0 fred].each do |id| + get diary_entries_path(:before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get diary_entries_path(:after => id) + assert_redirected_to :controller => :errors, :action => :bad_request + end end def test_rss @@ -595,7 +503,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "de") - get :rss, :params => { :format => :rss } + get diary_rss_path assert_response :success, "Should be able to get a diary RSS" assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do @@ -612,7 +520,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "de") - get :rss, :params => { :language => "en", :format => :rss } + get diary_rss_path(:language => "en") assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by language" end @@ -626,7 +534,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:language, :code => "sl") create(:diary_entry, :language_code => "en") - get :rss, :params => { :language => "sl", :format => :rss } + get diary_rss_path(:language => "sl") assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 0 # , "Diary entries should be filtered by language" end @@ -638,32 +546,44 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :user => user) create(:diary_entry, :user => other_user) - get :rss, :params => { :display_name => user.display_name, :format => :rss } + get diary_rss_path(:display_name => user.display_name) assert_response :success, "Should be able to get a specific users diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by user" end def test_rss_nonexisting_user # Try a user that has never existed - get :rss, :params => { :display_name => "fakeUsername76543", :format => :rss } + get diary_rss_path(:display_name => "fakeUsername76543") assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" # Try a suspended user - get :rss, :params => { :display_name => create(:user, :suspended).display_name, :format => :rss } + get diary_rss_path(:display_name => create(:user, :suspended).display_name) assert_response :not_found, "Should not be able to get a suspended users diary RSS" # Try a deleted user - get :rss, :params => { :display_name => create(:user, :deleted).display_name, :format => :rss } + get diary_rss_path(:display_name => create(:user, :deleted).display_name) assert_response :not_found, "Should not be able to get a deleted users diary RSS" end def test_rss_character_escaping create(:diary_entry, :title => "