Merge branch 'pull/4985'

[rails.git] / test / validators / characters_validator_test.rb

diff --git a/test/validators/characters_validator_test.rb b/test/validators/characters_validator_test.rb
index e1409a5dc4a0d36dcd5adf6b3add0b197b2c6ecf..4c8be21e5acd264bf8c6f367a80ed218061b3643 100644 (file)
--- a/test/validators/characters_validator_test.rb
+++ b/test/validators/characters_validator_test.rb
@@ -23,7 +23,7 @@ class CharactersValidatorTest < ActiveSupport::TestCase
 
     valid.each do |v|
       c.chars = v
 
     valid.each do |v|
       c.chars = v

-      assert c.valid?, "'#{v}' should be valid"
+      assert_predicate c, :valid?, "'#{v}' should be valid"

     end
   end
 
     end
   end
 


@@ -36,7 +36,7 @@ class CharactersValidatorTest < ActiveSupport::TestCase
 
     invalid.each do |v|
       c.chars = v
 
     invalid.each do |v|
       c.chars = v

-      assert_not c.valid?, "'#{v}' should not be valid"
+      assert_not_predicate c, :valid?, "'#{v}' should not be valid"

     end
   end
 
     end
   end
 


@@ -48,7 +48,7 @@ class CharactersValidatorTest < ActiveSupport::TestCase
 
     valid.each do |v|
       c.chars = v
 
     valid.each do |v|
       c.chars = v

-      assert c.valid?, "'#{v}' should be valid"
+      assert_predicate c, :valid?, "'#{v}' should be valid"

     end
   end
 
     end
   end
 


@@ -60,7 +60,7 @@ class CharactersValidatorTest < ActiveSupport::TestCase
 
     invalid.each do |v|
       c.chars = v
 
     invalid.each do |v|
       c.chars = v

-      assert_not c.valid?, "'#{v}' should not be valid"
+      assert_not_predicate c, :valid?, "'#{v}' should not be valid"

     end
   end
 end
     end
   end
 end