Qualify SCALE in tests

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index f6f5be2966cd3d0f84f3846a08b9de1204b2e565..9ad968ae91fd0abe9164c191b18f5382c660f729 100644 (file)
--- 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)
   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
     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)
   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
     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 2ccf6d18c5dc6939c5de62a4dd203756aea3ea10..cdc31f4f1013018def53ce19bf928122799bbf06 100644 (file)
--- 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)
   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
     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)
   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
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible