test/rails_root/app/models/treat.rb test/rails_root/db/migrate/011_create_treats.rb @@ -67,7 +67,12 @@ module Shoulda # :nodoc: attributes.each do |attribute| should "require #{attribute} to be set" do - assert_bad_value(klass, attribute, nil, message) + reflection = klass.reflect_on_association(attribute) + if reflection && [:has_many, :has_and_belongs_to_many].include?(reflection.macro) + assert_bad_value(klass, attribute, [], message) + else + assert_bad_value(klass, attribute, nil, message) + end end end end lib/shoulda/active_record/macros.rb @@ -2,7 +2,9 @@ module Pets class Dog < ActiveRecord::Base belongs_to :user, :foreign_key => :owner_id belongs_to :address + has_many :treats has_and_belongs_to_many :fleas, :join_table => :fleas + validates_presence_of :treats, :fleas validates_presence_of :owner_id end end test/rails_root/app/models/pets/dog.rb @@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper' class Pets::DogTest < Test::Unit::TestCase should_belong_to :user should_belong_to :address + should_have_many :treats should_have_and_belong_to_many :fleas + should_require_attributes :treats, :fleas should_require_attributes :owner_id end test/unit/dog_test.rb bbdabffeb8db089f5cc3cdceb5399892a06486a9 Ryan McGeary ryanongit@mcgeary.org http://github.com/thoughtbot/shoulda/commit/ef10377582ff3275ab72ccdab08f20d19ddb2fea ef10377582ff3275ab72ccdab08f20d19ddb2fea 2009-01-10T17:34:21-08:00 2009-01-10T17:34:21-08:00 should_require_attributes now handles arrays (has_many and has_and_belongs_many) [#109] Conflicts: lib/shoulda/active_record/macros.rb test/rails_root/app/models/dog.rb test/unit/dog_test.rb f16141a21ae9a2f2727c2c6f98107fd86d6fe3e2 Ryan McGeary ryanongit@mcgeary.org