From a5b296a298dd1aab608842687b5520fb33acd105 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 25 Apr 2014 18:40:57 +0100 Subject: [PATCH 1/1] Qualify SCALE in tests --- test/models/node_test.rb | 8 ++++---- test/models/old_node_test.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/models/node_test.rb b/test/models/node_test.rb index f6f5be296..9ad968ae9 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -49,8 +49,8 @@ class NodeTest < ActiveSupport::TestCase def valid_node_test(nod) node = current_nodes(nod) dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f/SCALE - assert_equal dbnode.lon, node.longitude.to_f/SCALE + assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE + assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE assert_equal dbnode.changeset_id, node.changeset_id assert_equal dbnode.timestamp, node.timestamp assert_equal dbnode.version, node.version @@ -65,8 +65,8 @@ class NodeTest < ActiveSupport::TestCase def invalid_node_test(nod) node = current_nodes(nod) dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f/SCALE - assert_equal dbnode.lon, node.longitude.to_f/SCALE + assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE + assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE assert_equal dbnode.changeset_id, node.changeset_id assert_equal dbnode.timestamp, node.timestamp assert_equal dbnode.version, node.version diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb index 2ccf6d18c..cdc31f4f1 100644 --- a/test/models/old_node_test.rb +++ b/test/models/old_node_test.rb @@ -49,8 +49,8 @@ class OldNodeTest < ActiveSupport::TestCase def valid_node_test(nod) node = nodes(nod) dbnode = Node.find(node.node_id) - assert_equal dbnode.lat, node.latitude.to_f/SCALE - assert_equal dbnode.lon, node.longitude.to_f/SCALE + assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE + assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE assert_equal dbnode.changeset_id, node.changeset_id assert_equal dbnode.version, node.version assert_equal dbnode.visible, node.visible @@ -65,8 +65,8 @@ class OldNodeTest < ActiveSupport::TestCase def invalid_node_test(nod) node = nodes(nod) dbnode = Node.find(node.node_id) - assert_equal dbnode.lat, node.latitude.to_f/SCALE - assert_equal dbnode.lon, node.longitude.to_f/SCALE + assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE + assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE assert_equal dbnode.changeset_id, node.changeset_id assert_equal dbnode.version, node.version assert_equal dbnode.visible, node.visible -- 2.43.2