Test get_nodes_undelete methods of the OldWay model

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index e5ba53852d76ee4fee03d83c08e6af50d2fa72d8..1552bae0497a10f0b8c5d896ff11d83251bdbf7a 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -105,12 +105,10 @@ class OldWay < ActiveRecord::Base
   # (i.e. is it visible? are we actually reverting to an earlier version?)
 
   def get_nodes_undelete
-    points = []
-    self.nds.each do |n|
+    self.nds.collect do |n|
       node = Node.find(n)
-      points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
+      [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
     end
-    points
   end
   
   def get_nodes_revert(timestamp)

diff --git a/test/unit/old_way_test.rb b/test/unit/old_way_test.rb
index 909f9de1ed960d13009d89efa5a458a28a529327..44975d1534063d4c08b37dc1b65dfa0c8595ae22 100644 (file)
--- a/test/unit/old_way_test.rb
+++ b/test/unit/old_way_test.rb
@@ -87,4 +87,18 @@ class OldWayTest < ActiveSupport::TestCase
     assert_equal "added in way version 3", tags["testing"]
     assert_equal "modified in way version 4", tags["testing two"]
   end
+
+  def test_get_nodes_undelete
+    way = ways(:way_with_versions_v3)
+    nodes = OldWay.find(way.id).get_nodes_undelete
+    assert_equal 2, nodes.size
+    assert_equal [1.0, 1.0, 15, 4, {"testing" => "added in node version 3", "testing two" => "modified in node version 4"}, true], nodes[0]
+    assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[1]
+
+    way = ways(:way_with_redacted_versions_v2)
+    nodes = OldWay.find(way.id).get_nodes_undelete
+    assert_equal 2, nodes.size
+    assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[0]
+    assert_equal [2.0, 2.0, 2, 1, {"testused" => "yes"}, false], nodes[1]
+  end
 end