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

changing name from *_token! to get_or_create_*_token

Browse Source
This commit is contained in:
Steve Slotnick
2013-06-11 14:14:17 -07:00
parent 3c9cfa50c0
commit b5909f9b93
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ module Devise
end
end
def confirmation_token!
def get_or_create_confirmation_token
generate_confirmation_token! if should_generate_confirmation_token?
self.confirmation_token
end

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

@@ -48,7 +48,7 @@ module Devise
send_devise_notification(:reset_password_instructions)
end
def reset_password_token!
def get_or_create_reset_password_token
generate_reset_password_token! if should_generate_reset_token?
self.reset_password_token
end

4
test/models/confirmable_test.rb
View File

@@ -300,7 +300,7 @@ class ConfirmableTest < ActiveSupport::TestCase
user = create_user
user.update_attribute(:confirmation_sent_at, 4.days.ago)
old = user.confirmation_token
token = user.confirmation_token!
token = user.get_or_create_confirmation_token
assert_not_equal user.confirmation_token, old
assert_equal user.confirmation_token, token
end
@@ -309,7 +309,7 @@ class ConfirmableTest < ActiveSupport::TestCase
test 'should not generate a new token when a valid one exists' do
user = create_user
assert_not_nil user.confirmation_token
assert_equal user.confirmation_token, user.confirmation_token!
assert_equal user.confirmation_token, user.get_or_create_confirmation_token
end
end

12
test/models/recoverable_test.rb
View File

@@ -110,7 +110,7 @@ class RecoverableTest < ActiveSupport::TestCase
test 'should find a user to reset his password based on reset_password_token' do
user = create_user
user.reset_password_token!
user.get_or_create_reset_password_token
reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token)
assert_equal reset_password_user, user
@@ -130,7 +130,7 @@ class RecoverableTest < ActiveSupport::TestCase
test 'should return a new record with errors if password is blank' do
user = create_user
user.reset_password_token!
user.get_or_create_reset_password_token
reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token, :password => '')
assert_not reset_password_user.errors.empty?
@@ -140,7 +140,7 @@ class RecoverableTest < ActiveSupport::TestCase
test 'should reset successfully user password given the new password and confirmation' do
user = create_user
old_password = user.password
user.reset_password_token!
user.get_or_create_reset_password_token
User.reset_password_by_token(
:reset_password_token => user.reset_password_token,
@@ -179,7 +179,7 @@ class RecoverableTest < ActiveSupport::TestCase
swap Devise, :reset_password_within => 1.hour do
user = create_user
old_password = user.password
user.reset_password_token!
user.get_or_create_reset_password_token
user.reset_password_sent_at = 2.days.ago
user.save!
@@ -207,7 +207,7 @@ class RecoverableTest < ActiveSupport::TestCase
user = create_user
assert_nil user.reset_password_token
token = user.reset_password_token!
token = user.get_or_create_reset_password_token
assert_not_nil user.reset_password_token
end
@@ -215,6 +215,6 @@ class RecoverableTest < ActiveSupport::TestCase
user = create_user
user.send :generate_reset_password_token!
assert_not_nil user.reset_password_token
assert_equal user.reset_password_token, user.reset_password_token!
assert_equal user.reset_password_token, user.get_or_create_reset_password_token
end
end