From e62e68e25bb7b1281e20e228db66f7deace4330f Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Sun, 8 Jul 2018 13:56:07 +0300 Subject: has_secure_password: use `recovery_password` instead of `activation_token` Since we have `has_secure_token`, it is too confusing to use `_token` suffix with `has_secure_password`. Context https://github.com/rails/rails/pull/33307#discussion_r200807185 --- activemodel/test/cases/secure_password_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activemodel/test/cases') diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb index 327661a9ca..9ef1148be8 100644 --- a/activemodel/test/cases/secure_password_test.rb +++ b/activemodel/test/cases/secure_password_test.rb @@ -186,7 +186,7 @@ class SecurePasswordTest < ActiveModel::TestCase test "authenticate" do @user.password = "secret" - @user.activation_token = "new_token" + @user.recovery_password = "42password" assert_equal false, @user.authenticate("wrong") assert_equal @user, @user.authenticate("secret") @@ -194,8 +194,8 @@ class SecurePasswordTest < ActiveModel::TestCase assert_equal false, @user.authenticate_password("wrong") assert_equal @user, @user.authenticate_password("secret") - assert_equal false, @user.authenticate_activation_token("wrong") - assert_equal @user, @user.authenticate_activation_token("new_token") + assert_equal false, @user.authenticate_recovery_password("wrong") + assert_equal @user, @user.authenticate_recovery_password("42password") end test "Password digest cost defaults to bcrypt default cost when min_cost is false" do -- cgit v1.2.3