Merge branch 'master' into HEAD

[rails.git] / test / controllers / api / old_nodes_controller_test.rb

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index cc7fae416247474926a6351bf92b58b035013b60..95a20923e58958d04455e785cc829cf48dda9eb2 100644 (file)
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -65,8 +65,8 @@ module Api
       # randomly move the node about
       3.times do
         # move the node somewhere else
-        xml_node["lat"] = precision(rand * 180 - 90).to_s
-        xml_node["lon"] = precision(rand * 360 - 180).to_s
+        xml_node["lat"] = precision((rand * 180) - 90).to_s
+        xml_node["lon"] = precision((rand * 360) - 180).to_s
         with_controller(NodesController.new) do
           put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
           assert_response :forbidden, "Should have rejected node update"
@@ -113,8 +113,8 @@ module Api
       # randomly move the node about
       3.times do
         # move the node somewhere else
-        xml_node["lat"] = precision(rand * 180 - 90).to_s
-        xml_node["lon"] = precision(rand * 360 - 180).to_s
+        xml_node["lat"] = precision((rand * 180) - 90).to_s
+        xml_node["lon"] = precision((rand * 360) - 180).to_s
         with_controller(NodesController.new) do
           put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
           assert_response :success
@@ -161,13 +161,6 @@ module Api
       check_not_found_id_version(24356, create(:node).version)
     end
 
-    def check_not_found_id_version(id, version)
-      get node_version_path(:id => id, :version => version)
-      assert_response :not_found
-    rescue ActionController::UrlGenerationError => e
-      assert_match(/No route matches/, e.to_s)
-    end
-
     ##
     # Test that getting the current version is identical to picking
     # that version with the version URI call.
@@ -194,6 +187,15 @@ module Api
       check_current_version(node_with_versions)
     end
 
+    # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+    def test_lat_lon_xml_format
+      old_node = create(:old_node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i)
+
+      get api_node_history_path(:id => old_node.node_id, :version => old_node.version)
+      assert_match(/lat="0.0000400"/, response.body)
+      assert_match(/lon="0.0000800"/, response.body)
+    end
+
     ##
     # test the redaction of an old version of a node, while not being
     # authorised.
@@ -419,6 +421,13 @@ module Api
       assert_nodes_are_equal current_node, old_node
     end
 
+    def check_not_found_id_version(id, version)
+      get node_version_path(:id => id, :version => version)
+      assert_response :not_found
+    rescue ActionController::UrlGenerationError => e
+      assert_match(/No route matches/, e.to_s)
+    end
+
     ##
     # returns a 16 character long string with some nasty characters in it.
     # this ought to stress-test the tag handling as well as the versioning.