X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cb3c4ec09b70e7eae62494af795187b32128fd0c..03cad948e30d8f82d0c1c5e249cd6c92bb44dd3d:/test/models/old_way_tag_test.rb diff --git a/test/models/old_way_tag_test.rb b/test/models/old_way_tag_test.rb index b2b693424..51c644c18 100644 --- a/test/models/old_way_tag_test.rb +++ b/test/models/old_way_tag_test.rb @@ -3,38 +3,38 @@ require "test_helper" class OldWayTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:old_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(:old_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(:old_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(:old_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 = OldWayTag.new - assert !tag.valid?, "Empty tag should be invalid" - assert tag.errors[:old_way].any? + assert_not tag.valid?, "Empty tag should be invalid" + assert_predicate tag.errors[:old_way], :any? end def test_uniqueness @@ -44,9 +44,9 @@ class OldWayTagTest < ActiveSupport::TestCase tag.version = existing.version 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