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 38975deef664b54cb6332be608fb142fa7c3fe8a..007f2a3b4f539be8216ded62748d18fbc05f96d4 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,10 +1,13 @@
+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.
 
 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
-  # 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


@@ -21,6 +24,7 @@ Rails.application.configure do
   # 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


@@ -28,7 +32,7 @@ Rails.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
+  # Store uploaded files on the local file system in a temporary directory.

   config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false
   config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false


@@ -41,12 +45,21 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

-  # Export translations automatically
+  # 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
 
   config.middleware.use I18n::JS::Middleware
 

-  # Raises error for missing translations
-  config.action_view.raise_on_missing_translations = true
+  # 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
+  # Use the test adapter for ActiveJob during testing.

   config.active_job.queue_adapter = :test
 end
   config.active_job.queue_adapter = :test
 end