diff --git a/test/fixtures/alternate_config_project/config/environments/production.rb b/test/fixtures/alternate_config_project/config/environments/production.rb index 0f3681b..71f2cff 100644 --- a/test/fixtures/alternate_config_project/config/environments/production.rb +++ b/test/fixtures/alternate_config_project/config/environments/production.rb @@ -11,7 +11,11 @@ config.action_controller.perform_caching = true # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false + if config.respond_to?(:serve_static_files) + config.serve_static_files = false + else + config.serve_static_assets = false + end # Compress JavaScripts and CSS config.assets.css_compressor = :yui diff --git a/test/fixtures/alternate_config_project/config/environments/test.rb b/test/fixtures/alternate_config_project/config/environments/test.rb index 52ca901..f9f3386 100644 --- a/test/fixtures/alternate_config_project/config/environments/test.rb +++ b/test/fixtures/alternate_config_project/config/environments/test.rb @@ -8,7 +8,11 @@ config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + if config.respond_to?(:serve_static_files) + config.serve_static_files = true + else + config.serve_static_assets = true + end config.static_cache_control = "public, max-age=3600" config.eager_load = false diff --git a/test/fixtures/engine_project/test/dummy/config/environments/production.rb b/test/fixtures/engine_project/test/dummy/config/environments/production.rb index 819af12..515dcda 100644 --- a/test/fixtures/engine_project/test/dummy/config/environments/production.rb +++ b/test/fixtures/engine_project/test/dummy/config/environments/production.rb @@ -20,7 +20,11 @@ # config.action_dispatch.rack_cache = true # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false + if config.respond_to?(:serve_static_files) + config.serve_static_files = false + else + config.serve_static_assets = false + end # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier diff --git a/test/fixtures/engine_project/test/dummy/config/environments/test.rb b/test/fixtures/engine_project/test/dummy/config/environments/test.rb index 57f8e2b..97c5c2b 100644 --- a/test/fixtures/engine_project/test/dummy/config/environments/test.rb +++ b/test/fixtures/engine_project/test/dummy/config/environments/test.rb @@ -13,7 +13,11 @@ config.eager_load = false # Configure static asset server for tests with Cache-Control for performance. - config.serve_static_assets = true + if config.respond_to?(:serve_static_files) + 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. diff --git a/test/fixtures/sass_project/config/environments/production.rb b/test/fixtures/sass_project/config/environments/production.rb index c2ee4a2..9f2f678 100644 --- a/test/fixtures/sass_project/config/environments/production.rb +++ b/test/fixtures/sass_project/config/environments/production.rb @@ -12,7 +12,11 @@ config.action_controller.perform_caching = true # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false + if config.respond_to?(:serve_static_files) + config.serve_static_files = false + else + config.serve_static_assets = false + end # Specify the default JavaScript compressor config.assets.js_compressor = :uglifier diff --git a/test/fixtures/sass_project/config/environments/test.rb b/test/fixtures/sass_project/config/environments/test.rb index f3b684a..e1219be 100644 --- a/test/fixtures/sass_project/config/environments/test.rb +++ b/test/fixtures/sass_project/config/environments/test.rb @@ -11,7 +11,11 @@ config.eager_load = false # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + if config.respond_to?(:serve_static_files) + 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 diff --git a/test/fixtures/scss_project/config/environments/production.rb b/test/fixtures/scss_project/config/environments/production.rb index 056d19c..9825b59 100644 --- a/test/fixtures/scss_project/config/environments/production.rb +++ b/test/fixtures/scss_project/config/environments/production.rb @@ -11,7 +11,11 @@ config.action_controller.perform_caching = true # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false + if config.respond_to?(:serve_static_files) + config.serve_static_files = false + else + config.serve_static_assets = false + end # Specify the default JavaScript compressor config.assets.js_compressor = :uglifier diff --git a/test/fixtures/scss_project/config/environments/test.rb b/test/fixtures/scss_project/config/environments/test.rb index a56003f..d1544b4 100644 --- a/test/fixtures/scss_project/config/environments/test.rb +++ b/test/fixtures/scss_project/config/environments/test.rb @@ -10,7 +10,11 @@ config.eager_load = false # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + if config.respond_to?(:serve_static_files) + 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 diff --git a/test/gemfiles/Gemfile-rails-4-2 b/test/gemfiles/Gemfile-rails-4-2 index 802ba4c..516c853 100644 --- a/test/gemfiles/Gemfile-rails-4-2 +++ b/test/gemfiles/Gemfile-rails-4-2 @@ -3,4 +3,4 @@ source "https://rubygems.org" # Specify your gem"s dependencies in sass-rails.gemspec gemspec path: "../.." -gem "rails", "4.2.0.rc1" +gem "rails", "~> 4.2.0"