Permalink
Browse files

Merge remote branch 'docrails/master'

  • Loading branch information...
2 parents dd55830 + 23f6e51 commit a0ca3d1067a4e6fdee3baaff35a4547b3a1aa991 @fxn fxn committed Aug 17, 2010
Showing with 3 additions and 3 deletions.
  1. +2 −2 activemodel/lib/active_model/validations/validates.rb
  2. +1 −1 railties/guides/source/testing.textile
@@ -28,7 +28,7 @@ module ClassMethods
# class EmailValidator < ActiveModel::EachValidator
# def validate_each(record, attribute, value)
# record.errors[attribute] << (options[:message] || "is not an email") unless
- # value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+ # value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
# end
# end
#
@@ -48,7 +48,7 @@ module ClassMethods
#
# class TitleValidator < ActiveModel::EachValidator
# def validate_each(record, attribute, value)
- # record.errors[attribute] << "must start with 'the'" unless =~ /^the/i
+ # record.errors[attribute] << "must start with 'the'" unless value =~ /\Athe/i
# end
# end
#
@@ -735,7 +735,7 @@ You don't need to set up and run your tests by hand on a test-by-test basis. Rai
|+rake test:plugins+ |Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)|
|+rake test:profile+ |Profile the performance tests|
|+rake test:recent+ |Tests recent changes|
-|+rake test:uncommitted+ |Runs all the tests which are uncommitted. Only supports Subversion|
+|+rake test:uncommitted+ |Runs all the tests which are uncommitted. Supports Subversion and Git|
|+rake test:units+ |Runs all the unit tests from +test/unit+|

0 comments on commit a0ca3d1

Please sign in to comment.