Merge branch 'rails42'

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

diff --git a/config/environments/test.rb b/config/environments/test.rb
index b0ff645a0195d9813dbc3139a0ae658f29fbfa94..3c8b55457a463302b10910280370ef9afe95d12a 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -12,8 +12,8 @@ OpenStreetMap::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -31,6 +31,9 @@ OpenStreetMap::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr