Upgrade to Rails 5.0.0.1

1 files changed, 5 insertions, 5 deletions

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1ef379f40..fea1c51fd 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,8 +13,10 @@ Rails.application.configure do
   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'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => 'public, max-age=3600'
+  }
   config.assets.digest = false
 
   # Show full error reports and disable caching.
@@ -31,9 +33,7 @@ Rails.application.configure do
   # 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
+  config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr