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

…-sprockets-skipped Skip assets groups if --skip-sprockets option is given
drogus · Dec 10, 2011 · 7fc0964 · 7fc0964
2 parents 3e55928 + b12a176
commit 7fc0964
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/railties/lib/rails/generators/app_base.rb b/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.

diff --git a/railties/test/generators/app_generator_test.rb b/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