Improve Validation Helpers' documentation comments and tests

2 files changed, 31 insertions, 0 deletions

diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 9c2114d83d..d3995ad5af 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -50,6 +50,20 @@ class AcceptanceValidationTest < ActiveModel::TestCase
     assert t.valid?
   end
 
+  def test_terms_of_service_agreement_with_multiple_accept_values
+    Topic.validates_acceptance_of(:terms_of_service, accept: [1, "I concur."])
+
+    t = Topic.new("title" => "We should be confirmed", "terms_of_service" => "")
+    assert t.invalid?
+    assert_equal ["must be accepted"], t.errors[:terms_of_service]
+
+    t.terms_of_service = 1
+    assert t.valid?
+
+    t.terms_of_service = "I concur."
+    assert t.valid?
+  end
+
   def test_validates_acceptance_of_for_ruby_class
     Person.validates_acceptance_of :karma
 
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index b269c3691a..005bc15df5 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -1,4 +1,5 @@
 require 'cases/helper'
+require 'active_support/core_ext/numeric/time'
 
 require 'models/topic'
 require 'models/person'
@@ -64,6 +65,22 @@ class ExclusionValidationTest < ActiveModel::TestCase
     assert t.valid?
   end
 
+  def test_validates_exclusion_of_with_range
+    Topic.validates_exclusion_of :content, in: ("a".."g")
+
+    assert Topic.new(content: 'g').invalid?
+    assert Topic.new(content: 'h').valid?
+  end
+
+  def test_validates_exclusion_of_with_time_range
+    Topic.validates_exclusion_of :created_at, in: 6.days.ago..2.days.ago
+
+    assert Topic.new(created_at: 5.days.ago).invalid?
+    assert Topic.new(created_at: 3.days.ago).invalid?
+    assert Topic.new(created_at: 7.days.ago).valid?
+    assert Topic.new(created_at: 1.day.ago).valid?
+  end
+
   def test_validates_inclusion_of_with_symbol
     Person.validates_exclusion_of :karma, in: :reserved_karmas