aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-08-13 00:41:04 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-16 23:58:21 -0500
commit1fa4f9243d09b3872a110c1057a828a753822728 (patch)
tree9915b652a1bb4ec6bc72b40e44d10c2d1653009a /activemodel
parent4b608c009e155d79532a00b97ac0ec524d7ad849 (diff)
downloadrails-1fa4f9243d09b3872a110c1057a828a753822728.tar.gz
rails-1fa4f9243d09b3872a110c1057a828a753822728.tar.bz2
rails-1fa4f9243d09b3872a110c1057a828a753822728.zip
Rename ForbiddenAttributes exception to ForbiddenAttributesError
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/forbidden_attributes_protection.rb4
-rw-r--r--activemodel/test/cases/forbidden_attributes_protection_test.rb2
2 files changed, 3 insertions, 3 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