Do not require ActiveRecord to be loaded to use Devise.

This commit is contained in:
José Valim
2009-10-30 21:51:50 -02:00
parent 5f498522df
commit e7f809de3c
13 changed files with 102 additions and 82 deletions

View File

@@ -66,28 +66,28 @@ class AuthenticatableTest < ActiveSupport::TestCase
test 'should fallback to devise pepper default configuring' do
begin
Devise.pepper = ''
Devise::Models.pepper = ''
user = new_user
assert_equal encrypt_password(user), user.encrypted_password
Devise.pepper = 'new_pepper'
Devise::Models.pepper = 'new_pepper'
user = new_user
assert_equal encrypt_password(user, 'new_pepper'), user.encrypted_password
Devise.pepper = '123456'
Devise::Models.pepper = '123456'
user = new_user
assert_equal encrypt_password(user, '123456'), user.encrypted_password
ensure
Devise.pepper = nil
Devise::Models.pepper = nil
end
end
test 'should fallback to devise stretches default configuring' do
begin
default_stretches = Devise.stretches
Devise.stretches = 1
default_stretches = Devise::Models.stretches
Devise::Models.stretches = 1
user = new_user
assert_equal encrypt_password(user, nil, nil), user.encrypted_password
ensure
Devise.stretches = default_stretches
Devise::Models.stretches = default_stretches
end
end

View File

@@ -179,20 +179,20 @@ class ConfirmableTest < ActiveSupport::TestCase
test 'confirm time should fallback to devise confirm in default configuration' do
begin
confirm_within = Devise.confirm_within
Devise.confirm_within = 1.day
confirm_within = Devise::Models.confirm_within
Devise::Models.confirm_within = 1.day
user = new_user
user.confirmation_sent_at = 2.days.ago
assert_not user.active?
Devise.confirm_within = 3.days
Devise::Models.confirm_within = 3.days
assert user.active?
ensure
Devise.confirm_within = confirm_within
Devise::Models.confirm_within = confirm_within
end
end
test 'should be active when confirmation sent at is not overpast' do
Devise.confirm_within = 5.days
Devise::Models.confirm_within = 5.days
user = create_user
user.confirmation_sent_at = 4.days.ago
assert user.active?
@@ -208,21 +208,21 @@ class ConfirmableTest < ActiveSupport::TestCase
end
test 'should not be active when confirmation was sent within the limit' do
Devise.confirm_within = 5.days
Devise::Models.confirm_within = 5.days
user = create_user
user.confirmation_sent_at = 5.days.ago
assert_not user.active?
end
test 'should be active when confirm in is zero' do
Devise.confirm_within = 0.days
Devise::Models.confirm_within = 0.days
user = create_user
user.confirmation_sent_at = Date.today
assert_not user.active?
end
test 'should not be active when confirmation was sent before confirm in time' do
Devise.confirm_within = 4.days
Devise::Models.confirm_within = 4.days
user = create_user
user.confirmation_sent_at = 5.days.ago
assert_not user.active?

View File

@@ -3,7 +3,7 @@ require 'test/test_helper'
class RememberableTest < ActiveSupport::TestCase
def setup
Devise.remember_for = 1
Devise::Models.remember_for = 1
end
test 'should respond to remember_me attribute' do
@@ -91,37 +91,37 @@ class RememberableTest < ActiveSupport::TestCase
test 'remember for should fallback to devise remember for default configuration' do
begin
remember_for = Devise.remember_for
remember_for = Devise::Models.remember_for
user = create_user
Devise.remember_for = 1.day
Devise::Models.remember_for = 1.day
user.remember_me!
assert_not user.remember_expired?
Devise.remember_for = 0.days
Devise::Models.remember_for = 0.days
user.remember_me!
assert user.remember_expired?
ensure
Devise.remember_for = remember_for
Devise::Models.remember_for = remember_for
end
end
test 'remember expires at should sum date of creation with remember for configuration' do
Devise.remember_for = 3.days
Devise::Models.remember_for = 3.days
user = create_user
user.remember_me!
assert_equal 3.days.from_now.to_date, user.remember_expires_at.to_date
Devise.remember_for = 5.days
Devise::Models.remember_for = 5.days
assert_equal 5.days.from_now.to_date, user.remember_expires_at.to_date
end
test 'remember should be expired if remember_for is zero' do
Devise.remember_for = 0.days
Devise::Models.remember_for = 0.days
user = create_user
user.remember_me!
assert user.remember_expired?
end
test 'remember should be expired if it was created before limit time' do
Devise.remember_for = 1.day
Devise::Models.remember_for = 1.day
user = create_user
user.remember_me!
user.update_attribute(:remember_created_at, 2.days.ago)
@@ -129,7 +129,7 @@ class RememberableTest < ActiveSupport::TestCase
end
test 'remember should not be expired if it was created whitin the limit time' do
Devise.remember_for = 30.days
Devise::Models.remember_for = 30.days
user = create_user
user.remember_me!
user.update_attribute(:remember_created_at, 30.days.ago + 2.minutes)