Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 18 insertions, 18 deletions

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4ce45527a..39b4738b7 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,25 +1,25 @@
 # Settings specified here will take precedence over those in config/environment.rb
+RedmineApp::Application.configure do
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
 
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils    = true
+  # Show full error reports and disable caching
+  #config.action_controller.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.delivery_method = :test
 
-config.action_mailer.perform_deliveries = true
-config.action_mailer.delivery_method = :test
+  # Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
+  config.action_controller.allow_forgery_protection = false
 
-config.action_controller.session = { 
-  :key => "_test_session",
-  :secret => "some secret phrase for the tests."
-}
+  config.active_support.deprecation = :log
 
-# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
-config.action_controller.allow_forgery_protection  = false
+  config.secret_token = 'a secret token for running the tests'
+end