Use user factory for note_helper tests.

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

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index fb0a02f577b3180fe1d97bde9ca81daffdfbe0e0..807b71d5bf63d200b151ec7f80e0a6a9eda37751 100644 (file)
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class WayTest < ActiveSupport::TestCase
   api_fixtures
@@ -15,10 +15,10 @@ class WayTest < ActiveSupport::TestCase
      :invisible_way,
      :used_way].each do |way_symbol|
       way = current_ways(way_symbol)
-      assert_equal node.bbox.min_lon, way.bbox.min_lon, 'min_lon'
-      assert_equal node.bbox.min_lat, way.bbox.min_lat, 'min_lat'
-      assert_equal node.bbox.max_lon, way.bbox.max_lon, 'max_lon'
-      assert_equal node.bbox.max_lat, way.bbox.max_lat, 'max_lat'
+      assert_equal node.bbox.min_lon, way.bbox.min_lon, "min_lon"
+      assert_equal node.bbox.min_lat, way.bbox.min_lat, "min_lat"
+      assert_equal node.bbox.max_lon, way.bbox.max_lon, "max_lon"
+      assert_equal node.bbox.max_lat, way.bbox.max_lat, "max_lat"
     end
   end
 
@@ -29,7 +29,7 @@ class WayTest < ActiveSupport::TestCase
     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
@@ -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 6, nodes[2].node_id
+    assert_equal 11, nodes[2].node_id
   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 6, nodes[2].id
+    assert_equal 11, nodes[2].id
   end
 
   def test_nds
@@ -160,25 +160,28 @@ class WayTest < ActiveSupport::TestCase
     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
     way = current_ways(:way_with_versions)
+    taglist = create_list(:way_tag, 2, :way => way)
     tags = Way.find(way.id).way_tags.order(:k)
-    assert_equal 2, tags.count
-    assert_equal "testing", tags[0].k
-    assert_equal "added in way version 3", tags[0].v
-    assert_equal "testing two", tags[1].k
-    assert_equal "modified in way version 4", tags[1].v
+    assert_equal taglist.count, tags.count
+    taglist.sort_by!(&:k).each_index do |i|
+      assert_equal taglist[i].k, tags[i].k
+      assert_equal taglist[i].v, tags[i].v
+    end
   end
 
   def test_tags
     way = current_ways(:way_with_versions)
+    taglist = create_list(:way_tag, 2, :way => way)
     tags = Way.find(way.id).tags
-    assert_equal 2, tags.size
-    assert_equal "added in way version 3", tags["testing"]
-    assert_equal "modified in way version 4", tags["testing two"]
+    assert_equal taglist.count, tags.count
+    taglist.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end
   end
 
   def test_containing_relation_members