Merge remote-tracking branch 'upstream/pull/1704'

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index fe1d1aa780d93f4f27163276c10cc3088dac96c8..2dfea4ea4f4ac616548ab787a5fdee22171d08aa 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,37 +1,42 @@
-OpenStreetMap::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.

 
   # The test environment is used exclusively to run your application's
 
   # The test environment is used exclusively to run your application's

-  # test suite.  You never need to work with it otherwise.  Remember that
+  # 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
   # 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!
+  # and recreated between test runs. Don't rely on the data there!

   config.cache_classes = true
 
   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 public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}"
+  }

 
 

-  # 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
+  config.action_mailer.perform_caching = 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
 

-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.

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

-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
+  # Raises error for missing translations
+  config.action_view.raise_on_missing_translations = true

 end
 end