diff options
4 files changed, 5 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/forbidden_attributes_protection.rb b/activemodel/lib/active_model/forbidden_attributes_protection.rb index 29bc47f151..a5e4c4f650 100644 --- a/activemodel/lib/active_model/forbidden_attributes_protection.rb +++ b/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 diff --git a/activemodel/test/cases/forbidden_attributes_protection_test.rb b/activemodel/test/cases/forbidden_attributes_protection_test.rb index fab28ced0e..f6437333b0 100644 --- a/activemodel/test/cases/forbidden_attributes_protection_test.rb +++ b/activemodel/test/cases/forbidden_attributes_protection_test.rb @@ -20,7 +20,7 @@ end 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 diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index 9e45a83fcf..c30443f7a8 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -7,7 +7,7 @@ module ActiveRecord # 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) diff --git a/activerecord/test/cases/forbidden_attributes_protection_test.rb b/activerecord/test/cases/forbidden_attributes_protection_test.rb index cf462297ef..89e9de261a 100644 --- a/activerecord/test/cases/forbidden_attributes_protection_test.rb +++ b/activerecord/test/cases/forbidden_attributes_protection_test.rb @@ -26,7 +26,7 @@ end 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 |