Fixed up way controller tests for API 0.6.

[rails.git] / test / functional / way_controller_test.rb

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 933dfb542edc9be778923735378a9052439b0de0..fbc05086f8e115ac0230059f2b31ac1f41313a2f 100644 (file)
--- 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)
   end
 
   def content(c)

-    @request.env["RAW_POST_DATA"] = c
+    @request.env["RAW_POST_DATA"] = c.to_s

   end
 
   # -------------------------------------
   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!
     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!
 
     # 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
 
   # -------------------------------------
   end
 
   # -------------------------------------


@@ -60,8 +76,13 @@ class WayControllerTest < Test::Unit::TestCase
     nid2 = current_nodes(:used_node_2).id
     basic_authorization "test@openstreetmap.org", "test"
 
     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
     # create a way with pre-existing nodes

-    content "<osm><way><nd ref='#{nid1}'/><nd ref='#{nid2}'/><tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{changeset_id}'>" +
+      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" + 
+      "<tag k='test' v='yes' /></way></osm>"

     put :create
     # hope for success
     assert_response :success, 
     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"
         "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"
         "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"
 
   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
     # create a way with non-existing node

-    content "<osm><way><nd ref='0'/><tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{open_changeset_id}'>" + 
+      "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"

     put :create
     # expect failure
     assert_response :precondition_failed, 
         "way upload with invalid node did not return 'precondition failed'"
 
     # create a way with no nodes
     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 "<osm><way><tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{open_changeset_id}'>" +
+      "<tag k='test' v='yes' /></way></osm>"

     put :create
     # expect failure
     assert_response :precondition_failed, 
         "way upload with no node did not return 'precondition failed'"
     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 "<osm><way changeset='#{closed_changeset_id}'>" +
+      "<nd ref='#{nid1}'/></way></osm>"
+    put :create
+    # expect failure
+    assert_response :precondition_failed, 
+        "way upload to closed changeset did not return 'precondition failed'"    

   end
 
   # -------------------------------------
   end
 
   # -------------------------------------


@@ -111,7 +149,6 @@ class WayControllerTest < Test::Unit::TestCase
   # -------------------------------------
   
   def test_delete
   # -------------------------------------
   
   def test_delete

-

     # first try to delete way without auth
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :unauthorized
     # 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");  
 
     # 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 "<osm><way id='#{current_ways(:visible_way).id}'></osm>"
+    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
     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
 
     delete :delete, :id => current_ways(:invisible_way).id
     assert_response :gone