From c866d28fd496dfbe8173df1d4fed8f965af5bd56 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 5 Dec 2013 17:49:06 +0000 Subject: [PATCH 1/1] Test get_nodes_undelete methods of the OldWay model --- app/models/old_way.rb | 6 ++---- test/unit/old_way_test.rb | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/models/old_way.rb b/app/models/old_way.rb index e5ba53852..1552bae04 100644 --- 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 909f9de1e..44975d153 100644 --- 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 -- 2.43.2