Refactor get_nodes_undelete test to use factories instead of fixtures.

diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb
index a1f47b13a00841e4c672be47d0e005526c22cfd4..16b5d336336e2e1d5d108b1de24cc00e7d04403f 100644 (file)
--- a/test/models/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -105,19 +105,36 @@ class OldWayTest < ActiveSupport::TestCase
   end
 
   def test_get_nodes_undelete
   end
 
   def test_get_nodes_undelete

-    way = ways(:way_with_versions_v3)
-    node_tag = create(:node_tag, :node => current_nodes(:node_with_versions))
-    node_tag2 = create(:node_tag, :node => current_nodes(:used_node_1))
-    nodes = OldWay.find(way.id).get_nodes_undelete
+    way = create(:way, :with_history, :version => 4)
+    way_v3 = way.old_ways.find_by(:version => 3)
+    way_v4 = way.old_ways.find_by(:version => 4)
+    node_a = create(:node, :with_history, :version => 4)
+    node_b = create(:node, :with_history, :version => 3)
+    node_c = create(:node, :with_history, :version => 2)
+    node_d = create(:node, :with_history, :deleted, :version => 1)
+    create(:old_way_node, :old_way => way_v3, :node => node_a, :sequence_id => 1)
+    create(:old_way_node, :old_way => way_v3, :node => node_b, :sequence_id => 2)
+    create(:old_way_node, :old_way => way_v4, :node => node_c, :sequence_id => 1)
+    node_tag = create(:node_tag, :node => node_a)
+    node_tag2 = create(:node_tag, :node => node_b)
+    node_tag3 = create(:node_tag, :node => node_d)
+
+    nodes = OldWay.find(way_v3.id).get_nodes_undelete

     assert_equal 2, nodes.size
     assert_equal 2, nodes.size

-    assert_equal [1.0, 1.0, 15, 4, { node_tag.k => node_tag.v }, true], nodes[0]
-    assert_equal [3.0, 3.0, 3, 1, { node_tag2.k => node_tag2.v }, true], nodes[1]
-
-    way = ways(:way_with_redacted_versions_v2)
-    node_tag3 = create(:node_tag, :node => current_nodes(:invisible_node))
-    nodes = OldWay.find(way.id).get_nodes_undelete
+    assert_equal [node_a.lon, node_a.lat, node_a.id, node_a.version, { node_tag.k => node_tag.v }, true], nodes[0]
+    assert_equal [node_b.lon, node_b.lat, node_b.id, node_b.version, { node_tag2.k => node_tag2.v }, true], nodes[1]
+
+    redacted_way = create(:way, :with_history, :version => 3)
+    redacted_way_v2 = redacted_way.old_ways.find_by(:version => 2)
+    redacted_way_v3 = redacted_way.old_ways.find_by(:version => 3)
+    create(:old_way_node, :old_way => redacted_way_v2, :node => node_b, :sequence_id => 1)
+    create(:old_way_node, :old_way => redacted_way_v2, :node => node_d, :sequence_id => 2)
+    create(:old_way_node, :old_way => redacted_way_v3, :node => node_c, :sequence_id => 1)
+    redacted_way_v2.redact!(create(:redaction))
+
+    nodes = OldWay.find(redacted_way_v2.id).get_nodes_undelete

     assert_equal 2, nodes.size
     assert_equal 2, nodes.size

-    assert_equal [3.0, 3.0, 3, 1, { node_tag2.k => node_tag2.v }, true], nodes[0]
-    assert_equal [2.0, 2.0, 2, 1, { node_tag3.k => node_tag3.v }, false], nodes[1]
+    assert_equal [node_b.lon, node_b.lat, node_b.id, node_b.version, { node_tag2.k => node_tag2.v }, true], nodes[0]
+    assert_equal [node_d.lon, node_d.lat, node_d.id, node_d.version, { node_tag3.k => node_tag3.v }, false], nodes[1]

   end
 end
   end
 end