X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1f8a68371ad34594cce4aadf5fef229588fd4ddc..edb68e839f4830e722bf187af7e77c9a248551a8:/test/unit/way_tag_test.rb diff --git a/test/unit/way_tag_test.rb b/test/unit/way_tag_test.rb index 018263da1..5ce088159 100644 --- a/test/unit/way_tag_test.rb +++ b/test/unit/way_tag_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class WayTagTest < Test::Unit::TestCase +class WayTagTest < ActiveSupport::TestCase api_fixtures def test_way_tag_count @@ -14,7 +14,7 @@ class WayTagTest < Test::Unit::TestCase tag.id = current_way_tags(:t1).id tag.k = key*i tag.v = current_way_tags(:t1).v - assert_valid tag + assert tag.valid? end end @@ -25,7 +25,7 @@ class WayTagTest < Test::Unit::TestCase tag.id = current_way_tags(:t1).id tag.k = "k" tag.v = val*i - assert_valid tag + assert tag.valid? end end @@ -36,7 +36,7 @@ class WayTagTest < Test::Unit::TestCase tag.k = i tag.v = "v" assert !tag.valid?, "Key #{i} should be too long" - assert tag.errors.invalid?(:k) + assert tag.errors[:k].any? end end @@ -47,14 +47,14 @@ class WayTagTest < Test::Unit::TestCase tag.k = "k" tag.v = i assert !tag.valid?, "Value #{i} should be too long" - assert tag.errors.invalid?(:v) + assert tag.errors[:v].any? end end def test_empty_tag_invalid tag = WayTag.new assert !tag.valid?, "Empty way tag should be invalid" - assert tag.errors.invalid?(:id) + assert tag.errors[:id].any? end def test_uniqueness