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

[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 a1f47b13a00841e4c672be47d0e005526c22cfd4..d28723c5b0e0725182fa8122422abfd00831204b 100644 (file)
--- a/test/models/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class OldWayTest < ActiveSupport::TestCase
-  api_fixtures
-
   def test_old_nodes
     old_way_v1 = create(:old_way, :version => 1)
     old_way_v2 = create(:old_way, :current_way => old_way_v1.current_way, :version => 2)
@@ -103,21 +101,4 @@ class OldWayTest < ActiveSupport::TestCase
       assert_equal tag.v, tags[tag.k]
     end
   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
-    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 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]
-  end
 end