X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..4cf73c81ba0d4e85f9d16a07fef362217107b5fa:/test/unit/old_way_tag_test.rb diff --git a/test/unit/old_way_tag_test.rb b/test/unit/old_way_tag_test.rb index 8210ef0c4..3282fc473 100644 --- a/test/unit/old_way_tag_test.rb +++ b/test/unit/old_way_tag_test.rb @@ -1,8 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class WayTagTest < Test::Unit::TestCase - fixtures :way_tags - set_fixture_class :way_tags => OldWayTag +class WayTagTest < ActiveSupport::TestCase + api_fixtures def test_tag_count assert_equal 3, OldWayTag.count @@ -16,7 +15,7 @@ class WayTagTest < Test::Unit::TestCase tag.version = 1 tag.k = key*i tag.v = "v" - assert_valid tag + assert tag.valid? end end @@ -28,7 +27,7 @@ class WayTagTest < Test::Unit::TestCase tag.version = 1 tag.k = "k" tag.v = val*i - assert_valid tag + assert tag.valid? end end @@ -40,7 +39,7 @@ class WayTagTest < Test::Unit::TestCase tag.k = i tag.v = "v" assert !tag.valid?, "Key should be too long" - assert tag.errors.invalid?(:k) + assert tag.errors[:k].any? end end @@ -52,14 +51,14 @@ class WayTagTest < Test::Unit::TestCase tag.k = "k" tag.v = i assert !tag.valid?, "Value should be too long" - assert tag.errors.invalid?(:v) + assert tag.errors[:v].any? end end def test_empty_node_tag_invalid tag = OldNodeTag.new assert !tag.valid?, "Empty tag should be invalid" - assert tag.errors.invalid?(:id) + assert tag.errors[:id].any? end def test_uniqueness