Add tags to features before propogating them.

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

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 807079f0988296fe21581d9460ce3489d61cf7fa..654076eecb0ebcd09c0792eb399b8a04e1d22c53 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


@@ -165,20 +165,23 @@ class WayTest < ActiveSupport::TestCase
 
   def test_way_tags
     way = current_ways(:way_with_versions)
 
   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
     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
+    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)
   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
     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"]
+    taglist.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end

   end
 
   def test_containing_relation_members
   end
 
   def test_containing_relation_members