Changeset 8733

Timestamp:

01/26/08 05:08:20 (9 months ago)

Author:

nzkoz

Message:

Add tests and documentation for allow_blank. Closes #10651 [blj]

Files:

• trunk/activerecord/lib/active_record/validations.rb (modified) (1 diff)
• trunk/activerecord/test/cases/validations_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/validations.rb

@@ -685 +685 @@
-      # Configuration options:
-      # * <tt>message</tt> - A custom error message (default is: "is invalid")
+      # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
+      # * <tt>allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is: false)
-      # * <tt>with</tt> - The regular expression used to validate the format with (note: must be supplied!)
-      # * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)

trunk/activerecord/test/cases/validations_test.rb

@@ -488 +488 @@
-
-    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :content) }
+  end
+
+  def test_validate_format_with_allow_blank
+    Topic.validates_format_of(:title, :with => /^Validation\smacros \w+!$/, :allow_blank=>true)
+    assert !Topic.create("title" => "Shouldn't be valid").valid?
+    assert Topic.create("title" => "").valid?
+    assert Topic.create("title" => nil).valid?
+    assert Topic.create("title" => "Validation macros rule!").valid?
-  end
-