1 files changed, 44 insertions, 54 deletions
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index 296d3b4407..caea8b65ef 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -1,9 +1,10 @@
-require 'cases/helper'
+# frozen_string_literal: true
 
-require 'models/topic'
+require "cases/helper"
 
-class ConditionalValidationTest < ActiveModel::TestCase
+require "models/topic"
 
+class ConditionalValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
@@ -17,6 +18,22 @@ class ConditionalValidationTest < ActiveModel::TestCase
     assert_equal ["hoo 5"], t.errors["title"]
   end
 
+  def test_if_validation_using_array_of_true_methods
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: [:condition_is_true, :condition_is_true])
+    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["hoo 5"], t.errors["title"]
+  end
+
+  def test_unless_validation_using_array_of_false_methods
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: [:condition_is_false, :condition_is_false])
+    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["hoo 5"], t.errors["title"]
+  end
+
   def test_unless_validation_using_method_true
     # When the method returns true
     Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: :condition_is_true)
@@ -25,51 +42,31 @@ class ConditionalValidationTest < ActiveModel::TestCase
     assert_empty t.errors[:title]
   end
 
-  def test_if_validation_using_method_false
-    # When the method returns false
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: :condition_is_true_but_its_not)
+  def test_if_validation_using_array_of_true_and_false_methods
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: [:condition_is_true, :condition_is_false])
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.valid?
     assert_empty t.errors[:title]
   end
 
-  def test_unless_validation_using_method_false
-    # When the method returns false
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: :condition_is_true_but_its_not)
-    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
-    assert t.invalid?
-    assert t.errors[:title].any?
-    assert_equal ["hoo 5"], t.errors["title"]
-  end
-
-  def test_if_validation_using_string_true
-    # When the evaluated string returns true
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: "a = 1; a == 1")
-    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
-    assert t.invalid?
-    assert t.errors[:title].any?
-    assert_equal ["hoo 5"], t.errors["title"]
-  end
-
-  def test_unless_validation_using_string_true
-    # When the evaluated string returns true
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: "a = 1; a == 1")
+  def test_unless_validation_using_array_of_true_and_felse_methods
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: [:condition_is_true, :condition_is_false])
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.valid?
     assert_empty t.errors[:title]
   end
 
-  def test_if_validation_using_string_false
-    # When the evaluated string returns false
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: "false")
+  def test_if_validation_using_method_false
+    # When the method returns false
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: :condition_is_false)
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.valid?
     assert_empty t.errors[:title]
   end
 
-  def test_unless_validation_using_string_false
-    # When the evaluated string returns false
-    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: "false")
+  def test_unless_validation_using_method_false
+    # When the method returns false
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", unless: :condition_is_false)
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.invalid?
     assert t.errors[:title].any?
@@ -98,7 +95,7 @@ class ConditionalValidationTest < ActiveModel::TestCase
   def test_if_validation_using_block_false
     # When the block returns false
     Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}",
-      if: Proc.new { |r| r.title != "uhohuhoh"})
+      if: Proc.new { |r| r.title != "uhohuhoh" })
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.valid?
     assert_empty t.errors[:title]
@@ -107,32 +104,25 @@ class ConditionalValidationTest < ActiveModel::TestCase
   def test_unless_validation_using_block_false
     # When the block returns false
     Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}",
-      unless: Proc.new { |r| r.title != "uhohuhoh"} )
+      unless: Proc.new { |r| r.title != "uhohuhoh" })
     t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
     assert t.invalid?
     assert t.errors[:title].any?
     assert_equal ["hoo 5"], t.errors["title"]
   end
 
-  # previous implementation of validates_presence_of eval'd the
-  # string with the wrong binding, this regression test is to
-  # ensure that it works correctly
-  def test_validation_with_if_as_string
-    Topic.validates_presence_of(:title)
-    Topic.validates_presence_of(:author_name, if: "title.to_s.match('important')")
-
-    t = Topic.new
-    assert t.invalid?, "A topic without a title should not be valid"
-    assert_empty t.errors[:author_name], "A topic without an 'important' title should not require an author"
-
-    t.title = "Just a title"
-    assert t.valid?, "A topic with a basic title should be valid"
-
-    t.title = "A very important title"
-    assert t.invalid?, "A topic with an important title, but without an author, should not be valid"
-    assert t.errors[:author_name].any?, "A topic with an 'important' title should require an author"
+  def test_validation_using_conbining_if_true_and_unless_true_conditions
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: :condition_is_true, unless: :condition_is_true)
+    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
+    assert t.valid?
+    assert_empty t.errors[:title]
+  end
 
-    t.author_name = "Hubert J. Farnsworth"
-    assert t.valid?, "A topic with an important title and author should be valid"
+  def test_validation_using_conbining_if_true_and_unless_false_conditions
+    Topic.validates_length_of(:title, maximum: 5, too_long: "hoo %{count}", if: :condition_is_true, unless: :condition_is_false)
+    t = Topic.new("title" => "uhohuhoh", "content" => "whatever")
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["hoo 5"], t.errors["title"]
   end
 end