Permalink
Browse files

Merge pull request #3926 from guilleiguaran/skip-assets-group-if-spro…

…ckets-skipped

Skip assets groups if --skip-sprockets option is given
  • Loading branch information...
2 parents 3e55928 + b12a176 commit 7fc0964133d348d7e2d538453dd30bdd769a1827 @wycats wycats committed Dec 10, 2011
Showing with 6 additions and 0 deletions.
  1. +1 −0 railties/lib/rails/generators/app_base.rb
  2. +5 −0 railties/test/generators/app_generator_test.rb
View
1 railties/lib/rails/generators/app_base.rb
@@ -193,6 +193,7 @@ def ruby_debugger_gemfile_entry
end
def assets_gemfile_entry
+ return if options[:skip_sprockets]
<<-GEMFILE.strip_heredoc
# Gems used only for assets and not required
# in production environments by default.
View
5 railties/test/generators/app_generator_test.rb
@@ -206,6 +206,11 @@ def test_generator_if_skip_sprockets_is_given
assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
assert_no_match(/config\.assets\.enabled = true/, content)
end
+ assert_file "Gemfile" do |content|
+ assert_no_match(/sass-rails/, content)
+ assert_no_match(/coffee-rails/, content)
+ assert_no_match(/uglifier/, content)
+ end
assert_file "test/performance/browsing_test.rb"
end

0 comments on commit 7fc0964

Please sign in to comment.