Use BCrypt's MIN_COST in the test environment for speedier tests

5 files changed, 52 insertions, 2 deletions

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index aa42bf762f..133bb558a9 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Use BCrypt's MIN_COST in the test environment for speedier tests when using `has_secure_pasword`.
+
+    *Brian Cardarella + Jeremy Kemper + Trevor Turk*
+
 *   Add `ActiveModel::ForbiddenAttributesProtection`, a simple module to
     protect attributes from mass assignment when non-permitted attributes are passed.
 
diff --git a/activemodel/lib/active_model/railtie.rb b/activemodel/lib/active_model/railtie.rb
index 75cde900e3..1671eb7bd4 100644
--- a/activemodel/lib/active_model/railtie.rb
+++ b/activemodel/lib/active_model/railtie.rb
@@ -4,5 +4,9 @@ require "rails"
 module ActiveModel
   class Railtie < Rails::Railtie # :nodoc:
     config.eager_load_namespaces << ActiveModel
+
+    initializer "active_model.secure_password" do
+      ActiveModel::SecurePassword.min_cost = Rails.env.test?
+    end
   end
 end
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index 4b328b399a..3dc615c9f3 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -2,6 +2,8 @@ module ActiveModel
   module SecurePassword
     extend ActiveSupport::Concern
 
+    class << self; attr_accessor :min_cost; end
+
     module ClassMethods
       # Adds methods to set and authenticate against a BCrypt password.
       # This mechanism requires you to have a password_digest attribute.
@@ -88,7 +90,8 @@ module ActiveModel
       def password=(unencrypted_password)
         unless unencrypted_password.blank?
           @password = unencrypted_password
-          self.password_digest = BCrypt::Password.create(unencrypted_password)
+          cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine::DEFAULT_COST
+          self.password_digest = BCrypt::Password.create(unencrypted_password, cost: cost)
         end
       end
     end
diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb
new file mode 100644
index 0000000000..f89a288f8f
--- /dev/null
+++ b/activemodel/test/cases/railtie_test.rb
@@ -0,0 +1,28 @@
+require 'cases/helper'
+require 'active_support/testing/isolation'
+
+class RailtieTest < ActiveModel::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    require 'rails/all'
+
+    @app ||= Class.new(::Rails::Application).tap do |app|
+      app.config.eager_load = false
+    end
+  end
+
+  test 'secure password min_cost is false in the development environment' do
+    Rails.env = 'development'
+    @app.initialize!
+
+    assert_equal false, ActiveModel::SecurePassword.min_cost
+  end
+
+  test 'secure password min_cost is true in the test environment' do
+    Rails.env = 'test'
+    @app.initialize!
+
+    assert_equal true, ActiveModel::SecurePassword.min_cost
+  end
+end
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 509e2fdbb5..c7e93370ec 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -63,10 +63,21 @@ class SecurePasswordTest < ActiveModel::TestCase
       @user.run_callbacks :create
     end
   end
-  
+
   test "Oauthed user can be created with blank digest" do
     assert_nothing_raised do
       @oauthed_user.run_callbacks :create
     end
   end
+
+  test "Password digest cost defaults to bcrypt default cost" do
+    @user.password = "secret"
+    assert_equal BCrypt::Engine::DEFAULT_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
+    @user.password = "secret"
+    assert_equal BCrypt::Engine::MIN_COST, @user.password_digest.cost
+  end
 end