diff --git a/Gemfile.lock b/Gemfile.lock index f0cea8db..df46101b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - devise (1.3.1) + devise (1.4.0.dev) bcrypt-ruby (~> 2.1.2) orm_adapter (~> 0.0.3) warden (~> 1.0.3) diff --git a/lib/devise/models/recoverable.rb b/lib/devise/models/recoverable.rb index d444a36e..4b255a53 100644 --- a/lib/devise/models/recoverable.rb +++ b/lib/devise/models/recoverable.rb @@ -60,9 +60,8 @@ module Devise # reset_password_period_valid? # will always return false # def reset_password_period_valid? - return true unless respond_to?(:reset_password_sent_at) - reset_password_sent_at && - reset_password_sent_at.utc >= self.class.reset_password_within.ago + return true unless respond_to?(:reset_password_sent_at) + reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago end protected diff --git a/test/models/recoverable_test.rb b/test/models/recoverable_test.rb index bd28407e..1f596cb7 100644 --- a/test/models/recoverable_test.rb +++ b/test/models/recoverable_test.rb @@ -204,4 +204,11 @@ class RecoverableTest < ActiveSupport::TestCase user.reload assert_not_nil user.reset_password_token end + + test 'should have valid period if does not respond to reset_password_sent_at' do + user = create_user + user.stubs(:respond_to?).with(:reset_password_sent_at).returns(false) + assert user.reset_password_period_valid? + end + end