X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae5c364e979d2fb812778c0682ae8060d2c589ff..b556b054d1ac66ba5f8deebe27c60d14ea968b6d:/test/controllers/api/nodes_controller_test.rb

diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index 26a51d63b..e2174a126 100644
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -13,6 +13,10 @@ module Api
         { :path => "/api/0.6/node/1", :method => :get },
         { :controller => "api/nodes", :action => "show", :id => "1" }
       )
+      assert_routing(
+        { :path => "/api/0.6/node/1.json", :method => :get },
+        { :controller => "api/nodes", :action => "show", :id => "1", :format => "json" }
+      )
       assert_routing(
         { :path => "/api/0.6/node/1", :method => :put },
         { :controller => "api/nodes", :action => "update", :id => "1" }
@@ -25,6 +29,10 @@ module Api
         { :path => "/api/0.6/nodes", :method => :get },
         { :controller => "api/nodes", :action => "index" }
       )
+      assert_routing(
+        { :path => "/api/0.6/nodes.json", :method => :get },
+        { :controller => "api/nodes", :action => "index", :format => "json" }
+      )
     end
 
     def test_create
@@ -173,22 +181,22 @@ module Api
       basic_authorization private_user.email, "test"
 
       # try to delete with an invalid (closed) changeset
-      xml = update_changeset(private_node.to_xml, private_user_closed_changeset.id)
+      xml = update_changeset(xml_for_node(private_node), private_user_closed_changeset.id)
       delete :delete, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data("non-public user shouldn't be able to delete node")
 
       # try to delete with an invalid (non-existent) changeset
-      xml = update_changeset(private_node.to_xml, 0)
+      xml = update_changeset(xml_for_node(private_node), 0)
       delete :delete, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data("shouldn't be able to delete node, when user's data is private")
 
       # valid delete now takes a payload
-      xml = private_node.to_xml
+      xml = xml_for_node(private_node)
       delete :delete, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data("shouldn't be able to delete node when user's data isn't public'")
 
       # this won't work since the node is already deleted
-      xml = private_deleted_node.to_xml
+      xml = xml_for_node(private_deleted_node)
       delete :delete, :params => { :id => private_deleted_node.id }, :body => xml.to_s
       assert_require_public_data
 
@@ -201,7 +209,7 @@ module Api
       private_used_node = create(:node, :changeset => private_user_changeset)
       create(:way_node, :node => private_used_node)
 
-      xml = private_used_node.to_xml
+      xml = xml_for_node(private_used_node)
       delete :delete, :params => { :id => private_used_node.id }, :body => xml.to_s
       assert_require_public_data "shouldn't be able to delete a node used in a way (#{@response.body})"
 
@@ -209,7 +217,7 @@ module Api
       private_used_node2 = create(:node, :changeset => private_user_changeset)
       create(:relation_member, :member => private_used_node2)
 
-      xml = private_used_node2.to_xml
+      xml = xml_for_node(private_used_node2)
       delete :delete, :params => { :id => private_used_node2.id }, :body => xml.to_s
       assert_require_public_data "shouldn't be able to delete a node used in a relation (#{@response.body})"
 
@@ -221,18 +229,18 @@ module Api
       basic_authorization user.email, "test"
 
       # try to delete with an invalid (closed) changeset
-      xml = update_changeset(node.to_xml, closed_changeset.id)
+      xml = update_changeset(xml_for_node(node), closed_changeset.id)
       delete :delete, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict
 
       # try to delete with an invalid (non-existent) changeset
-      xml = update_changeset(node.to_xml, 0)
+      xml = update_changeset(xml_for_node(node), 0)
       delete :delete, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict
 
       # try to delete a node with a different ID
       other_node = create(:node)
-      xml = other_node.to_xml
+      xml = xml_for_node(other_node)
       delete :delete, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request,
                       "should not be able to delete a node with a different ID from the XML"
@@ -244,7 +252,7 @@ module Api
                       "should not be able to delete a node without a valid XML payload"
 
       # valid delete now takes a payload
