X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ffbc4d5cb278c1afeafea5cfe904ec48d9f4d237..ad368d189f4842f18e81fd272c677e5d820a2da4:/test/unit/node_tag_test.rb

diff --git a/test/unit/node_tag_test.rb b/test/unit/node_tag_test.rb
index 2ff9f9f00..2f2631792 100644
--- a/test/unit/node_tag_test.rb
+++ b/test/unit/node_tag_test.rb
@@ -1,12 +1,10 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class NodeTagTest < Test::Unit::TestCase
-  fixtures :current_node_tags, :current_nodes
-  set_fixture_class :current_nodes => Node
-  set_fixture_class :current_node_tags => NodeTag
+class NodeTagTest < ActiveSupport::TestCase
+  api_fixtures
   
   def test_tag_count
-    assert_equal 6, NodeTag.count
+    assert_equal 7, NodeTag.count
     node_tag_count(:visible_node, 1)
     node_tag_count(:invisible_node, 1)
     node_tag_count(:used_node_1, 1)
@@ -23,10 +21,10 @@ class NodeTagTest < Test::Unit::TestCase
     key = "k"
     (0..255).each do |i|
       tag = NodeTag.new
-      tag.id = current_node_tags(:t1).id
+      tag.node_id = current_node_tags(:t1).node_id
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -34,44 +32,44 @@ class NodeTagTest < Test::Unit::TestCase
     val = "v"
     (0..255).each do |i|
       tag = NodeTag.new
-      tag.id = current_node_tags(:t1).id
+      tag.node_id = current_node_tags(:t1).node_id
       tag.k = "k"
       tag.v = val*i
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
   def test_length_key_invalid
     ["k"*256].each do |i|
       tag = NodeTag.new
-      tag.id = current_node_tags(:t1).id
+      tag.node_id = current_node_tags(:t1).node_id
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
   def test_length_value_invalid
     ["k"*256].each do |i|
       tag = NodeTag.new
-      tag.id = current_node_tags(:t1).id
+      tag.node_id = current_node_tags(:t1).node_id
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_node_tag_invalid
     tag = NodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:node].any?
   end
   
   def test_uniqueness
     tag = NodeTag.new
-    tag.id = current_node_tags(:t1).id
+    tag.node_id = current_node_tags(:t1).node_id
     tag.k = current_node_tags(:t1).k
     tag.v = current_node_tags(:t1).v
     assert tag.new_record?