From 9643a5fa6dd2aba76830215fdcbcd8d5f87d7c07 Mon Sep 17 00:00:00 2001 From: "Carlos A. da Silva" Date: Thu, 22 Oct 2009 20:15:47 -0200 Subject: [PATCH] Removing attr_accessible. --- lib/devise/models/authenticable.rb | 1 - lib/devise/models/rememberable.rb | 1 - test/models/authenticable_test.rb | 20 -------------------- test/models/confirmable_test.rb | 12 ------------ test/models/recoverable_test.rb | 4 ---- test/models/rememberable_test.rb | 4 ---- test/support/model_tests_helper.rb | 4 ---- 7 files changed, 46 deletions(-) diff --git a/lib/devise/models/authenticable.rb b/lib/devise/models/authenticable.rb index bee94fe0..5b3fc5e8 100644 --- a/lib/devise/models/authenticable.rb +++ b/lib/devise/models/authenticable.rb @@ -31,7 +31,6 @@ module Devise attr_reader :password attr_accessor :password_confirmation - attr_accessible :email, :password, :password_confirmation end end diff --git a/lib/devise/models/rememberable.rb b/lib/devise/models/rememberable.rb index 0643972c..f4e0d2d9 100644 --- a/lib/devise/models/rememberable.rb +++ b/lib/devise/models/rememberable.rb @@ -39,7 +39,6 @@ module Devise # Remember me option available in after_authentication hook. attr_accessor :remember_me - attr_accessible :remember_me end end diff --git a/test/models/authenticable_test.rb b/test/models/authenticable_test.rb index 8e609468..93e4013c 100644 --- a/test/models/authenticable_test.rb +++ b/test/models/authenticable_test.rb @@ -15,26 +15,6 @@ class AuthenticableTest < ActiveSupport::TestCase assert user.respond_to?(:password_confirmation) end - test 'should have email acessible' do - assert field_accessible?(:email) - end - - test 'should have password acessible' do - assert field_accessible?(:password) - end - - test 'should have password confirmation accessible' do - assert field_accessible?(:password_confirmation) - end - - test 'should not have password salt accessible' do - assert_not field_accessible?(:password_salt) - end - - test 'should not have encrypted password accessible' do - assert_not field_accessible?(:encrypted_password) - end - test 'should generate salt while setting password' do assert_present new_user.password_salt assert_present new_user(:password => nil).password_salt diff --git a/test/models/confirmable_test.rb b/test/models/confirmable_test.rb index 78e38915..91125a5e 100644 --- a/test/models/confirmable_test.rb +++ b/test/models/confirmable_test.rb @@ -6,18 +6,6 @@ class ConfirmableTest < ActiveSupport::TestCase setup_mailer end - test 'should not have confirmed at accessible' do - assert_not field_accessible?(:confirmed_at) - end - - test 'should not have confirmation token accessible' do - assert_not field_accessible?(:confirmation_token) - end - - test 'should not have confirmation sent at accessible' do - assert_not field_accessible?(:confirmation_sent_at) - end - test 'should generate confirmation token after creating a record' do assert_nil new_user.confirmation_token assert_not_nil create_user.confirmation_token diff --git a/test/models/recoverable_test.rb b/test/models/recoverable_test.rb index 2a84af96..d9c5808d 100644 --- a/test/models/recoverable_test.rb +++ b/test/models/recoverable_test.rb @@ -6,10 +6,6 @@ class RecoverableTest < ActiveSupport::TestCase setup_mailer end - test 'should not have reset password token accessible' do - assert_not field_accessible?(:reset_password_token) - end - test 'should not generate reset password token after creating a record' do assert_nil new_user.reset_password_token assert_nil create_user.reset_password_token diff --git a/test/models/rememberable_test.rb b/test/models/rememberable_test.rb index 1cc6f304..0d203dfb 100644 --- a/test/models/rememberable_test.rb +++ b/test/models/rememberable_test.rb @@ -11,10 +11,6 @@ class RememberableTest < ActiveSupport::TestCase assert user.respond_to?(:remember_me) end - test 'should have remember_me accessible' do - assert field_accessible?(:remember_me) - end - test 'remember_me should generate a new token and save the record without validating' do user = create_user user.expects(:valid?).never diff --git a/test/support/model_tests_helper.rb b/test/support/model_tests_helper.rb index 221eb59b..610ff7bd 100644 --- a/test/support/model_tests_helper.rb +++ b/test/support/model_tests_helper.rb @@ -33,8 +33,4 @@ class ActiveSupport::TestCase def create_user(attributes={}) User.create!(valid_attributes(attributes)) end - - def field_accessible?(field) - new_user(field => 'test').send(field) == 'test' - end end