diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-07-26 13:25:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 13:25:30 -0500 |
| commit | cbc61f513641ef3c311d671c322dc93f2d37d7fc (patch) | |
| tree | da77dea5bbf51719c9c12b3e9bbf992af9a44154 /railties/test | |
| parent | 49315e278944b65f2ffd1c95caf342b17a692327 (diff) | |
| parent | 09ed4e95acd56a62449c8817d6e7c62bc34d2262 (diff) | |
| download | rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.tar.gz rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.tar.bz2 rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.zip | |
Merge pull request #25919 from benpickles/skip-javascript-also-skips-uglifier
Uglifier should not be included when generating a new app with `--skip-javascript`
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b968f9f207..09309b5cd0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -468,6 +468,11 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |content| assert_no_match(/coffee-rails/, content) assert_no_match(/jquery-rails/, content) + assert_no_match(/uglifier/, content) + end + + assert_file "config/environments/production.rb" do |content| + assert_no_match(/config\.assets\.js_compressor = :uglifier/, content) end end |