-      xml = node.to_xml
+      xml = xml_for_node(node)
       delete :delete, :params => { :id => node.id }, :body => xml.to_s
       assert_response :success
 
@@ -254,7 +262,7 @@ module Api
              "delete request should return a new version number for node"
 
       # deleting the same node twice doesn't work
-      xml = node.to_xml
+      xml = xml_for_node(node)
       delete :delete, :params => { :id => node.id }, :body => xml.to_s
       assert_response :gone
 
@@ -268,7 +276,7 @@ module Api
       way_node = create(:way_node, :node => used_node)
       way_node2 = create(:way_node, :node => used_node)
 
-      xml = used_node.to_xml
+      xml = xml_for_node(used_node)
       delete :delete, :params => { :id => used_node.id }, :body => xml.to_s
       assert_response :precondition_failed,
                       "shouldn't be able to delete a node used in a way (#{@response.body})"
@@ -279,7 +287,7 @@ module Api
       relation_member = create(:relation_member, :member => used_node2)
       relation_member2 = create(:relation_member, :member => used_node2)
 
-      xml = used_node2.to_xml
+      xml = xml_for_node(used_node2)
       delete :delete, :params => { :id => used_node2.id }, :body => xml.to_s
       assert_response :precondition_failed,
                       "shouldn't be able to delete a node used in a relation (#{@response.body})"
@@ -298,7 +306,7 @@ module Api
       user = create(:user)
       node = create(:node, :changeset => create(:changeset, :user => user))
 
-      xml = node.to_xml
+      xml = xml_for_node(node)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :unauthorized
 
@@ -310,41 +318,41 @@ module Api
       ## trying to break changesets
 
       # try and update in someone else's changeset
