Skip to content
Browse files

Rename ForbiddenAttributes exception to ForbiddenAttributesError

  • Loading branch information...
1 parent 4b608c0 commit 1fa4f9243d09b3872a110c1057a828a753822728 @guilleiguaran guilleiguaran committed Aug 13, 2012
View
4 activemodel/lib/active_model/forbidden_attributes_protection.rb
@@ -1,11 +1,11 @@
module ActiveModel
- class ForbiddenAttributes < StandardError
+ class ForbiddenAttributesError < StandardError
end
module ForbiddenAttributesProtection
def sanitize_for_mass_assignment(attributes, options = {})
if attributes.respond_to?(:permitted?) && !attributes.permitted?
- raise ActiveModel::ForbiddenAttributes
+ raise ActiveModel::ForbiddenAttributesError
else
attributes
end
View
2 activemodel/test/cases/forbidden_attributes_protection_test.rb
@@ -20,7 +20,7 @@ def permit!
class ActiveModelMassUpdateProtectionTest < ActiveSupport::TestCase
test "forbidden attributes cannot be used for mass updating" do
params = ProtectedParams.new({ "a" => "b" })
- assert_raises(ActiveModel::ForbiddenAttributes) do
+ assert_raises(ActiveModel::ForbiddenAttributesError) do
Account.new.sanitize_for_mass_assignment(params)
end
end
View
2 activerecord/lib/active_record/attribute_assignment.rb
@@ -7,7 +7,7 @@ module AttributeAssignment
# matching the attribute names (which again matches the column names).
#
# If the passed hash responds to permitted? method and the return value
- # of this method is false an ActiveModel::ForbiddenAttributes exception
+ # of this method is false an ActiveModel::ForbiddenAttributesError exception
# is raised.
def attributes=(new_attributes)
return unless new_attributes.is_a?(Hash)
View
2 activerecord/test/cases/forbidden_attributes_protection_test.rb
@@ -26,7 +26,7 @@ def dup
class ForbiddenAttributesProtectionTest < ActiveRecord::TestCase
def test_forbidden_attributes_cannot_be_used_for_mass_assignment
params = ProtectedParams.new(first_name: 'Guille', gender: 'm')
- assert_raises(ActiveModel::ForbiddenAttributes) do
+ assert_raises(ActiveModel::ForbiddenAttributesError) do
Person.new(params)
end
end

0 comments on commit 1fa4f92

Please sign in to comment.
Something went wrong with that request. Please try again.