From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 15 Sep 2021 15:55:00 +0000 (+0100)
Subject: Move the xml format test for old nodes to the controller test
X-Git-Tag: live~1934^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d07ce4692957c0afc7330d56f883bcd27eea30cc?hp=76f1d7bc783228894652f24f0619e8a48d0b3271

Move the xml format test for old nodes to the controller test

This allows us to remove the model method
---

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index e85bc86f8..8fc19145c 100644
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -187,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.
diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index eade6130a..cc0e0d8c2 100644
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -68,14 +68,6 @@ class OldNodeTest < ActiveSupport::TestCase
     assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001
   end
 
-  # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
-  def test_lat_lon_xml_format
-    old_node = build(:old_node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE)
-
-    assert_match(/lat="0.0000400"/, old_node.to_xml.to_s)
-    assert_match(/lon="0.0000800"/, old_node.to_xml.to_s)
-  end
-
   def test_node_tags
     node_v1 = create(:old_node, :version => 1)
     node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2)