-      xml = update_changeset(private_node.to_xml,
+      xml = update_changeset(xml_for_node(private_node),
                              create(:changeset).id)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "update with other user's changeset should be forbidden when data isn't public"
 
       # try and update in a closed changeset
-      xml = update_changeset(private_node.to_xml,
+      xml = update_changeset(xml_for_node(private_node),
                              create(:changeset, :closed, :user => private_user).id)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
 
       # try and update in a non-existant changeset
-      xml = update_changeset(private_node.to_xml, 0)
+      xml = update_changeset(xml_for_node(private_node), 0)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "update with changeset=0 should be forbidden, when data isn't public"
 
       ## try and submit invalid updates
-      xml = xml_attr_rewrite(private_node.to_xml, "lat", 91.0)
+      xml = xml_attr_rewrite(xml_for_node(private_node), "lat", 91.0)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "node at lat=91 should be forbidden, when data isn't public"
 
-      xml = xml_attr_rewrite(private_node.to_xml, "lat", -91.0)
+      xml = xml_attr_rewrite(xml_for_node(private_node), "lat", -91.0)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "node at lat=-91 should be forbidden, when data isn't public"
 
-      xml = xml_attr_rewrite(private_node.to_xml, "lon", 181.0)
+      xml = xml_attr_rewrite(xml_for_node(private_node), "lon", 181.0)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "node at lon=181 should be forbidden, when data isn't public"
 
-      xml = xml_attr_rewrite(private_node.to_xml, "lon", -181.0)
+      xml = xml_attr_rewrite(xml_for_node(private_node), "lon", -181.0)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "node at lon=-181 should be forbidden, when data isn't public"
 
       ## finally, produce a good request which still won't work
-      xml = private_node.to_xml
+      xml = xml_for_node(private_node)
       put :update, :params => { :id => private_node.id }, :body => xml.to_s
       assert_require_public_data "should have failed with a forbidden when data isn't public"
 
@@ -352,7 +360,7 @@ module Api
 
       # try and update a node without authorisation
       # first try to update node without auth
-      xml = node.to_xml
+      xml = xml_for_node(node)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :forbidden
 
@@ -362,36 +370,36 @@ module Api
       ## trying to break changesets
 
       # try and update in someone else's changeset
-      xml = update_changeset(node.to_xml,
+      xml = update_changeset(xml_for_node(node),
                              create(:changeset).id)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict, "update with other user's changeset should be rejected"
 
       # try and update in a closed changeset
-      xml = update_changeset(node.to_xml,
+      xml = update_changeset(xml_for_node(node),
                              create(:changeset, :closed, :user => user).id)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict, "update with closed changeset should be rejected"
 
       # try and update in a non-existant changeset
-      xml = update_changeset(node.to_xml, 0)
+      xml = update_changeset(xml_for_node(node), 0)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict, "update with changeset=0 should be rejected"
 
       ## try and submit invalid updates
-      xml = xml_attr_rewrite(node.to_xml, "lat", 91.0)
+      xml = xml_attr_rewrite(xml_for_node(node), "lat", 91.0)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request, "node at lat=91 should be rejected"
 
-      xml = xml_attr_rewrite(node.to_xml, "lat", -91.0)
+      xml = xml_attr_rewrite(xml_for_node(node), "lat", -91.0)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request, "node at lat=-91 should be rejected"
 
-      xml = xml_attr_rewrite(node.to_xml, "lon", 181.0)
+      xml = xml_attr_rewrite(xml_for_node(node), "lon", 181.0)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request, "node at lon=181 should be rejected"
 
-      xml = xml_attr_rewrite(node.to_xml, "lon", -181.0)
+      xml = xml_attr_rewrite(xml_for_node(node), "lon", -181.0)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request, "node at lon=-181 should be rejected"
 
@@ -399,26 +407,26 @@ module Api
       current_node_version = node.version
 
       # try and submit a version behind
-      xml = xml_attr_rewrite(node.to_xml,
+      xml = xml_attr_rewrite(xml_for_node(node),
                              "version", current_node_version - 1)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict, "should have failed on old version number"
 
       # try and submit a version ahead
-      xml = xml_attr_rewrite(node.to_xml,
+      xml = xml_attr_rewrite(xml_for_node(node),
                              "version", current_node_version + 1)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict, "should have failed on skipped version number"
 
       # try and submit total crap in the version field
-      xml = xml_attr_rewrite(node.to_xml,
+      xml = xml_attr_rewrite(xml_for_node(node),
                              "version", "p1r4t3s!")
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :conflict,
                       "should not be able to put 'p1r4at3s!' in the version field"
 
       ## try an update with the wrong ID
-      xml = create(:node).to_xml
+      xml = xml_for_node(create(:node))
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :bad_request,
                       "should not be able to update a node with a different ID from the XML"
@@ -430,7 +438,7 @@ module Api
                       "should not be able to update a node with non-OSM XML doc."
 
       ## finally, produce a good request which should work
-      xml = node.to_xml
+      xml = xml_for_node(node)
       put :update, :params => { :id => node.id }, :body => xml.to_s
       assert_response :success, "a valid update request failed"
     end
@@ -464,6 +472,19 @@ module Api
         assert_select "node[id='#{node5.id}'][visible='false']", :count => 1
       end
 
+      # test a working call with json format
+      get :index, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id}", :format => "json" }
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal 5, js["elements"].count
+      assert_equal 5, (js["elements"].count { |a| a["type"] == "node" })
+      assert_equal 1, (js["elements"].count { |a| a["id"] == node1.id && a["visible"].nil? })
+      assert_equal 1, (js["elements"].count { |a| a["id"] == node2.id && a["visible"] == false })
+      assert_equal 1, (js["elements"].count { |a| a["id"] == node3.id && a["visible"].nil? })
+      assert_equal 1, (js["elements"].count { |a| a["id"] == node4.id && a["visible"].nil? })
+      assert_equal 1, (js["elements"].count { |a| a["id"] == node5.id && a["visible"] == false })
+
       # check error when a non-existent node is included
       get :index, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},0" }
       assert_response :not_found
@@ -483,7 +504,7 @@ module Api
       tag_xml["v"] = existing_tag.v
 
       # add the tag into the existing xml
-      node_xml = existing_tag.node.to_xml
+      node_xml = xml_for_node(existing_tag.node)
       node_xml.find("//osm/node").first << tag_xml
 
       # try and upload it