From 84e261b9309d362a210ed55941f2852ec4230038 Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Sun, 27 Oct 2013 10:43:17 +0100 Subject: Removal of javascript related gems when creating an app Commit 0417bc8 add the coffee-rails and javascript runtime gems even when passing the --skip-javascript option but this is not the desired behavior. Also remove all javascript related stuff in the generated application such as the vendor/assets/javascripts folder. --- railties/test/generators/app_generator_test.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 24f01c878c..9b0c9ebf5b 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -298,15 +298,17 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_javascript_is_skipped_if_required run_generator [destination_root, "--skip-javascript"] - assert_file "app/assets/javascripts/application.js" do |contents| - assert_no_match %r{^//=\s+require\s}, contents - end + + assert_no_file "app/assets/javascripts" + assert_no_file "vendor/assets/javascripts" + assert_file "app/views/layouts/application.html.erb" do |contents| assert_match(/stylesheet_link_tag\s+"application", media: "all" %>/, contents) - assert_match(/javascript_include_tag\s+"application" \%>/, contents) + assert_no_match(/javascript_include_tag\s+"application" \%>/, contents) end + assert_file "Gemfile" do |content| - assert_match(/coffee-rails/, content) + assert_no_match(/coffee-rails/, content) end end -- cgit v1.2.3