aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-10-10 09:11:05 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2013-10-10 09:11:05 -0700
commita8a33ac663fce963a59517132c1154f43e9a85ad (patch)
tree15b3adf8d41331c8366ef7666127d0b5ffc7f8ab /activemodel/test
parent9dbd208562ccd3d68009a72d37cbfe29b94f98c4 (diff)
parent5d7b413d84e5858dba50e716c31981b42c40aba6 (diff)
downloadrails-a8a33ac663fce963a59517132c1154f43e9a85ad.tar.gz
rails-a8a33ac663fce963a59517132c1154f43e9a85ad.tar.bz2
rails-a8a33ac663fce963a59517132c1154f43e9a85ad.zip
Merge pull request #12339 from tjschuck/bcrypt_cost_attr
Use bcrypt's public cost attr instead of internal constant
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/secure_password_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 98e5c747d5..41d0b2263e 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -82,6 +82,14 @@ class SecurePasswordTest < ActiveModel::TestCase
assert_equal BCrypt::Engine::DEFAULT_COST, @user.password_digest.cost
end
+ test "Password digest cost honors bcrypt cost attribute when min_cost is false" do
+ ActiveModel::SecurePassword.min_cost = false
+ BCrypt::Engine.cost = 5
+
+ @user.password = "secret"
+ assert_equal BCrypt::Engine.cost, @user.password_digest.cost
+ end
+
test "Password digest cost can be set to bcrypt min cost to speed up tests" do
ActiveModel::SecurePassword.min_cost = true