X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..6afd13602c18946e33197397f88603b1c1bb5ceb:/test/controllers/way_controller_test.rb
diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 3ae7aa36e..ae52c036f 100644
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'way_controller'
+require "test_helper"
+require "way_controller"
class WayControllerTest < ActionController::TestCase
api_fixtures
@@ -74,7 +74,7 @@ class WayControllerTest < ActionController::TestCase
way.nodes.each do |n|
count = (way.nodes - (way.nodes - [n])).length
assert_select "osm way nd[ref='#{n.id}']", count
- assert_select "osm node[id='#{n.id}'][version='#{n.version}'][lat='#{n.lat}'][lon='#{n.lon}']", 1
+ assert_select "osm node[id='#{n.id}'][version='#{n.version}'][lat='#{format('%.7f', n.lat)}'][lon='#{format('%.7f', n.lon)}']", 1
end
end
end
@@ -121,14 +121,12 @@ class WayControllerTest < ActionController::TestCase
# create a way with pre-existing nodes
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
- # hope for success
+ # hope for failure
assert_response :forbidden,
- "way upload did not return success status"
- # read id of created way and search for it
- wayid = @response.body
+ "way upload did not return forbidden status"
## Now use a public user
nid1 = current_nodes(:used_node_1).id
@@ -140,8 +138,8 @@ class WayControllerTest < ActionController::TestCase
# create a way with pre-existing nodes
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -181,7 +179,7 @@ class WayControllerTest < ActionController::TestCase
# create a way with non-existing node
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :forbidden,
@@ -189,7 +187,7 @@ class WayControllerTest < ActionController::TestCase
# create a way with no nodes
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :forbidden,
@@ -197,7 +195,7 @@ class WayControllerTest < ActionController::TestCase
# create a way inside a closed changeset
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :forbidden,
@@ -213,7 +211,7 @@ class WayControllerTest < ActionController::TestCase
# create a way with non-existing node
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :precondition_failed,
@@ -222,7 +220,7 @@ class WayControllerTest < ActionController::TestCase
# create a way with no nodes
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :precondition_failed,
@@ -231,7 +229,7 @@ class WayControllerTest < ActionController::TestCase
# create a way inside a closed changeset
content "" +
- ""
+ ""
put :create
# expect failure
assert_response :conflict,
@@ -239,9 +237,9 @@ class WayControllerTest < ActionController::TestCase
# create a way with a tag which is too long
content "" +
- "" +
- "" +
- ""
+ "" +
+ "" +
+ ""
put :create
# expect failure
assert_response :bad_request,
@@ -358,10 +356,181 @@ class WayControllerTest < ActionController::TestCase
assert_response :not_found
end
+ ##
+ # tests whether the API works and prevents incorrect use while trying
+ # to update ways.
+ def test_update
+ ## First test with no user credentials
+ # try and update a way without authorisation
+ # first try to delete way without auth
+ content current_ways(:visible_way).to_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :unauthorized
+
+ ## Second test with the private user
+
+ # setup auth
+ basic_authorization(users(:normal_user).email, "test")
+
+ ## trying to break changesets
+
+ # try and update in someone else's changeset
+ content update_changeset(current_ways(:visible_way).to_xml,
+ changesets(:public_user_first_change).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data "update with other user's changeset should be forbidden when date isn't public"
+
+ # try and update in a closed changeset
+ content update_changeset(current_ways(:visible_way).to_xml,
+ changesets(:normal_user_closed_change).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
+
+ # try and update in a non-existant changeset
+ content update_changeset(current_ways(:visible_way).to_xml, 0)
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data("update with changeset=0 should be forbidden, when data isn't public")
+
+ ## try and submit invalid updates
+ content xml_replace_node(current_ways(:visible_way).to_xml, 3, 9999)
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data "way with non-existent node should be forbidden, when data isn't public"
+
+ content xml_replace_node(current_ways(:visible_way).to_xml, 3, current_nodes(:invisible_node).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data "way with deleted node should be forbidden, when data isn't public"
+
+ ## finally, produce a good request which should work
+ content current_ways(:visible_way).to_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_require_public_data "should have failed with a forbidden when data isn't public"
+
+ ## Finally test with the public user
+
+ # try and update a way without authorisation
+ # first try to delete way without auth
+ content current_ways(:visible_way).to_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :forbidden
+
+ # setup auth
+ basic_authorization(users(:public_user).email, "test")
+
+ ## trying to break changesets
+
+ # try and update in someone else's changeset
+ content update_changeset(current_ways(:visible_way).to_xml,
+ changesets(:normal_user_first_change).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict, "update with other user's changeset should be rejected"
+
+ # try and update in a closed changeset
+ content update_changeset(current_ways(:visible_way).to_xml,
+ changesets(:normal_user_closed_change).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict, "update with closed changeset should be rejected"
+
+ # try and update in a non-existant changeset
+ content update_changeset(current_ways(:visible_way).to_xml, 0)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict, "update with changeset=0 should be rejected"
+
+ ## try and submit invalid updates
+ content xml_replace_node(current_ways(:visible_way).to_xml, 3, 9999)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :precondition_failed, "way with non-existent node should be rejected"
+
+ content xml_replace_node(current_ways(:visible_way).to_xml, 3, current_nodes(:invisible_node).id)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :precondition_failed, "way with deleted node should be rejected"
+
+ ## next, attack the versioning
+ current_way_version = current_ways(:visible_way).version
+
+ # try and submit a version behind
+ content xml_attr_rewrite(current_ways(:visible_way).to_xml,
+ "version", current_way_version - 1)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict, "should have failed on old version number"
+
+ # try and submit a version ahead
+ content xml_attr_rewrite(current_ways(:visible_way).to_xml,
+ "version", current_way_version + 1)
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict, "should have failed on skipped version number"
+
+ # try and submit total crap in the version field
+ content xml_attr_rewrite(current_ways(:visible_way).to_xml,
+ "version", "p1r4t3s!")
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :conflict,
+ "should not be able to put 'p1r4at3s!' in the version field"
+
+ ## try an update with the wrong ID
+ content current_ways(:used_way).to_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :bad_request,
+ "should not be able to update a way with a different ID from the XML"
+
+ ## try an update with a minimal valid XML doc which isn't a well-formed OSM doc.
+ content ""
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :bad_request,
+ "should not be able to update a way with non-OSM XML doc."
+
+ ## finally, produce a good request which should work
+ content current_ways(:visible_way).to_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :success, "a valid update request failed"
+ end
+
# ------------------------------------------------------------
# test tags handling
# ------------------------------------------------------------
+ ##
+ # Try adding a new tag to a way
+ def test_add_tags
+ ## Try with the non-public user
+ # setup auth
+ basic_authorization(users(:normal_user).email, "test")
+
+ # add an identical tag to the way
+ tag_xml = XML::Node.new("tag")
+ tag_xml["k"] = "new"
+ tag_xml["v"] = "yes"
+
+ # add the tag into the existing xml
+ way_xml = current_ways(:visible_way).to_xml
+ way_xml.find("//osm/way").first << tag_xml
+
+ # try and upload it
+ content way_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :forbidden,
+ "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
+
+ ## Now try with the public user
+ # setup auth
+ basic_authorization(users(:public_user).email, "test")
+
+ # add an identical tag to the way
+ tag_xml = XML::Node.new("tag")
+ tag_xml["k"] = "new"
+ tag_xml["v"] = "yes"
+
+ # add the tag into the existing xml
+ way_xml = current_ways(:visible_way).to_xml
+ way_xml.find("//osm/way").first << tag_xml
+
+ # try and upload it
+ content way_xml
+ put :update, :id => current_ways(:visible_way).id
+ assert_response :success,
+ "adding a new tag to a way should succeed"
+ assert_equal current_ways(:visible_way).version + 1, @response.body.to_i
+ end
+
##
# Try adding a duplicate of an existing tag to a way
def test_add_duplicate_tags
@@ -369,10 +538,12 @@ class WayControllerTest < ActionController::TestCase
# setup auth
basic_authorization(users(:normal_user).email, "test")
+ existing = create(:way_tag, :way => current_ways(:visible_way))
+
# add an identical tag to the way
tag_xml = XML::Node.new("tag")
- tag_xml['k'] = current_way_tags(:t1).k
- tag_xml['v'] = current_way_tags(:t1).v
+ tag_xml["k"] = existing.k
+ tag_xml["v"] = existing.v
# add the tag into the existing xml
way_xml = current_ways(:visible_way).to_xml
@@ -390,8 +561,8 @@ class WayControllerTest < ActionController::TestCase
# add an identical tag to the way
tag_xml = XML::Node.new("tag")
- tag_xml['k'] = current_way_tags(:t1).k
- tag_xml['v'] = current_way_tags(:t1).v
+ tag_xml["k"] = existing.k
+ tag_xml["v"] = existing.v
# add the tag into the existing xml
way_xml = current_ways(:visible_way).to_xml
@@ -402,7 +573,7 @@ class WayControllerTest < ActionController::TestCase
put :update, :id => current_ways(:visible_way).id
assert_response :bad_request,
"adding a duplicate tag to a way should fail with 'bad request'"
- assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
+ assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{existing.k}", @response.body
end
##
@@ -414,8 +585,8 @@ class WayControllerTest < ActionController::TestCase
# create duplicate tag
tag_xml = XML::Node.new("tag")
- tag_xml['k'] = "i_am_a_duplicate"
- tag_xml['v'] = "foobar"
+ tag_xml["k"] = "i_am_a_duplicate"
+ tag_xml["v"] = "foobar"
# add the tag into the existing xml
way_xml = current_ways(:visible_way).to_xml
@@ -435,8 +606,8 @@ class WayControllerTest < ActionController::TestCase
# create duplicate tag
tag_xml = XML::Node.new("tag")
- tag_xml['k'] = "i_am_a_duplicate"
- tag_xml['v'] = "foobar"
+ tag_xml["k"] = "i_am_a_duplicate"
+ tag_xml["v"] = "foobar"
# add the tag into the existing xml
way_xml = current_ways(:visible_way).to_xml
@@ -504,8 +675,7 @@ class WayControllerTest < ActionController::TestCase
# check that the set of IDs match expectations
expected_way_ids = [current_ways(:visible_way).id,
- current_ways(:used_way).id
- ]
+ current_ways(:used_way).id]
found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
assert_equal expected_way_ids.sort, found_way_ids.sort,
"expected ways for node #{current_nodes(:used_node_1).id} did not match found"
@@ -519,15 +689,22 @@ class WayControllerTest < ActionController::TestCase
end
##
- # update the changeset_id of a node element
+ # update the changeset_id of a way element
def update_changeset(xml, changeset_id)
- xml_attr_rewrite(xml, 'changeset', changeset_id)
+ xml_attr_rewrite(xml, "changeset", changeset_id)
end
##
- # update an attribute in the node element
+ # update an attribute in the way element
def xml_attr_rewrite(xml, name, value)
xml.find("//osm/way").first[name] = value.to_s
xml
end
+
+ ##
+ # replace a node in a way element
+ def xml_replace_node(xml, old_node, new_node)
+ xml.find("//osm/way/nd[@ref='#{old_node}']").first["ref"] = new_node.to_s
+ xml
+ end
end