X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/74af34ccf75afcf5c032bddf4c20b22aafd6467b..1e9d390c1e59c86f77b77fc33e1cc4e2eb8293d1:/test/controllers/notes_controller_test.rb?ds=inline diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 5a920349a..e68a5f33b 100644 --- a/test/controllers/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -40,28 +40,30 @@ class NotesControllerTest < ActionDispatch::IntegrationTest create(:note_comment, :note => note, :author => second_user) end - get user_notes_path(:display_name => first_user.display_name) + get user_notes_path(first_user) assert_response :success + assert_select ".content-heading a[href='#{user_path first_user}']", :text => first_user.display_name assert_select "table.note_list tbody tr", :count => 1 - get user_notes_path(:display_name => second_user.display_name) + get user_notes_path(second_user) assert_response :success + assert_select ".content-heading a[href='#{user_path second_user}']", :text => second_user.display_name assert_select "table.note_list tbody tr", :count => 1 - get user_notes_path(:display_name => "non-existent") + get user_notes_path("non-existent") assert_response :not_found session_for(moderator_user) - get user_notes_path(:display_name => first_user.display_name) + get user_notes_path(first_user) assert_response :success assert_select "table.note_list tbody tr", :count => 1 - get user_notes_path(:display_name => second_user.display_name) + get user_notes_path(second_user) assert_response :success assert_select "table.note_list tbody tr", :count => 2 - get user_notes_path(:display_name => "non-existent") + get user_notes_path("non-existent") assert_response :not_found end @@ -72,18 +74,18 @@ class NotesControllerTest < ActionDispatch::IntegrationTest create(:note_comment, :note => note, :author => user) end - get user_notes_path(:display_name => user.display_name) + get user_notes_path(user) assert_response :success assert_select "table.note_list tbody tr", :count => 10 - get user_notes_path(:display_name => user.display_name, :page => 2) + get user_notes_path(user, :page => 2) assert_response :success assert_select "table.note_list tbody tr", :count => 10 end def test_empty_page user = create(:user) - get user_notes_path(:display_name => user.display_name) + get user_notes_path(user) assert_response :success assert_select "h4", :html => "No notes" end @@ -97,12 +99,12 @@ class NotesControllerTest < ActionDispatch::IntegrationTest def test_read_hidden_note hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - get note_path(:id => hidden_note_with_comment) + get note_path(hidden_note_with_comment) assert_response :not_found assert_template "browse/not_found" assert_template :layout => "map" - get note_path(:id => hidden_note_with_comment), :xhr => true + get note_path(hidden_note_with_comment), :xhr => true assert_response :not_found assert_template "browse/not_found" assert_template :layout => "xhr"