diff options
author | Prem Sichanugrist <s@sikachu.com> | 2011-03-11 13:35:23 +0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-04-10 18:49:28 +0800 |
commit | 58594be680e8712c9e7352f184e15972d02cd4af (patch) | |
tree | b53b6b145b980d8f4ccc833052a2aa8e87eb7904 /activemodel/test/cases/validations/format_validation_test.rb | |
parent | 22a3416298523d5e8ecb432a263e4bee9441e6c5 (diff) | |
download | rails-58594be680e8712c9e7352f184e15972d02cd4af.tar.gz rails-58594be680e8712c9e7352f184e15972d02cd4af.tar.bz2 rails-58594be680e8712c9e7352f184e15972d02cd4af.zip |
Add support for proc or lambda as an option for InclusionValidator, ExclusionValidator, and FormatValidator
You can now use a proc or lambda in :in option for InclusionValidator and ExclusionValidator, and :with, :without option for FormatValidator
Diffstat (limited to 'activemodel/test/cases/validations/format_validation_test.rb')
-rw-r--r-- | activemodel/test/cases/validations/format_validation_test.rb | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb index 6c4fb36d52..1ff29134ee 100644 --- a/activemodel/test/cases/validations/format_validation_test.rb +++ b/activemodel/test/cases/validations/format_validation_test.rb @@ -98,6 +98,46 @@ class PresenceValidationTest < ActiveModel::TestCase assert_raise(ArgumentError) { Topic.validates_format_of(:title, :without => "clearly not a regexp") } end + def test_validates_format_of_with_lambda + Topic.validates_format_of :content, :with => lambda{ |topic| topic.title == "digit" ? /\A\d+\Z/ : /\A\S+\Z/ } + + p = Topic.new + p.title = "digit" + p.content = "Pixies" + assert p.invalid? + + p.content = "1234" + assert p.valid? + end + + def test_validates_format_of_without_lambda + Topic.validates_format_of :content, :without => lambda{ |topic| topic.title == "characters" ? /\A\d+\Z/ : /\A\S+\Z/ } + + p = Topic.new + p.title = "characters" + p.content = "1234" + assert p.invalid? + + p.content = "Pixies" + assert p.valid? + end + + def test_validates_format_of_with_lambda_not_returns_regexp + Topic.validates_format_of :content, :with => lambda{ |topic| false } + + p = Topic.new + p.content = "Pixies" + assert_raise(ArgumentError){ p.valid? } + end + + def test_validates_format_of_without_lambda_not_returns_regexp + Topic.validates_format_of :content, :without => lambda{ |topic| false } + + p = Topic.new + p.content = "Pixies" + assert_raise(ArgumentError){ p.valid? } + end + def test_validates_format_of_for_ruby_class Person.validates_format_of :karma, :with => /\A\d+\Z/ |