Update to rails 4.0.0

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 524cc5137ed57ac9ecfc41e1bbc9997902a58d47..ebbda583634ad7b3c1694f188a9b41b14f2c3e2f 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,5 @@
 OpenStreetMap::Application.configure do
 OpenStreetMap::Application.configure do

-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.

 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that


@@ -7,31 +7,30 @@ OpenStreetMap::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 

-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false

 
 

-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"

 
 

-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.

   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 

-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.

   config.action_dispatch.show_exceptions = false
 
   config.action_dispatch.show_exceptions = false
 

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

 
   # Tell Action Mailer 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
 
 
   # Tell Action Mailer 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
 

-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.

   config.active_support.deprecation = :stderr
 end
   config.active_support.deprecation = :stderr
 end