Rework 'empty' tag tests

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

diff --git a/test/models/way_tag_test.rb b/test/models/way_tag_test.rb
index a3699cac4e1d311d45ea48f1cb586bb57f24a122..da13068da4b5f6c0ef3a4b9091700b51eb8f7320 100644 (file)
--- a/test/models/way_tag_test.rb
+++ b/test/models/way_tag_test.rb
@@ -3,38 +3,39 @@ require "test_helper"
 class WayTagTest < ActiveSupport::TestCase
   def test_length_key_valid
     tag = create(:way_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(:way_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(:way_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(:way_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 = WayTag.new
-    assert !tag.valid?, "Empty way tag should be invalid"
-    assert tag.errors[:way].any?
+  def test_orphaned_tag_invalid
+    tag = create(:way_tag)
+    tag.way = nil
+    assert_not tag.valid?, "Orphaned tag should be invalid"
+    assert_predicate tag.errors[:way], :any?
   end
 
   def test_uniqueness
@@ -43,9 +44,9 @@ class WayTagTest < ActiveSupport::TestCase
     tag.way_id = existing.way_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