@@ -106,9 +106,13 @@ module ThoughtBot # :nodoc: attributes.each do |attribute| attribute = attribute.to_sym should "protect #{attribute} from mass updates" do - protected_attributes = klass.protected_attributes || [] - assert protected_attributes.include?(attribute.to_s), - "#{klass} is protecting #{protected_attributes.to_a.to_sentence}, but not #{attribute}." + protected = klass.protected_attributes || [] + accessible = klass.accessible_attributes || [] + + assert protected.include?(attribute.to_s) || !accessible.include?(attribute.to_s), + (accessible.empty? ? + "#{klass} is protecting #{protected.to_a.to_sentence}, but not #{attribute}." : + "#{klass} has made #{attribute} accessible") end end end lib/shoulda/active_record_helpers.rb @@ -3,4 +3,6 @@ class Tag < ActiveRecord::Base has_many :posts, :through => :taggings validates_length_of :name, :minimum => 2 + + attr_accessible :name end test/rails_root/app/models/tag.rb @@ -7,4 +7,6 @@ class TagTest < Test::Unit::TestCase should_have_many :posts should_ensure_length_at_least :name, 2 + + should_protect_attributes :secret end test/unit/tag_test.rb 051edf42e8d5d8ccddffe96660a4effe5efac25f Mike Boone mike@boonedocks.net http://github.com/boone/shoulda/commit/2a7de9cca8fc688bd9f6741128005ab91af37e9a 2a7de9cca8fc688bd9f6741128005ab91af37e9a 2008-05-11T16:48:57-07:00 2008-05-11T16:48:57-07:00 should_protect_attributes works with attr_accessible Applied Luke Francl's patch from this Lighthouse ticket: http://thoughtbot.lighthouseapp.com/projects/5807/tickets/25-patch-make-should_protect_attributes-with-attr_accessible Also modified to tag model to use attr_accessible and added a should_protect_attributes test to tag's unit test. 6acfe9c7d96e1ea8a1ceec6e5a82dbcf00e8e94f Mike Boone mike@boonedocks.net