1 files changed, 36 insertions, 28 deletions

diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index 04101f3545..7f32f5dc74 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -1,8 +1,10 @@
-require 'cases/helper'
-require 'models/person'
-require 'models/topic'
-require 'models/person_with_validator'
-require 'validators/namespace/email_validator'
+# frozen_string_literal: true
+
+require "cases/helper"
+require "models/person"
+require "models/topic"
+require "models/person_with_validator"
+require "validators/namespace/email_validator"
 
 class ValidatesTest < ActiveModel::TestCase
   setup :reset_callbacks
@@ -17,21 +19,21 @@ class ValidatesTest < ActiveModel::TestCase
   def test_validates_with_messages_empty
     Person.validates :title, presence: { message: "" }
     person = Person.new
-    assert !person.valid?, 'person should not be valid.'
+    assert !person.valid?, "person should not be valid."
   end
 
   def test_validates_with_built_in_validation
     Person.validates :title, numericality: true
     person = Person.new
     person.valid?
-    assert_equal ['is not a number'], person.errors[:title]
+    assert_equal ["is not a number"], person.errors[:title]
   end
 
   def test_validates_with_attribute_specified_as_string
     Person.validates "title", numericality: true
     person = Person.new
     person.valid?
-    assert_equal ['is not a number'], person.errors[:title]
+    assert_equal ["is not a number"], person.errors[:title]
 
     person = Person.new
     person.title = 123
@@ -39,38 +41,44 @@ class ValidatesTest < ActiveModel::TestCase
   end
 
   def test_validates_with_built_in_validation_and_options
-    Person.validates :salary, numericality: { message: 'my custom message' }
+    Person.validates :salary, numericality: { message: "my custom message" }
     person = Person.new
     person.valid?
-    assert_equal ['my custom message'], person.errors[:salary]
+    assert_equal ["my custom message"], person.errors[:salary]
   end
 
   def test_validates_with_validator_class
     Person.validates :karma, email: true
     person = Person.new
     person.valid?
-    assert_equal ['is not an email'], person.errors[:karma]
+    assert_equal ["is not an email"], person.errors[:karma]
   end
 
   def test_validates_with_namespaced_validator_class
-    Person.validates :karma, :'namespace/email' => true
+    Person.validates :karma, 'namespace/email': true
     person = Person.new
     person.valid?
-    assert_equal ['is not an email'], person.errors[:karma]
+    assert_equal ["is not an email"], person.errors[:karma]
   end
 
   def test_validates_with_if_as_local_conditions
-    Person.validates :karma, presence: true, email: { unless: :condition_is_true }
+    Person.validates :karma, presence: true, email: { if: :condition_is_false }
     person = Person.new
     person.valid?
     assert_equal ["can't be blank"], person.errors[:karma]
   end
 
   def test_validates_with_if_as_shared_conditions
-    Person.validates :karma, presence: true, email: true, if: :condition_is_true
+    Person.validates :karma, presence: true, email: true, if: :condition_is_false
+    person = Person.new
+    assert person.valid?
+  end
+
+  def test_validates_with_unless_as_local_conditions
+    Person.validates :karma, presence: true, email: { unless: :condition_is_true }
     person = Person.new
     person.valid?
-    assert_equal ["can't be blank", "is not an email"], person.errors[:karma].sort
+    assert_equal ["can't be blank"], person.errors[:karma]
   end
 
   def test_validates_with_unless_shared_conditions
@@ -89,7 +97,7 @@ class ValidatesTest < ActiveModel::TestCase
     Person.validates :karma, format: /positive|negative/
     person = Person.new
     assert person.invalid?
-    assert_equal ['is invalid'], person.errors[:karma]
+    assert_equal ["is invalid"], person.errors[:karma]
     person.karma = "positive"
     assert person.valid?
   end
@@ -98,7 +106,7 @@ class ValidatesTest < ActiveModel::TestCase
     Person.validates :gender, inclusion: %w(m f)
     person = Person.new
     assert person.invalid?
-    assert_equal ['is not included in the list'], person.errors[:gender]
+    assert_equal ["is not included in the list"], person.errors[:gender]
     person.gender = "m"
     assert person.valid?
   end
@@ -107,16 +115,16 @@ class ValidatesTest < ActiveModel::TestCase
     Person.validates :karma, length: 6..20
     person = Person.new
     assert person.invalid?
-    assert_equal ['is too short (minimum is 6 characters)'], person.errors[:karma]
-    person.karma = 'something'
+    assert_equal ["is too short (minimum is 6 characters)"], person.errors[:karma]
+    person.karma = "something"
     assert person.valid?
   end
 
   def test_validates_with_validator_class_and_options
-    Person.validates :karma, email: { message: 'my custom message' }
+    Person.validates :karma, email: { message: "my custom message" }
     person = Person.new
     person.valid?
-    assert_equal ['my custom message'], person.errors[:karma]
+    assert_equal ["my custom message"], person.errors[:karma]
   end
 
   def test_validates_with_unknown_validator
@@ -127,14 +135,14 @@ class ValidatesTest < ActiveModel::TestCase
     PersonWithValidator.validates :title, presence: true
     person = PersonWithValidator.new
     person.valid?
-    assert_equal ['Local validator'], person.errors[:title]
+    assert_equal ["Local validator"], person.errors[:title]
   end
 
   def test_validates_with_included_validator_and_options
-    PersonWithValidator.validates :title, presence: { custom: ' please' }
+    PersonWithValidator.validates :title, presence: { custom: " please" }
     person = PersonWithValidator.new
     person.valid?
-    assert_equal ['Local validator please'], person.errors[:title]
+    assert_equal ["Local validator please"], person.errors[:title]
   end
 
   def test_validates_with_included_validator_and_wildcard_shortcut
@@ -143,15 +151,15 @@ class ValidatesTest < ActiveModel::TestCase
     person = PersonWithValidator.new
     person.title = "Ms. Pacman"
     person.valid?
-    assert_equal ['does not appear to be like Mr.'], person.errors[:title]
+    assert_equal ["does not appear to be like Mr."], person.errors[:title]
   end
 
   def test_defining_extra_default_keys_for_validates
-    Topic.validates :title, confirmation: true, message: 'Y U NO CONFIRM'
+    Topic.validates :title, confirmation: true, message: "Y U NO CONFIRM"
     topic = Topic.new
     topic.title = "What's happening"
     topic.title_confirmation = "Not this"
     assert !topic.valid?
-    assert_equal ['Y U NO CONFIRM'], topic.errors[:title_confirmation]
+    assert_equal ["Y U NO CONFIRM"], topic.errors[:title_confirmation]
   end
 end