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

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 451eecc50f5acbc79ed7f86e184ab847002c11bb..7ac52c5e4d3030b29432f45f2f7b06803d3ae1b9 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -18,17 +18,14 @@ Rails.application.configure do
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   config.eager_load = ENV["CI"].present?
 
   # 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}"
-  }
+  config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{1.hour.to_i}" }

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

-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true

   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 

-  # Raise exceptions instead of rendering exception templates.
+  # Render exception templates for rescuable exceptions and raise for other exceptions.

   config.action_dispatch.show_exceptions = :rescuable
 
   # Disable request forgery protection in test environment.
   config.action_dispatch.show_exceptions = :rescuable
 
   # Disable request forgery protection in test environment.


@@ -40,6 +37,8 @@ Rails.application.configure do
   # Disable logging in tests, for speed increases. Set to :info to bring back logging
   config.log_level = :warn
 
   # Disable logging in tests, for speed increases. Set to :info to bring back logging
   config.log_level = :warn
 

+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.

   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.


@@ -47,6 +46,10 @@ Rails.application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 

+  # Unlike controllers, the mailer instance doesn't have any context about the
+  # incoming request so you'll need to provide the :host parameter yourself.
+  config.action_mailer.default_url_options = { :host => Settings.server_url }
+

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


@@ -65,7 +68,7 @@ Rails.application.configure do
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 

-  # Raise error when a before_action's only/except options reference missing actions
+  # Raise error when a before_action's only/except options reference missing actions.

   config.action_controller.raise_on_missing_callback_actions = true
 
   # Use the test adapter for ActiveJob during testing.
   config.action_controller.raise_on_missing_callback_actions = true
 
   # Use the test adapter for ActiveJob during testing.