X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58ea30c724c9990a51c13da40eb5fe515c026888..5d1bc7a4fa3f21db35ca95292ec9a383476c3843:/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 7f2cd0abb..8efa37d87 100644
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -134,12 +134,14 @@ module Api
def test_create_wrong_method
auth_header = basic_authorization_header create(:user).email, "test"
- assert_raise ActionController::RoutingError do
- get changeset_create_path, :headers => auth_header
- end
- assert_raise ActionController::RoutingError do
- post changeset_create_path, :headers => auth_header
- end
+
+ get changeset_create_path, :headers => auth_header
+ assert_response :not_found
+ assert_template "rescues/routing_error"
+
+ post changeset_create_path, :headers => auth_header
+ assert_response :not_found
+ assert_template "rescues/routing_error"
end
##
@@ -151,7 +153,7 @@ module Api
get changeset_show_path(changeset)
assert_response :success, "cannot get first changeset"
- assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "true"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
@@ -161,7 +163,7 @@ module Api
get changeset_show_path(changeset), :params => { :include_discussion => true }
assert_response :success, "cannot get first changeset with comments"
- assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "true"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
@@ -170,18 +172,21 @@ module Api
assert_select "osm>changeset>discussion>comment", 0
changeset = create(:changeset, :closed)
- create_list(:changeset_comment, 3, :changeset_id => changeset.id)
+ comment1, comment2, comment3 = create_list(:changeset_comment, 3, :changeset_id => changeset.id)
get changeset_show_path(changeset), :params => { :include_discussion => true }
assert_response :success, "cannot get closed changeset with comments"
- assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "false"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
assert_select "osm>changeset>@closed_at", changeset.closed_at.xmlschema
assert_select "osm>changeset>discussion", 1
assert_select "osm>changeset>discussion>comment", 3
+ assert_select "osm>changeset>discussion>comment:nth-child(1)>@id", comment1.id.to_s
+ assert_select "osm>changeset>discussion>comment:nth-child(2)>@id", comment2.id.to_s
+ assert_select "osm>changeset>discussion>comment:nth-child(3)>@id", comment3.id.to_s
end
def test_show_json
@@ -194,9 +199,9 @@ module Api
assert_not_nil js
assert_equal Settings.api_version, js["version"]
- assert_equal "OpenStreetMap server", js["generator"]
+ assert_equal Settings.generator, js["generator"]
assert_equal changeset.id, js["changeset"]["id"]
- assert js["changeset"]["open"]
+ assert_operator js["changeset"], :[], "open"
assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
assert_nil js["changeset"]["closed_at"]
assert_nil js["changeset"]["tags"]
@@ -210,9 +215,9 @@ module Api
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal Settings.api_version, js["version"]
- assert_equal "OpenStreetMap server", js["generator"]
+ assert_equal Settings.generator, js["generator"]
assert_equal changeset.id, js["changeset"]["id"]
- assert js["changeset"]["open"]
+ assert_operator js["changeset"], :[], "open"
assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
assert_nil js["changeset"]["closed_at"]
assert_nil js["changeset"]["tags"]
@@ -221,6 +226,25 @@ module Api
assert_nil js["changeset"]["max_lat"]
assert_nil js["changeset"]["max_lon"]
assert_equal 0, js["changeset"]["comments"].count
+
+ 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 }
+ assert_response :success, "cannot get closed changeset with comments"
+
+ js = ActiveSupport::JSON.decode(@response.body)
+ assert_not_nil js
+ assert_equal Settings.api_version, js["version"]
+ assert_equal Settings.generator, js["generator"]
+ assert_equal changeset.id, js["changeset"]["id"]
+ assert_not js["changeset"]["open"]
+ assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
+ assert_equal changeset.closed_at.xmlschema, js["changeset"]["closed_at"]
+ assert_equal 3, js["changeset"]["comments"].count
+ assert_equal comment0.id, js["changeset"]["comments"][0]["id"]
+ assert_equal comment1.id, js["changeset"]["comments"][1]["id"]
+ assert_equal comment2.id, js["changeset"]["comments"][2]["id"]
end
def test_show_tag_and_discussion_json
@@ -247,7 +271,7 @@ module Api
assert_not_nil js
assert_equal Settings.api_version, js["version"]
- assert_equal "OpenStreetMap server", js["generator"]
+ assert_equal Settings.generator, js["generator"]
assert_equal changeset.id, js["changeset"]["id"]
assert_not js["changeset"]["open"]
assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
@@ -339,13 +363,13 @@ module Api
auth_header = basic_authorization_header user.email, "test"
- assert_raise ActionController::RoutingError do
- get changeset_close_path(changeset), :headers => auth_header
- end
+ get changeset_close_path(changeset), :headers => auth_header
+ assert_response :not_found
+ assert_template "rescues/routing_error"
- assert_raise ActionController::RoutingError do
- post changeset_close_path(changeset), :headers => auth_header
- end
+ post changeset_close_path(changeset), :headers => auth_header
+ assert_response :not_found
+ assert_template "rescues/routing_error"
end
##
@@ -521,7 +545,7 @@ module Api
"can't upload a simple valid creation to changeset: #{@response.body}"
# check the returned payload
- assert_select "diffResult[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "diffResult[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "diffResult>node", 1
assert_select "diffResult>way", 1
assert_select "diffResult>relation", 1
@@ -675,10 +699,10 @@ module Api
# check that the changeset bbox is within bounds
cs = Changeset.find(changeset_id)
- assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
- assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
- assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
- assert cs.max_lat <= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
+ assert_operator cs.min_lon, :>=, -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
+ assert_operator cs.max_lon, :<=, 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
+ assert_operator cs.min_lat, :>=, -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
+ assert_operator cs.max_lat, :<=, 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
end
##
@@ -759,7 +783,7 @@ module Api
"can't do a conditional delete of in use objects: #{@response.body}"
# check the returned payload
- assert_select "diffResult[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "diffResult[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "diffResult>node", 1
assert_select "diffResult>way", 1
assert_select "diffResult>relation", 1
@@ -1430,7 +1454,7 @@ module Api
"failed to return error in XML format"
# check the returned payload
- assert_select "osmError[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
+ assert_select "osmError[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_select "osmError>status", 1
assert_select "osmError>message", 1
end
@@ -1582,6 +1606,107 @@ module Api
assert_equal "Precondition failed: Node #{node.id} is still used by ways #{way.id}.", @response.body
end
+ ##
+ # test initial rate limit
+ def test_upload_initial_rate_limit
+ # create a user
+ user = create(:user)
+
+ # create some objects to use
+ node = create(:node)
+ way = create(:way_with_nodes, :nodes_count => 2)
+ relation = create(:relation)
+
+ # create a changeset that puts us near the initial rate limit
+ changeset = create(:changeset, :user => user,
+ :created_at => Time.now.utc - 5.minutes,
+ :num_changes => Settings.initial_changes_per_hour - 2)
+
+ # create authentication header
+ auth_header = basic_authorization_header user.email, "test"
+
+ # simple diff to create a node way and relation using placeholders
+ diff = <<~CHANGESET
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CHANGESET
+
+ # upload it
+ post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+ assert_response :too_many_requests, "upload did not hit rate limit"
+ end
+
+ ##
+ # test maximum rate limit
+ def test_upload_maximum_rate_limit
+ # create a user
+ user = create(:user)
+
+ # create some objects to use
+ node = create(:node)
+ way = create(:way_with_nodes, :nodes_count => 2)
+ relation = create(:relation)
+
+ # create a changeset to establish our initial edit time
+ changeset = create(:changeset, :user => user,
+ :created_at => Time.now.utc - 28.days)
+
+ # create changeset to put us near the maximum rate limit
+ total_changes = Settings.max_changes_per_hour - 2
+ while total_changes.positive?
+ changes = [total_changes, Changeset::MAX_ELEMENTS].min
+ changeset = create(:changeset, :user => user,
+ :created_at => Time.now.utc - 5.minutes,
+ :num_changes => changes)
+ total_changes -= changes
+ end
+
+ # create authentication header
+ auth_header = basic_authorization_header user.email, "test"
+
+ # simple diff to create a node way and relation using placeholders
+ diff = <<~CHANGESET
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CHANGESET
+
+ # upload it
+ post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+ assert_response :too_many_requests, "upload did not hit rate limit"
+ end
+
##
# when we make some simple changes we get the same changes back from the
# diff download.
@@ -1863,8 +1988,10 @@ module Api
# not found when looking for changesets of non-existing users
get changesets_path(:user => User.maximum(:id) + 1)
assert_response :not_found
+ assert_equal "text/plain", @response.media_type
get 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)
@@ -1890,7 +2017,7 @@ module Api
assert_not_nil js
assert_equal Settings.api_version, js["version"]
- assert_equal "OpenStreetMap server", js["generator"]
+ assert_equal Settings.generator, js["generator"]
assert_equal 2, js["changesets"].count
# check that the correct error is given when we provide both UID and name
@@ -1950,23 +2077,105 @@ module Api
get changesets_path
assert_response :success
- assert_changesets [changeset5, changeset4, changeset3, changeset2, changeset1]
+ assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1]
get changesets_path(:limit => "3")
assert_response :success
- assert_changesets [changeset5, changeset4, changeset3]
+ assert_changesets_in_order [changeset5, changeset4, changeset3]
get changesets_path(:limit => "0")
assert_response :bad_request
get changesets_path(:limit => Settings.max_changeset_query_limit)
assert_response :success
- assert_changesets [changeset5, changeset4, changeset3, changeset2, changeset1]
+ assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1]
get changesets_path(:limit => Settings.max_changeset_query_limit + 1)
assert_response :bad_request
end
+ ##
+ # test the query functionality of sequential changesets with order and time parameters
+ def test_query_order
+ user = create(:user)
+ changeset1 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 1, 1, 0, 0, 0), :closed_at => Time.utc(2008, 1, 2, 0, 0, 0))
+ changeset2 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 2, 1, 0, 0, 0), :closed_at => Time.utc(2008, 2, 2, 0, 0, 0))
+ changeset3 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 3, 1, 0, 0, 0), :closed_at => Time.utc(2008, 3, 2, 0, 0, 0))
+ 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))
+ 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
+ assert_response :success
+ assert_changesets_in_order [changeset6, changeset5, changeset4, changeset3, changeset2, changeset1]
+
+ get changesets_path(:order => "oldest")
+ assert_response :success
+ assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4, changeset5, changeset6]
+
+ [
+ # lower time bound at the opening time of a changeset
+ ["2008-02-01T00:00:00Z", "2008-05-15T00:00:00Z", [changeset5, changeset4, changeset3, changeset2], [changeset5, changeset4, changeset3, changeset2]],
+ # lower time bound in the middle of a changeset
+ ["2008-02-01T12:00:00Z", "2008-05-15T00:00:00Z", [changeset5, changeset4, changeset3, changeset2], [changeset5, changeset4, changeset3]],
+ # lower time bound at the closing time of a changeset
+ ["2008-02-02T00:00:00Z", "2008-05-15T00:00:00Z", [changeset5, changeset4, changeset3, changeset2], [changeset5, changeset4, changeset3]],
+ # lower time bound after the closing time of a changeset
+ ["2008-02-02T00:00:01Z", "2008-05-15T00:00:00Z", [changeset5, changeset4, changeset3], [changeset5, changeset4, changeset3]],
+ # upper time bound in the middle of a changeset
+ ["2007-09-09T12:00:00Z", "2008-04-01T12:00:00Z", [changeset4, changeset3, changeset2, changeset1], [changeset4, changeset3, changeset2, changeset1]],
+ # 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}")
+ assert_response :success
+ assert_changesets_in_order interval_changesets
+
+ get changesets_path(:from => from, :to => to)
+ assert_response :success
+ assert_changesets_in_order point_changesets
+
+ get changesets_path(:from => from, :to => to, :order => "oldest")
+ assert_response :success
+ assert_changesets_in_order point_changesets.reverse
+ end
+ end
+
+ ##
+ # test the query functionality of overlapping changesets with order and time parameters
+ def test_query_order_overlapping
+ user = create(:user)
+ changeset1 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2015, 6, 4, 17, 0, 0), :closed_at => Time.utc(2015, 6, 4, 17, 0, 0))
+ changeset2 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2015, 6, 4, 16, 0, 0), :closed_at => Time.utc(2015, 6, 4, 18, 0, 0))
+ changeset3 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2015, 6, 4, 14, 0, 0), :closed_at => Time.utc(2015, 6, 4, 20, 0, 0))
+ 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")
+ assert_response :success
+ assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4]
+
+ get 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")
+ assert_response :success
+ assert_changesets_in_order [changeset3, changeset2, changeset1]
+
+ get 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")
+ 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")
+ assert_response :success
+ assert_changesets_in_order [changeset2, changeset1]
+ end
+
##
# check that errors are returned if garbage is inserted
# into query strings
@@ -1994,6 +2203,9 @@ module Api
get 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")
+ assert_response :bad_request, "cannot use order=oldest with time"
end
##
@@ -2072,7 +2284,11 @@ module Api
# check that a changeset can contain a certain max number of changes.
## FIXME should be changed to an integration test due to the with_controller
def test_changeset_limits
- auth_header = basic_authorization_header create(:user).email, "test"
+ user = create(:user)
+ auth_header = basic_authorization_header user.email, "test"
+
+ # create an old changeset to ensure we have the maximum rate limit
+ create(:changeset, :user => user, :created_at => Time.now.utc - 28.days)
# open a new changeset
xml = ""
@@ -2247,8 +2463,7 @@ module Api
private
##
- # boilerplate for checking that certain changesets exist in the
- # output.
+ # check that certain changesets exist in the output
def assert_changesets(changesets)
assert_select "osm>changeset", changesets.size
changesets.each do |changeset|
@@ -2256,6 +2471,15 @@ module Api
end
end
+ ##
+ # check that certain changesets exist in the output in the specified order
+ def assert_changesets_in_order(changesets)
+ assert_select "osm>changeset", changesets.size
+ changesets.each_with_index do |changeset, index|
+ assert_select "osm>changeset:nth-child(#{index + 1})[id='#{changeset.id}']", 1
+ end
+ end
+
##
# update the changeset_id of a way element
def update_changeset(xml, changeset_id)