1 files changed, 11 insertions, 12 deletions
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index c73580138d..20c11dd852 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -1,9 +1,8 @@
-require 'cases/helper'
+require "cases/helper"
 
-require 'models/topic'
+require "models/topic"
 
 class ValidatesWithTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
@@ -52,7 +51,7 @@ class ValidatesWithTest < ActiveModel::TestCase
     Topic.validates_with(ValidatorThatAddsErrors)
     topic = Topic.new
     assert topic.invalid?, "A class that adds errors causes the record to be invalid"
-    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    assert_includes topic.errors[:base], ERROR_MESSAGE
   end
 
   test "with a class that returns valid" do
@@ -65,8 +64,8 @@ class ValidatesWithTest < ActiveModel::TestCase
     Topic.validates_with(ValidatorThatAddsErrors, OtherValidatorThatAddsErrors)
     topic = Topic.new
     assert topic.invalid?
-    assert topic.errors[:base].include?(ERROR_MESSAGE)
-    assert topic.errors[:base].include?(OTHER_ERROR_MESSAGE)
+    assert_includes topic.errors[:base], ERROR_MESSAGE
+    assert_includes topic.errors[:base], OTHER_ERROR_MESSAGE
   end
 
   test "with if statements that return false" do
@@ -79,7 +78,7 @@ class ValidatesWithTest < ActiveModel::TestCase
     Topic.validates_with(ValidatorThatAddsErrors, if: "1 == 1")
     topic = Topic.new
     assert topic.invalid?
-    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    assert_includes topic.errors[:base], ERROR_MESSAGE
   end
 
   test "with unless statements that return true" do
@@ -92,13 +91,13 @@ class ValidatesWithTest < ActiveModel::TestCase
     Topic.validates_with(ValidatorThatAddsErrors, unless: "1 == 2")
     topic = Topic.new
     assert topic.invalid?
-    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    assert_includes topic.errors[:base], ERROR_MESSAGE
   end
 
   test "passes all configuration options to the validator class" do
     topic = Topic.new
     validator = Minitest::Mock.new
-    validator.expect(:new, validator, [{foo: :bar, if: "1 == 1", class: Topic}])
+    validator.expect(:new, validator, [{ foo: :bar, if: "1 == 1", class: Topic }])
     validator.expect(:validate, nil, [topic])
     validator.expect(:is_a?, false, [Symbol])
     validator.expect(:is_a?, false, [String])
@@ -112,7 +111,7 @@ class ValidatesWithTest < ActiveModel::TestCase
     Topic.validates_with(ValidatorThatValidatesOptions, field: :first_name)
     topic = Topic.new
     assert topic.invalid?
-    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    assert_includes topic.errors[:base], ERROR_MESSAGE
   end
 
   test "validates_with each validator" do
@@ -160,7 +159,7 @@ class ValidatesWithTest < ActiveModel::TestCase
 
     topic = Topic.new
     assert !topic.valid?
-    assert_equal ['is missing'], topic.errors[:title]
+    assert_equal ["is missing"], topic.errors[:title]
   end
 
   test "optionally pass in the attribute being validated when validating with an instance method" do
@@ -169,6 +168,6 @@ class ValidatesWithTest < ActiveModel::TestCase
     topic = Topic.new title: "foo"
     assert !topic.valid?
     assert topic.errors[:title].empty?
-    assert_equal ['is missing'], topic.errors[:content]
+    assert_equal ["is missing"], topic.errors[:content]
   end
 end