From ad31549ab3044afc336c05243481c0f663689584 Mon Sep 17 00:00:00 2001 From: Tsutomu Kuroda Date: Wed, 26 Jan 2011 11:35:02 +0900 Subject: Override attributes_protected_by_default when has_secure_password is called. attr_protected should not be called, because it nullifies the mass assignment protection that has been set by attr_accessible. Signed-off-by: Santiago Pastorino --- activemodel/test/models/administrator.rb | 10 ++++++++++ activemodel/test/models/visitor.rb | 9 +++++++++ 2 files changed, 19 insertions(+) create mode 100644 activemodel/test/models/administrator.rb create mode 100644 activemodel/test/models/visitor.rb (limited to 'activemodel/test/models') diff --git a/activemodel/test/models/administrator.rb b/activemodel/test/models/administrator.rb new file mode 100644 index 0000000000..a48f8b064f --- /dev/null +++ b/activemodel/test/models/administrator.rb @@ -0,0 +1,10 @@ +class Administrator + include ActiveModel::Validations + include ActiveModel::SecurePassword + include ActiveModel::MassAssignmentSecurity + + attr_accessor :name, :password_digest + attr_accessible :name + + has_secure_password +end diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb new file mode 100644 index 0000000000..36c0a16688 --- /dev/null +++ b/activemodel/test/models/visitor.rb @@ -0,0 +1,9 @@ +class Visitor + include ActiveModel::Validations + include ActiveModel::SecurePassword + include ActiveModel::MassAssignmentSecurity + + has_secure_password + + attr_accessor :password_digest +end -- cgit v1.2.3