X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bcf066ff9c42c7b868de15e2ae251986ab19fe61..a297e2ccdcabd1197af7cc7cab3c24f5aea1efc0:/test/controllers/api/changesets_controller_test.rb?ds=sidebyside diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 1d92263f9..1da53a704 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -17,14 +17,6 @@ module Api { :path => "/api/0.6/changesets", :method => :post }, { :controller => "api/changesets", :action => "create" } ) - assert_routing( - { :path => "/api/0.6/changeset/1/upload", :method => :post }, - { :controller => "api/changesets", :action => "upload", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/changeset/1/download", :method => :get }, - { :controller => "api/changesets", :action => "download", :id => "1" } - ) assert_routing( { :path => "/api/0.6/changeset/1", :method => :get }, { :controller => "api/changesets", :action => "show", :id => "1" } @@ -33,6 +25,18 @@ module Api { :path => "/api/0.6/changeset/1.json", :method => :get }, { :controller => "api/changesets", :action => "show", :id => "1", :format => "json" } ) + assert_routing( + { :path => "/api/0.6/changeset/1", :method => :put }, + { :controller => "api/changesets", :action => "update", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/upload", :method => :post }, + { :controller => "api/changesets", :action => "upload", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/download", :method => :get }, + { :controller => "api/changesets", :action => "download", :id => "1" } + ) assert_routing( { :path => "/api/0.6/changeset/1/subscribe", :method => :post }, { :controller => "api/changesets", :action => "subscribe", :id => "1" } @@ -49,10 +53,6 @@ module Api { :path => "/api/0.6/changeset/1/unsubscribe.json", :method => :post }, { :controller => "api/changesets", :action => "unsubscribe", :id => "1", :format => "json" } ) - assert_routing( - { :path => "/api/0.6/changeset/1", :method => :put }, - { :controller => "api/changesets", :action => "update", :id => "1" } - ) assert_routing( { :path => "/api/0.6/changeset/1/close", :method => :put }, { :controller => "api/changesets", :action => "close", :id => "1" } @@ -76,40 +76,40 @@ module Api changeset2 = create(:changeset, :min_lat => (5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (15 * GeoRecord::SCALE).round) changeset3 = create(:changeset, :min_lat => (4.5 * GeoRecord::SCALE).round, :min_lon => (4.5 * GeoRecord::SCALE).round, :max_lat => (5 * GeoRecord::SCALE).round, :max_lon => (5 * GeoRecord::SCALE).round) - get changesets_path(:bbox => "-10,-10, 10, 10") + get api_changesets_path(:bbox => "-10,-10, 10, 10") assert_response :success, "can't get changesets in bbox" assert_changesets_in_order [changeset3, changeset2] - get changesets_path(:bbox => "4.5,4.5,4.6,4.6") + get api_changesets_path(:bbox => "4.5,4.5,4.6,4.6") assert_response :success, "can't get changesets in bbox" assert_changesets_in_order [changeset3] # not found when looking for changesets of non-existing users - get changesets_path(:user => User.maximum(:id) + 1) + get api_changesets_path(:user => User.maximum(:id) + 1) assert_response :not_found assert_equal "text/plain", @response.media_type - get changesets_path(:display_name => " ") + get api_changesets_path(:display_name => " ") assert_response :not_found assert_equal "text/plain", @response.media_type # can't get changesets of user 1 without authenticating - get changesets_path(:user => private_user.id) + get api_changesets_path(:user => private_user.id) assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)" - get changesets_path(:display_name => private_user.display_name) + get api_changesets_path(:display_name => private_user.display_name) assert_response :not_found, "shouldn't be able to get changesets by non-public user (name)" # but this should work auth_header = bearer_authorization_header private_user - get changesets_path(:user => private_user.id), :headers => auth_header + get api_changesets_path(:user => private_user.id), :headers => auth_header assert_response :success, "can't get changesets by user ID" assert_changesets_in_order [private_user_changeset, private_user_closed_changeset] - get changesets_path(:display_name => private_user.display_name), :headers => auth_header + get api_changesets_path(:display_name => private_user.display_name), :headers => auth_header assert_response :success, "can't get changesets by user name" assert_changesets_in_order [private_user_changeset, private_user_closed_changeset] # test json endpoint - get changesets_path(:display_name => private_user.display_name), :headers => auth_header, :params => { :format => "json" } + get api_changesets_path(:display_name => private_user.display_name), :headers => auth_header, :params => { :format => "json" } assert_response :success, "can't get changesets by user name" js = ActiveSupport::JSON.decode(@response.body) @@ -120,47 +120,47 @@ module Api assert_equal 2, js["changesets"].count # check that the correct error is given when we provide both UID and name - get changesets_path(:user => private_user.id, - :display_name => private_user.display_name), :headers => auth_header + get api_changesets_path(:user => private_user.id, + :display_name => private_user.display_name), :headers => auth_header assert_response :bad_request, "should be a bad request to have both ID and name specified" - get changesets_path(:user => private_user.id, :open => true), :headers => auth_header + get api_changesets_path(:user => private_user.id, :open => true), :headers => auth_header assert_response :success, "can't get changesets by user and open" assert_changesets_in_order [private_user_changeset] - get changesets_path(:time => "2007-12-31"), :headers => auth_header + get api_changesets_path(:time => "2007-12-31"), :headers => auth_header assert_response :success, "can't get changesets by time-since" assert_changesets_in_order [changeset3, changeset2, changeset, private_user_changeset, private_user_closed_changeset, closed_changeset] - get changesets_path(:time => "2008-01-01T12:34Z"), :headers => auth_header + get api_changesets_path(:time => "2008-01-01T12:34Z"), :headers => auth_header assert_response :success, "can't get changesets by time-since with hour" assert_changesets_in_order [changeset3, changeset2, changeset, private_user_changeset, private_user_closed_changeset, closed_changeset] - get changesets_path(:time => "2007-12-31T23:59Z,2008-01-02T00:01Z"), :headers => auth_header + get api_changesets_path(:time => "2007-12-31T23:59Z,2008-01-02T00:01Z"), :headers => auth_header assert_response :success, "can't get changesets by time-range" assert_changesets_in_order [closed_changeset] - get changesets_path(:open => "true"), :headers => auth_header + get api_changesets_path(:open => "true"), :headers => auth_header assert_response :success, "can't get changesets by open-ness" assert_changesets_in_order [changeset3, changeset2, changeset, private_user_changeset] - get changesets_path(:closed => "true"), :headers => auth_header + get api_changesets_path(:closed => "true"), :headers => auth_header assert_response :success, "can't get changesets by closed-ness" assert_changesets_in_order [private_user_closed_changeset, closed_changeset] - get changesets_path(:closed => "true", :user => private_user.id), :headers => auth_header + get api_changesets_path(:closed => "true", :user => private_user.id), :headers => auth_header assert_response :success, "can't get changesets by closed-ness and user" assert_changesets_in_order [private_user_closed_changeset] - get changesets_path(:closed => "true", :user => user.id), :headers => auth_header + get api_changesets_path(:closed => "true", :user => user.id), :headers => auth_header assert_response :success, "can't get changesets by closed-ness and user" assert_changesets_in_order [closed_changeset] - get changesets_path(:changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}"), :headers => auth_header + get api_changesets_path(:changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}"), :headers => auth_header assert_response :success, "can't get changesets by id (as comma-separated string)" assert_changesets_in_order [changeset, private_user_changeset, closed_changeset] - get changesets_path(:changesets => ""), :headers => auth_header + get api_changesets_path(:changesets => ""), :headers => auth_header assert_response :bad_request, "should be a bad request since changesets is empty" end @@ -174,22 +174,22 @@ module Api changeset4 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 4, 1, 0, 0, 0), :closed_at => Time.utc(2008, 4, 2, 0, 0, 0)) changeset5 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 5, 1, 0, 0, 0), :closed_at => Time.utc(2008, 5, 2, 0, 0, 0)) - get changesets_path + get api_changesets_path assert_response :success assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1] - get changesets_path(:limit => "3") + get api_changesets_path(:limit => "3") assert_response :success assert_changesets_in_order [changeset5, changeset4, changeset3] - get changesets_path(:limit => "0") + get api_changesets_path(:limit => "0") assert_response :bad_request - get changesets_path(:limit => Settings.max_changeset_query_limit) + get api_changesets_path(:limit => Settings.max_changeset_query_limit) assert_response :success assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1] - get changesets_path(:limit => Settings.max_changeset_query_limit + 1) + get api_changesets_path(:limit => Settings.max_changeset_query_limit + 1) assert_response :bad_request end @@ -204,11 +204,11 @@ module Api changeset5 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 5, 1, 0, 0, 0), :closed_at => Time.utc(2008, 5, 2, 0, 0, 0)) changeset6 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 6, 1, 0, 0, 0), :closed_at => Time.utc(2008, 6, 2, 0, 0, 0)) - get changesets_path + get api_changesets_path assert_response :success assert_changesets_in_order [changeset6, changeset5, changeset4, changeset3, changeset2, changeset1] - get changesets_path(:order => "oldest") + get api_changesets_path(:order => "oldest") assert_response :success assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4, changeset5, changeset6] @@ -226,15 +226,15 @@ module Api # empty range ["2009-02-02T00:00:01Z", "2018-05-15T00:00:00Z", [], []] ].each do |from, to, interval_changesets, point_changesets| - get changesets_path(:time => "#{from},#{to}") + get api_changesets_path(:time => "#{from},#{to}") assert_response :success assert_changesets_in_order interval_changesets - get changesets_path(:from => from, :to => to) + get api_changesets_path(:from => from, :to => to) assert_response :success assert_changesets_in_order point_changesets - get changesets_path(:from => from, :to => to, :order => "oldest") + get api_changesets_path(:from => from, :to => to, :order => "oldest") assert_response :success assert_changesets_in_order point_changesets.reverse end @@ -250,27 +250,27 @@ module Api changeset4 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2015, 6, 3, 23, 0, 0), :closed_at => Time.utc(2015, 6, 4, 23, 0, 0)) create(:changeset, :closed, :user => user, :created_at => Time.utc(2015, 6, 2, 23, 0, 0), :closed_at => Time.utc(2015, 6, 3, 23, 0, 0)) - get changesets_path(:time => "2015-06-04T00:00:00Z") + get api_changesets_path(:time => "2015-06-04T00:00:00Z") assert_response :success assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4] - get changesets_path(:from => "2015-06-04T00:00:00Z") + get api_changesets_path(:from => "2015-06-04T00:00:00Z") assert_response :success assert_changesets_in_order [changeset1, changeset2, changeset3] - get changesets_path(:from => "2015-06-04T00:00:00Z", :order => "oldest") + get api_changesets_path(:from => "2015-06-04T00:00:00Z", :order => "oldest") assert_response :success assert_changesets_in_order [changeset3, changeset2, changeset1] - get changesets_path(:time => "2015-06-04T16:00:00Z,2015-06-04T17:30:00Z") + get api_changesets_path(:time => "2015-06-04T16:00:00Z,2015-06-04T17:30:00Z") assert_response :success assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4] - get changesets_path(:from => "2015-06-04T16:00:00Z", :to => "2015-06-04T17:30:00Z") + get api_changesets_path(:from => "2015-06-04T16:00:00Z", :to => "2015-06-04T17:30:00Z") assert_response :success assert_changesets_in_order [changeset1, changeset2] - get changesets_path(:from => "2015-06-04T16:00:00Z", :to => "2015-06-04T17:30:00Z", :order => "oldest") + get api_changesets_path(:from => "2015-06-04T16:00:00Z", :to => "2015-06-04T17:30:00Z", :order => "oldest") assert_response :success assert_changesets_in_order [changeset2, changeset1] end @@ -282,7 +282,7 @@ module Api ["abracadabra!", "1,2,3,F", ";drop table users;"].each do |bbox| - get changesets_path(:bbox => bbox) + get api_changesets_path(:bbox => bbox) assert_response :bad_request, "'#{bbox}' isn't a bbox" end @@ -291,7 +291,7 @@ module Api ";drop table users;", ",", "-,-"].each do |time| - get changesets_path(:time => time) + get api_changesets_path(:time => time) assert_response :bad_request, "'#{time}' isn't a valid time range" end @@ -299,11 +299,11 @@ module Api "foobar", "-1", "0"].each do |uid| - get changesets_path(:user => uid) + get api_changesets_path(:user => uid) assert_response :bad_request, "'#{uid}' isn't a valid user ID" end - get changesets_path(:order => "oldest", :time => "2008-01-01T00:00Z,2018-01-01T00:00Z") + get api_changesets_path(:order => "oldest", :time => "2008-01-01T00:00Z,2018-01-01T00:00Z") assert_response :bad_request, "cannot use order=oldest with time" end @@ -406,7 +406,7 @@ module Api def test_show changeset = create(:changeset) - get changeset_show_path(changeset) + get api_changeset_path(changeset) assert_response :success, "cannot get first changeset" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -414,7 +414,7 @@ module Api assert_dom "> discussion", 0 end - get changeset_show_path(changeset), :params => { :include_discussion => true } + get api_changeset_path(changeset, :include_discussion => true) assert_response :success, "cannot get first changeset with comments" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -429,7 +429,7 @@ module Api changeset = create(:changeset, :closed) comment1, comment2, comment3 = create_list(:changeset_comment, 3, :changeset_id => changeset.id) - get changeset_show_path(changeset), :params => { :include_discussion => true } + get api_changeset_path(changeset, :include_discussion => true) assert_response :success, "cannot get closed changeset with comments" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 do @@ -451,7 +451,7 @@ module Api comment2.update(:visible => false) changeset.reload - get changeset_show_path(changeset), :params => { :include_discussion => true } + get api_changeset_path(changeset, :include_discussion => true) assert_response :success, "cannot get closed changeset with comments" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -467,7 +467,7 @@ module Api end # one hidden comment not included because no permissions - get changeset_show_path(changeset), :params => { :include_discussion => true, :show_hidden_comments => true } + get api_changeset_path(changeset, :include_discussion => true, :show_hidden_comments => true) assert_response :success, "cannot get closed changeset with comments" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -486,8 +486,7 @@ module Api # one hidden comment shown to moderators moderator_user = create(:moderator_user) auth_header = bearer_authorization_header moderator_user - get changeset_show_path(changeset), :params => { :include_discussion => true, :show_hidden_comments => true }, - :headers => auth_header + get api_changeset_path(changeset, :include_discussion => true, :show_hidden_comments => true), :headers => auth_header assert_response :success, "cannot get closed changeset with comments" assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -510,7 +509,7 @@ module Api create(:changeset_tag, :changeset => changeset, :k => "created_by", :v => "JOSM/1.5 (18364)") create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset comment") - get changeset_show_path(changeset) + get api_changeset_path(changeset) assert_response :success assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 @@ -524,7 +523,7 @@ module Api def test_show_json changeset = create(:changeset) - get changeset_show_path(changeset), :params => { :format => "json" } + get api_changeset_path(changeset, :format => "json") assert_response :success, "cannot get first changeset" js = ActiveSupport::JSON.decode(@response.body) @@ -538,7 +537,7 @@ module Api assert_equal changeset.user.id, js["changeset"]["uid"] assert_equal changeset.user.display_name, js["changeset"]["user"] - get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true } + get api_changeset_path(changeset, :format => "json", :include_discussion => true) assert_response :success, "cannot get first changeset with comments" js = ActiveSupport::JSON.decode(@response.body) @@ -559,7 +558,7 @@ module Api changeset = create(:changeset, :closed) comment0, comment1, comment2 = create_list(:changeset_comment, 3, :changeset_id => changeset.id) - get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true } + get api_changeset_path(changeset, :format => "json", :include_discussion => true) assert_response :success, "cannot get closed changeset with comments" js = ActiveSupport::JSON.decode(@response.body) @@ -579,7 +578,7 @@ module Api comment1.update(:visible => false) changeset.reload - get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true } + get api_changeset_path(changeset, :format => "json", :include_discussion => true) assert_response :success, "cannot get closed changeset with comments" js = ActiveSupport::JSON.decode(@response.body) @@ -594,7 +593,7 @@ module Api assert js["changeset"]["comments"][1]["visible"] # one hidden comment not included because no permissions - get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true, :show_hidden_comments => true } + get api_changeset_path(changeset, :format => "json", :include_discussion => true, :show_hidden_comments => true) assert_response :success, "cannot get closed changeset with comments" js = ActiveSupport::JSON.decode(@response.body) @@ -612,8 +611,7 @@ module Api # one hidden comment shown to moderators moderator_user = create(:moderator_user) auth_header = bearer_authorization_header moderator_user - get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true, :show_hidden_comments => true }, - :headers => auth_header + get api_changeset_path(changeset, :format => "json", :include_discussion => true, :show_hidden_comments => true), :headers => auth_header assert_response :success, "cannot get closed changeset with comments" js = ActiveSupport::JSON.decode(@response.body) @@ -635,7 +633,7 @@ module Api create(:changeset_tag, :changeset => changeset, :k => "created_by", :v => "JOSM/1.5 (18364)") create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset comment") - get changeset_show_path(changeset, :format => "json") + get api_changeset_path(changeset, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) @@ -653,7 +651,7 @@ module Api changeset = create(:changeset, :min_lat => (-5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (12 * GeoRecord::SCALE).round) - get changeset_show_path(changeset), :params => { :format => "json" } + get api_changeset_path(changeset, :format => "json") assert_response :success, "cannot get first changeset" js = ActiveSupport::JSON.decode(@response.body) @@ -668,7 +666,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) + get api_changeset_path(id) assert_response :not_found, "should get a not found" rescue ActionController::UrlGenerationError => e assert_match(/No route matches/, e.to_s) @@ -2392,7 +2390,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(changeset_id) + get api_changeset_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 @@ -2407,7 +2405,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(changeset_id) + get api_changeset_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 @@ -2422,7 +2420,7 @@ module Api end # get the bounding box back from the changeset - get changeset_show_path(changeset_id) + get api_changeset_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 @@ -2446,17 +2444,17 @@ module Api new_changeset.find("//osm/changeset").first << new_tag # try without any authorization - put changeset_show_path(private_changeset), :params => new_changeset.to_s + put api_changeset_path(private_changeset), :params => new_changeset.to_s assert_response :unauthorized # try with the wrong authorization auth_header = bearer_authorization_header - put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header + put api_changeset_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header assert_response :conflict # now this should get an unauthorized auth_header = bearer_authorization_header private_user - put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header + put api_changeset_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset" ## Now try with the public user @@ -2467,17 +2465,17 @@ module Api new_changeset.find("//osm/changeset").first << new_tag # try without any authorization - put changeset_show_path(changeset), :params => new_changeset.to_s + put api_changeset_path(changeset), :params => new_changeset.to_s assert_response :unauthorized # try with the wrong authorization auth_header = bearer_authorization_header - put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header + put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header assert_response :conflict # now this should work... auth_header = bearer_authorization_header user - put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header + put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header assert_response :success assert_select "osm>changeset[id='#{changeset.id}']", 1 @@ -2498,7 +2496,7 @@ module Api new_tag["v"] = "testing" new_changeset.find("//osm/changeset").first << new_tag - put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header + put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header assert_response :conflict end