Merge pull request #20 from samphilipd/sam/address_rails_5.0_deprecat…

…ion_warnings Fix deprecation warnings for Rails 5.0
derrickreimer · Jan 21, 2016 · 2591226 · 2591226
2 parents 76c56fc + 4c0ac6d
commit 2591226
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
@@ -9,7 +9,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -9,7 +9,7 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -38,4 +38,6 @@
 
   # Required for Rails >= 4.2
   config.eager_load = true
+
+  config.active_support.test_order = :random
 end