Merge remote-tracking branch 'upstream/pull/4552'

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

diff --git a/test/validators/whitespace_validator_test.rb b/test/validators/whitespace_validator_test.rb
index c908538d1cb55f449d0576aa80c0e80aa486c510..1cb325df30b6c9982eb575f26d90f5b627a60a30 100644 (file)
--- a/test/validators/whitespace_validator_test.rb
+++ b/test/validators/whitespace_validator_test.rb
@@ -22,7 +22,7 @@ class WhitespaceValidatorTest < ActiveSupport::TestCase
 
     strings.each do |v|
       validator.string = v
 
     strings.each do |v|
       validator.string = v

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

     end
   end
 
     end
   end
 


@@ -33,7 +33,7 @@ class WhitespaceValidatorTest < ActiveSupport::TestCase
 
     strings.each do |v|
       validator.string = v
 
     strings.each do |v|
       validator.string = v

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

     end
   end
 
     end
   end
 


@@ -44,7 +44,7 @@ class WhitespaceValidatorTest < ActiveSupport::TestCase
 
     strings.each do |v|
       validator.string = v
 
     strings.each do |v|
       validator.string = v

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

     end
   end
 
     end
   end
 


@@ -55,7 +55,7 @@ class WhitespaceValidatorTest < ActiveSupport::TestCase
 
     strings.each do |v|
       validator.string = v
 
     strings.each do |v|
       validator.string = v

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

     end
   end
 end
     end
   end
 end