Merge branch 'master' into openid

[rails.git] / config / environments / test.rb

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 58850a7974fb92dbc7d7cf637466499c8b5dbd1a..a26b6ef9293ec2d155060ab1cad92668723c122e 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -20,3 +20,6 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'