diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-04 14:03:45 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-04 14:03:45 -0200 |
| commit | d3fd7b99c125758bb53f3dfe002ab6a34f33b20b (patch) | |
| tree | 67dc25d29d871e9e4c1659520ad3168b6d90f6ef | |
| parent | ec1b249cec9d826f32d077eed94a467fe5e74d71 (diff) | |
| parent | c074343cffceaa8e5fc97db1f48e58dd8aff4723 (diff) | |
| download | rails-d3fd7b99c125758bb53f3dfe002ab6a34f33b20b.tar.gz rails-d3fd7b99c125758bb53f3dfe002ab6a34f33b20b.tar.bz2 rails-d3fd7b99c125758bb53f3dfe002ab6a34f33b20b.zip | |
Merge pull request #23479 from vipulnsward/23431-remove-jquery-on-sprockets-skip
Remove jquery-rails gem from generator if --skip-sprockets is true
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 961efd05e3..9b1e16a7a3 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -317,7 +317,7 @@ module Rails end def javascript_gemfile_entry - if options[:skip_javascript] + if options[:skip_javascript] || options[:skip_sprockets] [] else gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry] diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b954738ff2..f483a0bcbd 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -385,9 +385,10 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content) end assert_file "Gemfile" do |content| + assert_no_match(/jquery-rails/, content) assert_no_match(/sass-rails/, content) assert_no_match(/uglifier/, content) - assert_match(/coffee-rails/, content) + assert_no_match(/coffee-rails/, content) end assert_file "config/environments/development.rb" do |content| assert_no_match(/config\.assets\.debug = true/, content) |