Use assert_predicate and assert_not_predicate

1 files changed, 10 insertions, 10 deletions

diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 22c2f0af87..c3eca41070 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -17,25 +17,25 @@ class PresenceValidationTest < ActiveModel::TestCase
     Topic.validates_presence_of(:title, :content)
 
     t = Topic.new
-    assert t.invalid?
+    assert_predicate t, :invalid?
     assert_equal ["can't be blank"], t.errors[:title]
     assert_equal ["can't be blank"], t.errors[:content]
 
     t.title = "something"
     t.content = "   "
 
-    assert t.invalid?
+    assert_predicate t, :invalid?
     assert_equal ["can't be blank"], t.errors[:content]
 
     t.content = "like stuff"
 
-    assert t.valid?
+    assert_predicate t, :valid?
   end
 
   def test_accepts_array_arguments
     Topic.validates_presence_of %w(title content)
     t = Topic.new
-    assert t.invalid?
+    assert_predicate t, :invalid?
     assert_equal ["can't be blank"], t.errors[:title]
     assert_equal ["can't be blank"], t.errors[:content]
   end
@@ -43,7 +43,7 @@ class PresenceValidationTest < ActiveModel::TestCase
   def test_validates_acceptance_of_with_custom_error_using_quotes
     Person.validates_presence_of :karma, message: "This string contains 'single' and \"double\" quotes"
     p = Person.new
-    assert p.invalid?
+    assert_predicate p, :invalid?
     assert_equal "This string contains 'single' and \"double\" quotes", p.errors[:karma].last
   end
 
@@ -51,24 +51,24 @@ class PresenceValidationTest < ActiveModel::TestCase
     Person.validates_presence_of :karma
 
     p = Person.new
-    assert p.invalid?
+    assert_predicate p, :invalid?
 
     assert_equal ["can't be blank"], p.errors[:karma]
 
     p.karma = "Cold"
-    assert p.valid?
+    assert_predicate p, :valid?
   end
 
   def test_validates_presence_of_for_ruby_class_with_custom_reader
     CustomReader.validates_presence_of :karma
 
     p = CustomReader.new
-    assert p.invalid?
+    assert_predicate p, :invalid?
 
     assert_equal ["can't be blank"], p.errors[:karma]
 
     p[:karma] = "Cold"
-    assert p.valid?
+    assert_predicate p, :valid?
   end
 
   def test_validates_presence_of_with_allow_nil_option
@@ -78,7 +78,7 @@ class PresenceValidationTest < ActiveModel::TestCase
     assert t.valid?, t.errors.full_messages
 
     t.title = ""
-    assert t.invalid?
+    assert_predicate t, :invalid?
     assert_equal ["can't be blank"], t.errors[:title]
 
     t.title = "  "