AtHeartEngineer/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-10 08:08:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2525 from jetthoughts/timeoutable-without-rememberable

Browse Source 
Fixed checking for rememberable in timeoutable
This commit is contained in:
José Valim
2013-07-26 00:58:09 -07:00
parent 9bc8e1211b fffbeb5cc7
commit 11a77055f1
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/devise/models/timeoutable.rb
View File

@@ -37,7 +37,7 @@ module Devise
private
def remember_exists_and_not_expired?
return false unless respond_to?(:remember_created_at)
return false unless respond_to?(:remember_created_at) && respond_to?(:remember_expired?)
remember_created_at && !remember_expired?
end

10
test/models/timeoutable_test.rb
View File

@@ -43,4 +43,14 @@ class TimeoutableTest < ActiveSupport::TestCase
test 'required_fields should contain the fields that Devise uses' do
assert_same_content Devise::Models::Timeoutable.required_fields(User), []
end
test 'should not raise error if remember_created_at is not empty and rememberable is disabled' do
user = create_admin(remember_created_at: Time.current)
begin
assert user.timedout?(31.minutes.ago)
rescue NoMethodError => e
refute_includes e.message, "undefined method `remember_expired?' for #<Admin:"
end
end
end