aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-07-13 03:51:13 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-16 23:58:19 -0500
commita8f6d5c6450a7fe058348a7f10a908352bb6c7fc (patch)
tree245439153ec40c6840ece2b13ecc41572fe56d33 /activemodel/test
parent885005461b3cc0d073ec08495dc3bf06d0bebf2a (diff)
downloadrails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.tar.gz
rails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.tar.bz2
rails-a8f6d5c6450a7fe058348a7f10a908352bb6c7fc.zip
Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/forbidden_attributes_protection_test.rb32
-rw-r--r--activemodel/test/models/mass_assignment_specific.rb7
2 files changed, 39 insertions, 0 deletions
diff --git a/activemodel/test/cases/forbidden_attributes_protection_test.rb b/activemodel/test/cases/forbidden_attributes_protection_test.rb
new file mode 100644
index 0000000000..d3088b4fc2
--- /dev/null
+++ b/activemodel/test/cases/forbidden_attributes_protection_test.rb
@@ -0,0 +1,32 @@
+require 'cases/helper'
+require 'models/mass_assignment_specific'
+
+class ActiveModelMassUpdateProtectionTest < ActiveSupport::TestCase
+ test "forbidden attributes cannot be used for mass updating" do
+ params = { "a" => "b" }
+ class << params
+ define_method(:permitted?) { false }
+ end
+ assert_raises(ActiveModel::ForbiddenAttributes) do
+ SpecialPerson.new.sanitize_for_mass_assignment(params)
+ end
+ end
+
+ test "permitted attributes can be used for mass updating" do
+ params = { "a" => "b" }
+ class << params
+ define_method(:permitted?) { true }
+ end
+ assert_nothing_raised do
+ assert_equal({ "a" => "b" },
+ SpecialPerson.new.sanitize_for_mass_assignment(params))
+ end
+ end
+
+ test "regular attributes should still be allowed" do
+ assert_nothing_raised do
+ assert_equal({ a: "b" },
+ SpecialPerson.new.sanitize_for_mass_assignment(a: "b"))
+ end
+ end
+end
diff --git a/activemodel/test/models/mass_assignment_specific.rb b/activemodel/test/models/mass_assignment_specific.rb
index 1d123fa58c..1bf828ad43 100644
--- a/activemodel/test/models/mass_assignment_specific.rb
+++ b/activemodel/test/models/mass_assignment_specific.rb
@@ -20,6 +20,13 @@ class Person
public :sanitize_for_mass_assignment
end
+class SpecialPerson
+ include ActiveModel::MassAssignmentSecurity
+ include ActiveModel::ForbiddenAttributesProtection
+
+ public :sanitize_for_mass_assignment
+end
+
class Account
include ActiveModel::MassAssignmentSecurity
attr_accessible :name, :email, :as => [:default, :admin]