Merge remote-tracking branch 'openstreetmap/pull/1349'

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

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 4fa18f9b842a0c756b7dc27a06faf70a5604a549..6c8b0f80b52eb60e1196b456417017981a9cac37 100644 (file)
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -29,7 +29,7 @@ class WayTest < ActiveSupport::TestCase
     way = Way.find(current_ways(:visible_way).id)
     assert way.valid?
     # it already has 1 node
     way = Way.find(current_ways(:visible_way).id)
     assert way.valid?
     # it already has 1 node

-    1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) do
+    1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do

       way.add_nd_num(current_nodes(:used_node_1).id)
       way.add_nd_num(current_nodes(:used_node_2).id)
     end
       way.add_nd_num(current_nodes(:used_node_1).id)
       way.add_nd_num(current_nodes(:used_node_2).id)
     end


@@ -142,7 +142,7 @@ class WayTest < ActiveSupport::TestCase
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0].node_id
     assert_equal 15, nodes[1].node_id
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0].node_id
     assert_equal 15, nodes[1].node_id

-    assert_equal 6, nodes[2].node_id
+    assert_equal 11, nodes[2].node_id

   end
 
   def test_nodes
   end
 
   def test_nodes


@@ -151,7 +151,7 @@ class WayTest < ActiveSupport::TestCase
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0].id
     assert_equal 15, nodes[1].id
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0].id
     assert_equal 15, nodes[1].id

-    assert_equal 6, nodes[2].id
+    assert_equal 11, nodes[2].id

   end
 
   def test_nds
   end
 
   def test_nds


@@ -160,7 +160,7 @@ class WayTest < ActiveSupport::TestCase
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0]
     assert_equal 15, nodes[1]
     assert_equal 3, nodes.count
     assert_equal 4, nodes[0]
     assert_equal 15, nodes[1]

-    assert_equal 6, nodes[2]
+    assert_equal 11, nodes[2]

   end
 
   def test_way_tags
   end
 
   def test_way_tags