diff options
| author | Yehuda Katz <wycats@gmail.com> | 2011-12-11 09:26:36 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2011-12-11 09:26:36 -0800 |
| commit | 75a9d88f5f4fea1e0a58655713208b5915a67eb9 (patch) | |
| tree | be8829018d5cc9cdc69a8b26f65b3ed33136510e /railties | |
| parent | aa6aa9b25dce80d2d9d63d6784a00be3cfda8d2e (diff) | |
| parent | ea5a70a462b463d46b4ec558cbf3e8db685acaf0 (diff) | |
| download | rails-75a9d88f5f4fea1e0a58655713208b5915a67eb9.tar.gz rails-75a9d88f5f4fea1e0a58655713208b5915a67eb9.tar.bz2 rails-75a9d88f5f4fea1e0a58655713208b5915a67eb9.zip | |
Merge pull request #3936 from guilleiguaran/skip-assets-options-when-sprockets-skipped
Skip assets options in environments files when --skip-sprockets is used
Diffstat (limited to 'railties')
3 files changed, 13 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index beaf941282..9e53b6a70d 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -31,9 +31,11 @@ config.active_record.auto_explain_threshold_in_seconds = 0.5 <%- end -%> + <%- unless options.skip_sprockets? -%> # Do not compress assets config.assets.compress = false # Expands the lines which load the assets config.assets.debug = true + <%- end -%> end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 40ec3fc644..0f571f7c1a 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -11,6 +11,7 @@ # Disable Rails's static asset server (Apache or nginx will already do this) config.serve_static_assets = false + <%- unless options.skip_sprockets? -%> # Compress JavaScripts and CSS config.assets.compress = true @@ -22,6 +23,7 @@ # Defaults to Rails.root.join("public/assets") # config.assets.manifest = YOUR_PATH + <%- end -%> # Specifies the header that your server uses for sending files # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache @@ -45,8 +47,10 @@ # Enable serving of images, stylesheets, and JavaScripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" + <%- unless options.skip_sprockets? -%> # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # config.assets.precompile += %w( search.js ) + <%- end -%> # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 4c22e7a3ce..ef9f2b22a7 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -211,6 +211,13 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_match(/coffee-rails/, content) assert_no_match(/uglifier/, content) end + assert_file "config/environments/development.rb" do |content| + assert_no_match(/config\.assets\.debug = true/, content) + end + assert_file "config/environments/production.rb" do |content| + assert_no_match(/config\.assets\.digest = true/, content) + assert_no_match(/config\.assets\.compress = true/, content) + end assert_file "test/performance/browsing_test.rb" end |