Merge pull request #3394 from JuanitoFatas/patch/fix-warning

Suppress test.rb configuration warning for Rails 4.2.
This commit is contained in:
José Valim
2014-12-31 09:52:21 +01:00

View File

@@ -12,8 +12,13 @@ RailsApp::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
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
if Rails.version >= "4.2.0"
config.serve_static_files = true
else
config.serve_static_assets = true
end
config.static_cache_control = "public, max-age=3600"
# Show full error reports and disable caching.