X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0bbdadd727a37ee71d4a8c89b50ce2060d6a6240..5c2cb9e96fdc00c7efd72ba4186308127e45855c:/test/models/relation_tag_test.rb

diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb
index 02d6d95c7..69a491890 100644
--- a/test/models/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -5,7 +5,7 @@ class RelationTagTest < ActiveSupport::TestCase
     tag = create(:relation_tag)
     [0, 255].each do |i|
       tag.k = "k" * i
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
@@ -13,7 +13,7 @@ class RelationTagTest < ActiveSupport::TestCase
     tag = create(:relation_tag)
     [0, 255].each do |i|
       tag.v = "v" * i
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
@@ -21,32 +21,30 @@ class RelationTagTest < ActiveSupport::TestCase
     tag = create(:relation_tag)
     tag.k = "k" * 256
     assert_not tag.valid?, "Key should be too long"
-    assert tag.errors[:k].any?
+    assert_predicate tag.errors[:k], :any?
   end
 
   def test_length_value_invalid
     tag = create(:relation_tag)
     tag.v = "v" * 256
     assert_not tag.valid?, "Value should be too long"
-    assert tag.errors[:v].any?
+    assert_predicate tag.errors[:v], :any?
   end
 
-  def test_empty_tag_invalid
-    tag = RelationTag.new
-    assert_not tag.valid?, "Empty relation tag should be invalid"
-    assert tag.errors[:relation].any?
+  def test_orphaned_tag_invalid
+    tag = create(:relation_tag)
+    tag.relation = nil
+    assert_not tag.valid?, "Orphaned tag should be invalid"
+    assert_predicate tag.errors[:relation], :any?
   end
 
   def test_uniqueness
     existing = create(:relation_tag)
-    tag = RelationTag.new
-    tag.relation_id = existing.relation_id
-    tag.k = existing.k
-    tag.v = existing.v
-    assert tag.new_record?
+    tag = build(:relation_tag, :relation => existing.relation, :k => existing.k, :v => existing.v)
+    assert_predicate tag, :new_record?
     assert_not tag.valid?
     assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
-    assert tag.new_record?
+    assert_predicate tag, :new_record?
   end
 
   ##