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 b0ff645a0195d9813dbc3139a0ae658f29fbfa94..2dfea4ea4f4ac616548ab787a5fdee22171d08aa 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-OpenStreetMap::Application.configure do
+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
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's


@@ -12,9 +12,11 @@ OpenStreetMap::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 

-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
+  # 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.
   config.consider_all_requests_local       = true
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true


@@ -25,6 +27,7 @@ OpenStreetMap::Application.configure do
 
   # 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
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the


@@ -35,5 +38,5 @@ OpenStreetMap::Application.configure do
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations

-  # config.action_view.raise_on_missing_translations = true
+  config.action_view.raise_on_missing_translations = true

 end
 end