X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11e97b3edb057f6f449209ca2afd169feda229a4..5cc4e933479b7e74ed7d4425909f0915717fc1db:/test/controllers/notes_controller_test.rb diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 6eda7d3a3..1450aced8 100644 --- a/test/controllers/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -13,11 +13,11 @@ class NotesControllerTest < ActionDispatch::IntegrationTest def test_routes assert_routing( { :path => "/user/username/notes", :method => :get }, - { :controller => "notes", :action => "mine", :display_name => "username" } + { :controller => "notes", :action => "index", :display_name => "username" } ) end - def test_mine_success + def test_index_success first_user = create(:user) second_user = create(:user) moderator_user = create(:moderator_user) @@ -33,43 +33,43 @@ class NotesControllerTest < ActionDispatch::IntegrationTest end # Note that the table rows include a header row - get my_notes_path(:display_name => first_user.display_name) + get user_notes_path(:display_name => first_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => second_user.display_name) + get user_notes_path(:display_name => second_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => "non-existent") + get user_notes_path(:display_name => "non-existent") assert_response :not_found session_for(moderator_user) - get my_notes_path(:display_name => first_user.display_name) + get user_notes_path(:display_name => first_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => second_user.display_name) + get user_notes_path(:display_name => second_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 3 - get my_notes_path(:display_name => "non-existent") + get user_notes_path(:display_name => "non-existent") assert_response :not_found end - def test_mine_paged + def test_index_paged user = create(:user) create_list(:note, 50) do |note| create(:note_comment, :note => note, :author => user) end - get my_notes_path(:display_name => user.display_name) + get user_notes_path(:display_name => user.display_name) assert_response :success assert_select "table.note_list tr", :count => 11 - get my_notes_path(:display_name => user.display_name, :page => 2) + get user_notes_path(:display_name => user.display_name, :page => 2) assert_response :success assert_select "table.note_list tr", :count => 11 end