Merge pull request #3926 from guilleiguaran/skip-assets-group-if-sprockets-skipped

Skip assets groups if --skip-sprockets option is given

railties/lib/rails/generators/app_base.rb

@@ -193,6 +193,7 @@ module Rails
       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.

railties/test/generators/app_generator_test.rb

@@ -206,6 +206,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
       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