Merge branch 'pull/3472'

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index fad06fe51cd83e9510843b365d39fcd6bd0c8422..875716e507d5730a977668a2494ac1a587731311 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,5 @@
+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
 # 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


@@ -6,12 +8,13 @@
 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.
 

+  # Turn false under Spring and add config.action_view.cache_template_loading = true

   config.cache_classes = true
 
   config.cache_classes = true
 

-  # 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
+  # Eager loading loads your whole application. When running a single test locally,
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # system, or in some way before deploying your code.
+  config.eager_load = ENV["CI"].present?

 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true


@@ -43,11 +46,20 @@ 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
 

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

-  config.action_view.raise_on_missing_translations = true
+  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
 
   # Use the test adapter for ActiveJob during testing.
   config.active_job.queue_adapter = :test