Changeset 8832

Timestamp:

02/10/08 01:05:54 (5 months ago)

Author:

nzkoz

Message:

2-0-stable: Add tests and documentation for allow_blank. References #10651 [blj]

Merging [8733]

Files:

• branches/2-0-stable/activerecord/lib/active_record/validations.rb (modified) (1 diff)
• branches/2-0-stable/activerecord/test/validations_test.rb (modified) (1 diff)

branches/2-0-stable/activerecord/lib/active_record/validations.rb

@@ -708 +708 @@
-      # 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)

branches/2-0-stable/activerecord/test/validations_test.rb

@@ -481 +481 @@
-    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
-
-  # testing ticket #3142