Merge branch 'master' into openid

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index f0689b924bf935c9ca8cb91c578f2cba521e250c..a26b6ef9293ec2d155060ab1cad92668723c122e 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,13 @@ config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 

+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+

 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.

-config.action_mailer.delivery_method = :test
\ No newline at end of file
+config.action_mailer.delivery_method = :test
+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'