From 724376419a011e3388088ada59155d7f71c031f6 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 25 Jul 2024 16:55:27 +0300 Subject: [PATCH 1/1] Simplify api changeset path helper calls --- .../api/changeset_comments_controller_test.rb | 40 +++++++++---------- .../api/changesets_controller_test.rb | 34 ++++++++-------- .../api/relations_controller_test.rb | 4 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb index e7d8ca209..d3b171588 100644 --- a/test/controllers/api/changeset_comments_controller_test.rb +++ b/test/controllers/api/changeset_comments_controller_test.rb @@ -46,7 +46,7 @@ module Api assert_difference "ChangesetComment.count", 1 do assert_no_difference "ActionMailer::Base.deliveries.size" do perform_enqueued_jobs do - post changeset_comment_path(:id => private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -61,7 +61,7 @@ module Api assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do perform_enqueued_jobs do - post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -79,7 +79,7 @@ module Api assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 2 do perform_enqueued_jobs do - post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -102,32 +102,32 @@ module Api # create comment fail def test_create_comment_fail # unauthorized - post changeset_comment_path(:id => create(:changeset, :closed), :text => "This is a comment") + post changeset_comment_path(create(:changeset, :closed), :text => "This is a comment") assert_response :unauthorized auth_header = basic_authorization_header create(:user).email, "test" # bad changeset id assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => 999111, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(999111, :text => "This is a comment"), :headers => auth_header end assert_response :not_found # not closed changeset assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => create(:changeset), :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(create(:changeset), :text => "This is a comment"), :headers => auth_header end assert_response :conflict # no text assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => create(:changeset, :closed)), :headers => auth_header + post changeset_comment_path(create(:changeset, :closed)), :headers => auth_header end assert_response :bad_request # empty text assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => create(:changeset, :closed), :text => ""), :headers => auth_header + post changeset_comment_path(create(:changeset, :closed), :text => ""), :headers => auth_header end assert_response :bad_request end @@ -142,13 +142,13 @@ module Api assert_difference "ChangesetComment.count", Settings.initial_changeset_comments_per_hour do 1.upto(Settings.initial_changeset_comments_per_hour) do |count| - post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header assert_response :success end end assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => changeset, :text => "One comment too many"), :headers => auth_header + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header assert_response :too_many_requests end end @@ -164,13 +164,13 @@ module Api assert_difference "ChangesetComment.count", Settings.max_changeset_comments_per_hour do 1.upto(Settings.max_changeset_comments_per_hour) do |count| - post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header assert_response :success end end assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => changeset, :text => "One comment too many"), :headers => auth_header + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header assert_response :too_many_requests end end @@ -186,13 +186,13 @@ module Api assert_difference "ChangesetComment.count", Settings.initial_changeset_comments_per_hour / 2 do 1.upto(Settings.initial_changeset_comments_per_hour / 2) do |count| - post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header assert_response :success end end assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => changeset, :text => "One comment too many"), :headers => auth_header + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header assert_response :too_many_requests end end @@ -207,13 +207,13 @@ module Api assert_difference "ChangesetComment.count", Settings.moderator_changeset_comments_per_hour do 1.upto(Settings.moderator_changeset_comments_per_hour) do |count| - post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header assert_response :success end end assert_no_difference "ChangesetComment.count" do - post changeset_comment_path(:id => changeset, :text => "One comment too many"), :headers => auth_header + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header assert_response :too_many_requests end end @@ -307,7 +307,7 @@ module Api changeset = create(:changeset, :closed) assert_difference "ChangesetComment.count", 0 do - signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token } + signed_post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token } end assert_response :forbidden @@ -316,7 +316,7 @@ module Api user.save! assert_difference "ChangesetComment.count", 1 do - signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token } + signed_post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token } end assert_response :success end @@ -330,7 +330,7 @@ module Api auth_header = basic_authorization_header user.email, "test" assert_difference "ChangesetComment.count", 0 do - post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end assert_response :forbidden @@ -339,7 +339,7 @@ module Api user.save! assert_difference "ChangesetComment.count", 1 do - post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end assert_response :success end diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 8bb229294..cfb424169 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -396,7 +396,7 @@ module Api # check that a changeset that doesn't exist returns an appropriate message def test_show_not_found [0, -32, 233455644, "afg", "213"].each do |id| - get changeset_show_path(:id => id) + get changeset_show_path(id) assert_response :not_found, "should get a not found" rescue ActionController::UrlGenerationError => e assert_match(/No route matches/, e.to_s) @@ -424,7 +424,7 @@ module Api auth_header = basic_authorization_header user.email, "test" cs_id = changeset.id - put changeset_close_path(:id => cs_id), :headers => auth_header + put changeset_close_path(cs_id), :headers => auth_header assert_response :success # test that it really is closed now @@ -470,7 +470,7 @@ module Api # First try to do it with no auth cs_ids.each do |id| - put changeset_close_path(:id => id) + put changeset_close_path(id) assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" rescue ActionController::UrlGenerationError => e assert_match(/No route matches/, e.to_s) @@ -479,7 +479,7 @@ module Api # Now try with auth auth_header = basic_authorization_header create(:user).email, "test" cs_ids.each do |id| - put changeset_close_path(:id => id), :headers => auth_header + put changeset_close_path(id), :headers => auth_header assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" rescue ActionController::UrlGenerationError => e assert_match(/No route matches/, e.to_s) @@ -788,7 +788,7 @@ module Api # upload it, which used to cause an error like "PGError: ERROR: # integer out of range" (bug #2152). but shouldn't any more. - post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff, :headers => auth_header assert_response :success, "can't upload a spatially-large diff to changeset: #{@response.body}" @@ -1457,7 +1457,7 @@ module Api diff.root << modify # upload it - post changeset_upload_path(:id => changeset_id), :params => diff.to_s, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff.to_s, :headers => auth_header assert_response :success, "diff should have uploaded OK" @@ -1496,7 +1496,7 @@ module Api diff.root << modify # upload it - post changeset_upload_path(:id => changeset_id), :params => diff.to_s, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff.to_s, :headers => auth_header assert_response :success, "diff should have uploaded OK" @@ -1911,11 +1911,11 @@ module Api CHANGESET # upload it - post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff, :headers => auth_header assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get changeset_download_path(:id => changeset_id) + get changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -1969,11 +1969,11 @@ module Api OSMFILE # upload it - post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff, :headers => auth_header assert_response :success, "can't upload a diff from JOSM: #{@response.body}" - get changeset_download_path(:id => changeset_id) + get changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -2024,11 +2024,11 @@ module Api CHANGESET # upload it - post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header + post changeset_upload_path(changeset_id), :params => diff, :headers => auth_header assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get changeset_download_path(:id => changeset_id) + get changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -2121,7 +2121,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(:id => changeset_id) + get changeset_show_path(changeset_id) assert_response :success, "Couldn't read back changeset." assert_select "osm>changeset[min_lon='0.1000000']", 1 assert_select "osm>changeset[max_lon='0.1000000']", 1 @@ -2136,7 +2136,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(:id => changeset_id) + get changeset_show_path(changeset_id) assert_response :success, "Couldn't read back changeset for the second time." assert_select "osm>changeset[min_lon='0.1000000']", 1 assert_select "osm>changeset[max_lon='0.2000000']", 1 @@ -2151,7 +2151,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(:id => changeset_id) + get changeset_show_path(changeset_id) assert_response :success, "Couldn't read back changeset for the third time." assert_select "osm>changeset[min_lon='0.1000000']", 1 assert_select "osm>changeset[max_lon='0.3000000']", 1 @@ -2642,7 +2642,7 @@ module Api # bad changeset id assert_no_difference "changeset.subscribers.count" do - post api_changeset_unsubscribe_path(:id => 999111), :headers => auth_header + post api_changeset_unsubscribe_path(999111), :headers => auth_header end assert_response :not_found diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb index 982df1dd7..eba3d255e 100644 --- a/test/controllers/api/relations_controller_test.rb +++ b/test/controllers/api/relations_controller_test.rb @@ -1089,7 +1089,7 @@ module Api # now download the changeset to check its bounding box with_controller(Api::ChangesetsController.new) do - get changeset_show_path(:id => changeset_id) + get changeset_show_path(changeset_id) assert_response :success, "can't re-read changeset for modify test" assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}" assert_select "osm>changeset[id='#{changeset_id}']", 1, "Changeset id=#{changeset_id} doesn't exist in #{@response.body}" @@ -1153,7 +1153,7 @@ module Api change << modify modify << doc.import(rel.find("//osm/relation").first) - post changeset_upload_path(:id => cs_id), :params => doc.to_s, :headers => headers + post changeset_upload_path(cs_id), :params => doc.to_s, :headers => headers assert_response :success, "can't upload diff relation: #{@response.body}" version = xml_parse(@response.body).find("//diffResult/relation").first["new_version"].to_i end -- 2.39.5