Added allow_nil options to validates_inclusion_of so that validation is only triggered if the attribute is not nil [what-a-day]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@258 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 0 deletions

diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index 867be0376d..f5735de59d 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -244,6 +244,14 @@ class ValidationsTest < Test::Unit::TestCase
     assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of( :title, :in => [] ) }
   end
 
+  def test_validates_inclusion_of_with_allow_nil
+    Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ), :allow_nil=>true )
+
+    assert !Topic.create("title" => "a!", "content" => "abc").valid?
+    assert !Topic.create("title" => "", "content" => "abc").valid?
+    assert Topic.create("title" => nil, "content" => "abc").valid?
+  end
+
   def test_validates_length_of_using_minimum
     Topic.validates_length_of( :title, :minimum=>5 )
     t = Topic.create("title" => "valid", "content" => "whatever")