Merge remote-tracking branch 'upstream/pull/3736'

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

diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb
index cf9b24ded95f1361af86799709548aef09d84bcb..69a491890101b0f8e5122198066f11300e2230e6 100644 (file)
--- a/test/models/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -3,50 +3,48 @@ require "test_helper"
 class RelationTagTest < ActiveSupport::TestCase
   def test_length_key_valid
     tag = create(:relation_tag)
-    (0..255).each do |i|
+    [0, 255].each do |i|
       tag.k = "k" * i
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
   def test_length_value_valid
     tag = create(:relation_tag)
-    (0..255).each do |i|
+    [0, 255].each do |i|
       tag.v = "v" * i
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
   def test_length_key_invalid
     tag = create(:relation_tag)
     tag.k = "k" * 256
-    assert !tag.valid?, "Key should be too long"
-    assert tag.errors[:k].any?
+    assert_not tag.valid?, "Key should be too long"
+    assert_predicate tag.errors[:k], :any?
   end
 
   def test_length_value_invalid
     tag = create(:relation_tag)
     tag.v = "v" * 256
-    assert !tag.valid?, "Value should be too long"
-    assert tag.errors[:v].any?
+    assert_not tag.valid?, "Value should be too long"
+    assert_predicate tag.errors[:v], :any?
   end
 
-  def test_empty_tag_invalid
-    tag = RelationTag.new
-    assert !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_uniquness
+  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
 
   ##