diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2010-05-08 23:27:49 +0300 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-05-08 23:51:36 +0300 |
commit | 66913a76af9969ddf12021992eeb418e270bebe2 (patch) | |
tree | 8ff5d8cf518f086979fd4e4b0633c7f8c340323e /activemodel/test/models/reply.rb | |
parent | 82485068f8b64a49cbb6529d17dd5de27c28e951 (diff) | |
download | rails-66913a76af9969ddf12021992eeb418e270bebe2.tar.gz rails-66913a76af9969ddf12021992eeb418e270bebe2.tar.bz2 rails-66913a76af9969ddf12021992eeb418e270bebe2.zip |
removed use of AR in AMo tests and removed testing of scopes (:on) in individual validation tests and moved them to their own test file
Diffstat (limited to 'activemodel/test/models/reply.rb')
-rw-r--r-- | activemodel/test/models/reply.rb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/activemodel/test/models/reply.rb b/activemodel/test/models/reply.rb index e86692677f..ec1efeac19 100644 --- a/activemodel/test/models/reply.rb +++ b/activemodel/test/models/reply.rb @@ -2,33 +2,31 @@ require 'models/topic' class Reply < Topic validate :errors_on_empty_content - validate :title_is_wrong_create, :on => :create + validate :title_is_wrong_create, :on => :create validate :check_empty_title validate :check_content_mismatch, :on => :create - validate :check_wrong_update, :on => :update - - attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read + validate :check_wrong_update, :on => :update def check_empty_title - errors[:title] << "Empty" unless attribute_present?("title") + errors[:title] << "is Empty" unless title && title.size > 0 end def errors_on_empty_content - errors[:content] << "Empty" unless attribute_present?("content") + errors[:content] << "is Empty" unless content && content.size > 0 end def check_content_mismatch - if attribute_present?("title") && attribute_present?("content") && content == "Mismatch" + if title && content && content == "Mismatch" errors[:title] << "is Content Mismatch" end end def title_is_wrong_create - errors[:title] << "is Wrong Create" if attribute_present?("title") && title == "Wrong Create" + errors[:title] << "is Wrong Create" if title && title == "Wrong Create" end def check_wrong_update - errors[:title] << "is Wrong Update" if attribute_present?("title") && title == "Wrong Update" + errors[:title] << "is Wrong Update" if title && title == "Wrong Update" end end |