Rework 'empty' tag tests

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

diff --git a/test/models/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
index 2788d6f2d01c3884d8d382c991207d42ff5341c4..6846f90b455e73256c24b1908e386df564d18f1a 100644 (file)
--- a/test/models/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -5,12 +5,12 @@ class ChangesetTagTest < ActiveSupport::TestCase
     changeset = create(:changeset)
 
     key = "k"
-    (0..255).each do |i|
+    [0, 255].each do |i|
       tag = ChangesetTag.new
       tag.changeset_id = changeset.id
       tag.k = key * i
       tag.v = "v"
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
@@ -18,12 +18,12 @@ class ChangesetTagTest < ActiveSupport::TestCase
     changeset = create(:changeset)
 
     val = "v"
-    (0..255).each do |i|
+    [0, 255].each do |i|
       tag = ChangesetTag.new
       tag.changeset_id = changeset.id
       tag.k = "k"
       tag.v = val * i
-      assert tag.valid?
+      assert_predicate tag, :valid?
     end
   end
 
@@ -33,8 +33,8 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = k
       tag.v = "v"
-      assert !tag.valid?, "Key #{k} should be too long"
-      assert tag.errors[:k].any?
+      assert_not tag.valid?, "Key #{k} should be too long"
+      assert_predicate tag.errors[:k], :any?
     end
   end
 
@@ -44,15 +44,16 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = "k"
       tag.v = v
-      assert !tag.valid?, "Value #{v} should be too long"
-      assert tag.errors[:v].any?
+      assert_not tag.valid?, "Value #{v} should be too long"
+      assert_predicate tag.errors[:v], :any?
     end
   end
 
-  def test_empty_tag_invalid
-    tag = ChangesetTag.new
-    assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors[:changeset].any?
+  def test_orphaned_tag_invalid
+    tag = create(:changeset_tag)
+    tag.changeset = nil
+    assert_not tag.valid?, "Orphaned tag should be invalid"
+    assert_predicate tag.errors[:changeset], :any?
   end
 
   def test_uniqueness
@@ -61,9 +62,9 @@ class ChangesetTagTest < ActiveSupport::TestCase
     tag.changeset_id = existing.changeset_id
     tag.k = existing.k
     tag.v = existing.v
-    assert tag.new_record?
+    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
 end