X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f3e23f6eb2bd571a39486773f0f10d65a2398a1..ac48c6a16f97ae20c0bbf33eb05d0c76efeff9b2:/test/unit/old_node_tag_test.rb

diff --git a/test/unit/old_node_tag_test.rb b/test/unit/old_node_tag_test.rb
index 9acf32bf7..064b5f198 100644
--- a/test/unit/old_node_tag_test.rb
+++ b/test/unit/old_node_tag_test.rb
@@ -11,7 +11,7 @@ class OldNodeTest < ActiveSupport::TestCase
     key = "k"
     (0..255).each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       tag.k = key*i
       tag.v = "v"
@@ -23,7 +23,7 @@ class OldNodeTest < ActiveSupport::TestCase
     val = "v"
     (0..255).each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       tag.k = "k"
       tag.v = val*i
@@ -34,37 +34,36 @@ class OldNodeTest < ActiveSupport::TestCase
   def test_length_key_invalid
     ["k"*256].each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       tag.k = i
       tag.v = "v", "Key should be too long"
       assert !tag.valid?
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
   def test_length_value_invalid
     ["k"*256].each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       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_old_node_tag_invalid
+  def test_empty_tag_invalid
     tag = OldNodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
-    assert tag.errors.invalid?(:version)
+    assert tag.errors[:old_node].any?
   end
   
   def test_uniqueness
     tag = OldNodeTag.new
-    tag.id = node_tags(:t1).id
+    tag.node_id = node_tags(:t1).node_id
     tag.version = node_tags(:t1).version
     tag.k = node_tags(:t1).k
     tag.v = node_tags(:t1).v