cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This allows us to remove the model method
This commit is contained in:
Andy Allan 2021-09-15 16:55:00 +01:00
parent 76f1d7bc78
commit d07ce46929
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/controllers/api/old_nodes_controller_test.rb
View file

@ -187,6 +187,15 @@ module Api
check_current_version(node_with_versions) check_current_version(node_with_versions)
end 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 # test the redaction of an old version of a node, while not being
# authorised. # authorised.

8
test/models/old_node_test.rb
View file

@ -68,14 +68,6 @@ class OldNodeTest < ActiveSupport::TestCase
assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001 assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001
end 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 def test_node_tags
node_v1 = create(:old_node, :version => 1) node_v1 = create(:old_node, :version => 1)
node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2) node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2)