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

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 3c8b55457a463302b10910280370ef9afe95d12a..007f2a3b4f539be8216ded62748d18fbc05f96d4 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,10 +1,13 @@
-OpenStreetMap::Application.configure do
+require "active_support/core_ext/integer/time"
+
+# 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!
+
+Rails.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
-  # 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
 
   # Do not eager load code on boot. This avoids loading your whole application
   config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application


@@ -12,13 +15,16 @@ 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 file server for tests with Cache-Control for performance.
-  config.serve_static_files   = 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.to_i}"
+  }

 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

+  config.cache_store = :null_store

 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false


@@ -26,17 +32,34 @@ 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
 

+  # Store uploaded files on the local file system in a temporary directory.
+  config.active_storage.service = :test
+
+  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
 

-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-

   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
+  # Export translations automatically.
+  config.middleware.use I18n::JS::Middleware
+
+  # Raises error for missing translations.
+  config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
+
+  # Use the test adapter for ActiveJob during testing.
+  config.active_job.queue_adapter = :test

 end
 end