Merge remote-tracking branch 'upstream/pull/5231'

[rails.git] / test / models / old_way_test.rb

diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb
index c8f4a4480b0a70f59f611f42da9bde6004976668..d28723c5b0e0725182fa8122422abfd00831204b 100644 (file)
--- a/test/models/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -101,38 +101,4 @@ class OldWayTest < ActiveSupport::TestCase
       assert_equal tag.v, tags[tag.k]
     end
   end
       assert_equal tag.v, tags[tag.k]
     end
   end

-
-  def test_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 [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 [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