X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..34e3e51456774127d43408b7ab65c24f41373f62:/test/models/node_test.rb

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 7acc6168f..9a38dd947 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
-  
+
   def test_node_count
     assert_equal 18, Node.count
   end
@@ -10,41 +10,41 @@ class NodeTest < ActiveSupport::TestCase
   def test_node_too_far_north
     invalid_node_test(:node_too_far_north)
   end
-  
+
   def test_node_north_limit
     valid_node_test(:node_north_limit)
   end
-  
+
   def test_node_too_far_south
     invalid_node_test(:node_too_far_south)
   end
-  
+
   def test_node_south_limit
     valid_node_test(:node_south_limit)
   end
-  
+
   def test_node_too_far_west
     invalid_node_test(:node_too_far_west)
   end
-  
+
   def test_node_west_limit
     valid_node_test(:node_west_limit)
   end
-  
+
   def test_node_too_far_east
     invalid_node_test(:node_too_far_east)
   end
-  
+
   def test_node_east_limit
     valid_node_test(:node_east_limit)
   end
-  
+
   def test_totally_wrong
     invalid_node_test(:node_totally_wrong)
   end
-  
+
   # This helper method will check to make sure that a node is within the world, and
-  # has the the same lat, lon and timestamp than what was put into the db by 
+  # has the the same lat, lon and timestamp than what was put into the db by
   # the fixture
   def valid_node_test(nod)
     node = current_nodes(nod)
@@ -58,8 +58,8 @@ class NodeTest < ActiveSupport::TestCase
     #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
     assert node.valid?
   end
-  
-  # This helper method will check to make sure that a node is outwith the world, 
+
+  # This helper method will check to make sure that a node is outwith the world,
   # and has the same lat, lon and timesamp than what was put into the db by the
   # fixture
   def invalid_node_test(nod)
@@ -74,14 +74,14 @@ class NodeTest < ActiveSupport::TestCase
     #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
     assert_equal false, dbnode.valid?
   end
-  
+
   # Check that you can create a node and store it
   def test_create
     node_template = Node.new(
       :latitude => 12.3456,
       :longitude => 65.4321,
       :changeset_id => changesets(:normal_user_first_change).id,
-      :visible => 1, 
+      :visible => 1,
       :version => 1
     )
     assert node_template.create_with_history(users(:normal_user))
@@ -137,7 +137,7 @@ class NodeTest < ActiveSupport::TestCase
   end
 
   def test_delete
-    node_template = Node.find(current_nodes(:visible_node))
+    node_template = Node.find(current_nodes(:visible_node).id)
     assert_not_nil node_template
 
     assert_equal OldNode.where(:node_id => node_template.id).count, 1
@@ -163,7 +163,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal false, old_node.visible
     #assert_equal node_template.tags, old_node.tags
   end
-  
+
   def test_from_xml_no_id
     lat = 56.7
     lon = -2.3
@@ -180,7 +180,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /ID is required when updating./, message.message
   end
-  
+
   def test_from_xml_no_lat
     nolat = "<osm><node id='1' lon='23.3' changeset='2' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -192,7 +192,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /lat missing/, message_update.message
   end
-  
+
   def test_from_xml_no_lon
     nolon = "<osm><node id='1' lat='23.1' changeset='2' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -216,7 +216,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /Changeset id is missing/, message_update.message
   end
-  
+
   def test_from_xml_no_version
     no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"
     assert_nothing_raised(OSM::APIBadXMLError) {
@@ -227,19 +227,19 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /Version is required when updating/, message_update.message
   end
-  
+
   def test_from_xml_double_lat
     nocs = "<osm><node id='123' lon='23.23' lat='23.1' lat='12' changeset='23' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
       Node.from_xml(nocs, true)
-    } 
+    }
     assert_match /Fatal error: Attribute lat redefined at/, message_create.message
     message_update = assert_raise(OSM::APIBadXMLError) {
       Node.from_xml(nocs, false)
     }
     assert_match /Fatal error: Attribute lat redefined at/, message_update.message
   end
-  
+
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     id_list.each do |id|
@@ -253,7 +253,7 @@ class NodeTest < ActiveSupport::TestCase
       assert_match /ID of node cannot be zero when updating/, message_update.message
     end
   end
-  
+
   def test_from_xml_no_text
     no_text = ""
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -265,7 +265,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /Must specify a string with one or more characters/, message_update.message
   end
-  
+
   def test_from_xml_no_node
     no_node = "<osm></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -277,7 +277,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /XML doesn't contain an osm\/node element/, message_update.message
   end
-  
+
   def test_from_xml_no_k_v
     nokv = "<osm><node id='23' lat='12.3' lon='23.4' changeset='12' version='23'><tag /></node></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -289,7 +289,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /tag is missing key/, message_update.message
   end
-  
+
   def test_from_xml_no_v
     no_v = "<osm><node id='23' lat='23.43' lon='23.32' changeset='23' version='32'><tag k='key' /></node></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) {
@@ -301,7 +301,7 @@ class NodeTest < ActiveSupport::TestCase
     }
     assert_match /tag is missing value/, message_update.message
   end
-  
+
   def test_from_xml_duplicate_k
     dupk = "<osm><node id='23' lat='23.2' lon='23' changeset='34' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></node></osm>"
     message_create = assert_raise(OSM::APIDuplicateTagsError) {
@@ -318,7 +318,7 @@ class NodeTest < ActiveSupport::TestCase
     node = current_nodes(:node_with_versions)
     tags = Node.find(node.id).node_tags.order(:k)
     assert_equal 2, tags.count
-    assert_equal "testing", tags[0].k 
+    assert_equal "testing", tags[0].k
     assert_equal "added in node version 3", tags[0].v
     assert_equal "testing two", tags[1].k
     assert_equal "modified in node version 4", tags[1].v