Move the format tests to test the output from the controller

diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index 6d990a84c6b25a5954983242381966acf8854e00..26a51d63b16f37f9674b4ed3dc6b6dae2b85141f 100644 (file)
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -147,6 +147,15 @@ module Api
       assert_response :not_found
     end
 
       assert_response :not_found
     end
 

+    # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+    def test_lat_lon_xml_format
+      node = create(:node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i)
+
+      get :show, :params => { :id => node.id }
+      assert_match(/lat="0.0000400"/, response.body)
+      assert_match(/lon="0.0000800"/, response.body)
+    end
+

     # this tests deletion restrictions - basic deletion is tested in the unit
     # tests for node!
     def test_delete
     # this tests deletion restrictions - basic deletion is tested in the unit
     # tests for node!
     def test_delete

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index d6fa1cd8f32d35d4fca07636a9373dffadc8897b..e8a572fd8fd4f64da2fa31bdad3d431fa6101b68 100644 (file)
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -68,14 +68,6 @@ class NodeTest < ActiveSupport::TestCase
     assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001
   end
 
     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
-    node = build(:node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE)
-
-    assert_match(/lat="0.0000400"/, node.to_xml.to_s)
-    assert_match(/lon="0.0000800"/, node.to_xml.to_s)
-  end
-

   # Check that you can create a node and store it
   def test_create
     changeset = create(:changeset)
   # Check that you can create a node and store it
   def test_create
     changeset = create(:changeset)