X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5506b2d9592f04800436c968055f540685efd29e..1e5782f5795b5e22cae191c2956d18defce6dd66:/test/functional/way_controller_test.rb
diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 933dfb542..fbc05086f 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -18,7 +18,7 @@ class WayControllerTest < Test::Unit::TestCase
end
def content(c)
- @request.env["RAW_POST_DATA"] = c
+ @request.env["RAW_POST_DATA"] = c.to_s
end
# -------------------------------------
@@ -42,13 +42,29 @@ class WayControllerTest < Test::Unit::TestCase
get :ways_for_node, :id => current_nodes(:used_node_1).id
assert_response :success
# FIXME check whether this contains the stuff we want!
- print @response.body
+ #print @response.body
+ # Needs to be updated when changing fixtures
+ # The generator should probably be defined in the environment.rb file
+ # in the same place as the api version
+ assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+ assert_select "osm way", 3
+ assert_select "osm way nd", 3
+ assert_select "osm way tag", 3
# check the "full" mode
get :full, :id => current_ways(:visible_way).id
assert_response :success
# FIXME check whether this contains the stuff we want!
- print @response.body
+ #print @response.body
+ # Check the way is correctly returned
+ way = current_ways(:visible_way)
+ assert_select "osm way[id=#{way.id}][version=#{way.version}][visible=#{way.visible}]", 1
+ assert_select "osm way nd[ref=#{way.way_nodes[0].node_id}]", 1
+ # Check that the node is correctly returned
+ nd = current_ways(:visible_way).nodes
+ assert_equal 1, nd.count
+ nda = nd[0]
+ assert_select "osm node[id=#{nda.id}][version=#{nda.version}][lat=#{nda.lat}][lon=#{nda.lon}]", 1
end
# -------------------------------------
@@ -60,8 +76,13 @@ class WayControllerTest < Test::Unit::TestCase
nid2 = current_nodes(:used_node_2).id
basic_authorization "test@openstreetmap.org", "test"
+ # use the first user's open changeset
+ changeset_id = changesets(:normal_user_first_change).id
+
# create a way with pre-existing nodes
- content ""
+ content "" +
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -78,7 +99,9 @@ class WayControllerTest < Test::Unit::TestCase
"saved way does not contain the right node on pos 0"
assert_equal checkway.nds[1], nid2,
"saved way does not contain the right node on pos 1"
- assert_equal users(:normal_user).id, checkway.user_id,
+ assert_equal checkway.changeset_id, changeset_id,
+ "saved way does not belong to the correct changeset"
+ assert_equal users(:normal_user).id, checkway.changeset.user_id,
"saved way does not belong to user that created it"
assert_equal true, checkway.visible,
"saved way is not visible"
@@ -91,19 +114,34 @@ class WayControllerTest < Test::Unit::TestCase
def test_create_invalid
basic_authorization "test@openstreetmap.org", "test"
+ # use the first user's open changeset
+ open_changeset_id = changesets(:normal_user_first_change).id
+ closed_changeset_id = changesets(:normal_user_closed_change).id
+ nid1 = current_nodes(:used_node_1).id
+
# create a way with non-existing node
- content ""
+ content "" +
+ ""
put :create
# expect failure
assert_response :precondition_failed,
"way upload with invalid node did not return 'precondition failed'"
# create a way with no nodes
- content ""
+ content "" +
+ ""
put :create
# expect failure
assert_response :precondition_failed,
"way upload with no node did not return 'precondition failed'"
+
+ # create a way inside a closed changeset
+ content "" +
+ ""
+ put :create
+ # expect failure
+ assert_response :precondition_failed,
+ "way upload to closed changeset did not return 'precondition failed'"
end
# -------------------------------------
@@ -111,7 +149,6 @@ class WayControllerTest < Test::Unit::TestCase
# -------------------------------------
def test_delete
-
# first try to delete way without auth
delete :delete, :id => current_ways(:visible_way).id
assert_response :unauthorized
@@ -119,11 +156,23 @@ class WayControllerTest < Test::Unit::TestCase
# now set auth
basic_authorization("test@openstreetmap.org", "test");
- # this should work
+ # this shouldn't work as with the 0.6 api we need pay load to delete
+ delete :delete, :id => current_ways(:visible_way).id
+ assert_response :bad_request
+
+ # Now try without having a changeset
+ content ""
+ delete :delete, :id => current_ways(:visible_way).id
+ assert_response :bad_request
+
+ # Now try and get a changeset
+ changeset_id = changesets(:normal_user_first_change).id
+ content current_ways(:visible_way).to_xml
delete :delete, :id => current_ways(:visible_way).id
assert_response :success
# this won't work since the way is already deleted
+ content current_ways(:invisible_way).to_xml
delete :delete, :id => current_ways(:invisible_way).id
assert_response :gone