Added more test coverage for comparison validator.

activemodel/lib/active_model/validations/comparison.rb

@@ -44,13 +44,13 @@ module ActiveModel
       # * <tt>:greater_than</tt> - Specifies the value must be greater than the
       #   supplied value.
       # * <tt>:greater_than_or_equal_to</tt> - Specifies the value must be
-      #   greater than or equal the supplied value.
+      #   greater than or equal to the supplied value.
       # * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied
       #   value.
       # * <tt>:less_than</tt> - Specifies the value must be less than the
       #   supplied value.
       # * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less
-      #   than or equal the supplied value.
+      #   than or equal to the supplied value.
       # * <tt>:other_than</tt> - Specifies the value must not be equal to the
       #   supplied value.
       #
@@ -58,7 +58,7 @@ module ActiveModel
       # +:if+, +:unless+, +:on+, +:allow_nil+, +:allow_blank+, and +:strict+ .
       # See <tt>ActiveModel::Validations#validates</tt> for more information
       #
-      # The validator requires at least one of the following checks be supplied.
+      # The validator requires at least one of the following checks to be supplied.
       # Each will accept a proc, value, or a symbol which corresponds to a method:
       #
       # * <tt>:greater_than</tt>

activemodel/test/cases/validations/comparison_validation_test.rb

@@ -30,6 +30,16 @@ class ComparisonValidationTest < ActiveModel::TestCase
     assert_valid_values([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34)])
   end
 
+  def test_validates_comparison_with_greater_than_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, greater_than: time_value
+
+    assert_invalid_values([
+      Time.at(1596285240),
+      Time.at(1593714600)], "must be greater than #{time_value}")
+    assert_valid_values([Time.at(1596371640), Time.at(1596393000)])
+  end
+
   def test_validates_comparison_with_greater_than_using_string
     Topic.validates_comparison_of :approved, greater_than: "cat"
 
@@ -44,13 +54,6 @@ class ComparisonValidationTest < ActiveModel::TestCase
     assert_valid_values([11, 10])
   end
 
-  def test_validates_comparison_with_greater_than_or_equal_to_using_string
-    Topic.validates_comparison_of :approved, greater_than_or_equal_to: "cat"
-
-    assert_invalid_values(["ant"], "must be greater than or equal to cat")
-    assert_valid_values(["cat", "dog", "whale"])
-  end
-
   def test_validates_comparison_with_greater_than_or_equal_to_using_date
     date_value = Date.parse("2020-08-02")
     Topic.validates_comparison_of :approved, greater_than_or_equal_to: date_value
@@ -63,6 +66,23 @@ class ComparisonValidationTest < ActiveModel::TestCase
     assert_valid_values([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34), Date.parse("2020-08-02")])
   end
 
+  def test_validates_comparison_with_greater_than_or_equal_to_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, greater_than_or_equal_to: time_value
+
+    assert_invalid_values([
+      Time.at(1564662840),
+      Time.at(1596285230)], "must be greater than or equal to #{time_value}")
+    assert_valid_values([Time.at(1596285240), Time.at(1596285241)])
+  end
+
+  def test_validates_comparison_with_greater_than_or_equal_to_using_string
+    Topic.validates_comparison_of :approved, greater_than_or_equal_to: "cat"
+
+    assert_invalid_values(["ant"], "must be greater than or equal to cat")
+    assert_valid_values(["cat", "dog", "whale"])
+  end
+
   def test_validates_comparison_with_equal_to_using_numeric
     Topic.validates_comparison_of :approved, equal_to: 10
 
@@ -84,6 +104,23 @@ class ComparisonValidationTest < ActiveModel::TestCase
     assert_valid_values([Date.parse("2020-08-02"), DateTime.new(2020, 8, 2, 0, 0)])
   end
 
+  def test_validates_comparison_with_equal_to_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, equal_to: time_value
+
+    assert_invalid_values([
+      Time.at(1564662840),
+      Time.at(1596285230)], "must be equal to #{time_value}")
+    assert_valid_values([Time.at(1596285240)])
+  end
+
+  def test_validates_comparison_with_equal_to_using_string
+    Topic.validates_comparison_of :approved, equal_to: "cat"
+
+    assert_invalid_values(["dog", "whale"], "must be equal to cat")
+    assert_valid_values(["cat"])
+  end
+
   def test_validates_comparison_with_less_than_using_numeric
     Topic.validates_comparison_of :approved, less_than: 10
 
@@ -105,6 +142,23 @@ class ComparisonValidationTest < ActiveModel::TestCase
       DateTime.new(2020, 8, 1, 12, 34)])
   end
 
+  def test_validates_comparison_with_less_than_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, less_than: time_value
+
+    assert_invalid_values([
+      Time.at(1596371640),
+      Time.at(1596393000)], "must be less than #{time_value}")
+    assert_valid_values([Time.at(1596285239), Time.at(1593714600)])
+  end
+
+  def test_validates_comparison_with_less_than_using_string
+    Topic.validates_comparison_of :approved, less_than: "dog"
+
+    assert_invalid_values(["whale"], "must be less than dog")
+    assert_valid_values(["ant", "cat"])
+  end
+
   def test_validates_comparison_with_less_than_or_equal_to_using_numeric
     Topic.validates_comparison_of :approved, less_than_or_equal_to: 10
 
@@ -126,6 +180,23 @@ class ComparisonValidationTest < ActiveModel::TestCase
       DateTime.new(2020, 8, 1, 12, 34)])
   end
 
+  def test_validates_comparison_with_less_than_or_equal_to_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, less_than_or_equal_to: time_value
+
+    assert_invalid_values([
+      Time.at(1598963640),
+      Time.at(1596285241)], "must be less than or equal to #{time_value}")
+    assert_valid_values([Time.at(1596285240), Time.at(1596285230)])
+  end
+
+  def test_validates_comparison_with_less_than_or_equal_to_using_string
+    Topic.validates_comparison_of :approved, less_than_or_equal_to: "dog"
+
+    assert_invalid_values(["whale"], "must be less than or equal to dog")
+    assert_valid_values(["ant", "cat", "dog"])
+  end
+
   def test_validates_comparison_with_other_than_using_numeric
     Topic.validates_comparison_of :approved, other_than: 10
 
@@ -147,6 +218,21 @@ class ComparisonValidationTest < ActiveModel::TestCase
       DateTime.new(2020, 8, 2, 12, 34)])
   end
 
+  def test_validates_comparison_with_other_than_using_time
+    time_value = Time.at(1596285240)
+    Topic.validates_comparison_of :approved, other_than: time_value
+
+    assert_invalid_values([Time.at(1596285240)], "must be other than #{time_value}")
+    assert_valid_values([Time.at(1564662840), Time.at(1596285230)])
+  end
+
+  def test_validates_comparison_with_other_than_using_string
+    Topic.validates_comparison_of :approved, other_than: "whale"
+
+    assert_invalid_values(["whale"], "must be other than whale")
+    assert_valid_values(["ant", "cat", "dog"])
+  end
+
   def test_validates_comparison_with_proc
     Topic.define_method(:requested) { Date.new(2020, 8, 1) }
     Topic.validates_comparison_of :approved, greater_than_or_equal_to: Proc.new(&:requested)