From ae5c364e979d2fb812778c0682ae8060d2c589ff Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 21 Aug 2019 17:10:36 +0200 Subject: [PATCH] Move the format tests to test the output from the controller --- test/controllers/api/nodes_controller_test.rb | 9 +++++++++ test/models/node_test.rb | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb index 6d990a84c..26a51d63b 100644 --- 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 + # 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 diff --git a/test/models/node_test.rb b/test/models/node_test.rb index d6fa1cd8f..e8a572fd8 100644 --- 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 - # 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) -- 2.39.5