Update to iD v1.3.6

[rails.git] / test / unit / way_tag_test.rb

diff --git a/test/unit/way_tag_test.rb b/test/unit/way_tag_test.rb
index 5ce08815924728f0779ced24be9397d6b8c7c70d..9766e9c773acb9a777fd693a78f45be29ca0e114 100644 (file)
--- a/test/unit/way_tag_test.rb
+++ b/test/unit/way_tag_test.rb
@@ -4,14 +4,14 @@ class WayTagTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_way_tag_count
-    assert_equal 3, WayTag.count
+    assert_equal 5, WayTag.count
   end
   
   def test_length_key_valid
     key = "k"
     (0..255).each do |i|
       tag = WayTag.new
-      tag.id = current_way_tags(:t1).id
+      tag.way_id = current_way_tags(:t1).way_id
       tag.k = key*i
       tag.v = current_way_tags(:t1).v
       assert tag.valid?
@@ -22,7 +22,7 @@ class WayTagTest < ActiveSupport::TestCase
     val = "v"
     (0..255).each do |i|
       tag = WayTag.new
-      tag.id = current_way_tags(:t1).id
+      tag.way_id = current_way_tags(:t1).way_id
       tag.k = "k"
       tag.v = val*i
       assert tag.valid?
@@ -32,7 +32,7 @@ class WayTagTest < ActiveSupport::TestCase
   def test_length_key_invalid
     ["k"*256].each do |i|
       tag = WayTag.new
-      tag.id = current_way_tags(:t1).id
+      tag.way_id = current_way_tags(:t1).way_id
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key #{i} should be too long"
@@ -43,7 +43,7 @@ class WayTagTest < ActiveSupport::TestCase
   def test_length_value_invalid
     ["v"*256].each do |i|
       tag = WayTag.new
-      tag.id = current_way_tags(:t1).id
+      tag.way_id = current_way_tags(:t1).way_id
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value #{i} should be too long"
@@ -54,12 +54,12 @@ class WayTagTest < ActiveSupport::TestCase
   def test_empty_tag_invalid
     tag = WayTag.new
     assert !tag.valid?, "Empty way tag should be invalid"
-    assert tag.errors[:id].any?
+    assert tag.errors[:way].any?
   end
   
   def test_uniqueness
     tag = WayTag.new
-    tag.id = current_way_tags(:t1).id
+    tag.way_id = current_way_tags(:t1).way_id
     tag.k = current_way_tags(:t1).k
     tag.v = current_way_tags(:t1).v
     assert tag.new_record?