]> git.openstreetmap.org Git - rails.git/blobdiff - test/unit/changeset_tag_test.rb
Remove monkey patch added for rails 2
[rails.git] / test / unit / changeset_tag_test.rb
index e0201d53816c470fd64e27fb2901c9a0d03db566..4854432c48f7f9f1bdfae24dfdd1f7a01a8282bf 100644 (file)
@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ChangesetTagTest < Test::Unit::TestCase
-  fixtures :changeset_tags
+class ChangesetTagTest < ActiveSupport::TestCase
+  api_fixtures
 
   def test_changeset_tag_count
-    assert_equal 1, ChangesetTag.count
+    assert_equal 2, ChangesetTag.count
   end
   
   def test_length_key_valid
@@ -14,7 +14,7 @@ class ChangesetTagTest < Test::Unit::TestCase
       tag.id = 1
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -25,7 +25,7 @@ class ChangesetTagTest < Test::Unit::TestCase
       tag.id = 1
       tag.k = "k"
       tag.v = val*i
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -36,7 +36,7 @@ class ChangesetTagTest < Test::Unit::TestCase
       tag.k = k
       tag.v = "v"
       assert !tag.valid?, "Key #{k} should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -47,14 +47,14 @@ class ChangesetTagTest < Test::Unit::TestCase
       tag.k = "k"
       tag.v = v
       assert !tag.valid?, "Value #{v} should be too long"
-      assert tag.errors.invalid?(:v)
+      assert 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.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness