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

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 2dfea4ea4f4ac616548ab787a5fdee22171d08aa..38975deef664b54cb6332be608fb142fa7c3fe8a 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -15,7 +15,7 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
   # 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}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"

   }
 
   # Show full error reports and disable caching.
   }
 
   # Show full error reports and disable caching.


@@ -27,6 +27,10 @@ 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
+  config.active_storage.service = :test
+

   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.


@@ -37,6 +41,12 @@ 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
+  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.action_view.raise_on_missing_translations = true

+
+  # Use the test adapter for ActiveJob during testing
+  config.active_job.queue_adapter = :test

 end
 end