aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-02-04 20:04:13 +0530
committerVipul A M <vipulnsward@gmail.com>2016-02-04 21:01:45 +0530
commitc074343cffceaa8e5fc97db1f48e58dd8aff4723 (patch)
tree67dc25d29d871e9e4c1659520ad3168b6d90f6ef /railties
parentec1b249cec9d826f32d077eed94a467fe5e74d71 (diff)
downloadrails-c074343cffceaa8e5fc97db1f48e58dd8aff4723.tar.gz
rails-c074343cffceaa8e5fc97db1f48e58dd8aff4723.tar.bz2
rails-c074343cffceaa8e5fc97db1f48e58dd8aff4723.zip
- app generate option --skip-sprockets leaves jquery-rails gem, which relies on sprockets environment
- Remove jquery-rails if --skip-sprockets is true Fixes #23431
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb3
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)