diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-10-27 11:53:04 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-10-27 11:53:04 -0700 |
| commit | 494b62826b6257f145cce9ebbd58a1d842486621 (patch) | |
| tree | fcaa2c71ff7d36f2d22dd58caf5a2bedf00f430a /railties/test/generators/app_generator_test.rb | |
| parent | b7ca9b52fe23f979ca5c60039faeac3d844e3ee3 (diff) | |
| parent | 84e261b9309d362a210ed55941f2852ec4230038 (diff) | |
| download | rails-494b62826b6257f145cce9ebbd58a1d842486621.tar.gz rails-494b62826b6257f145cce9ebbd58a1d842486621.tar.bz2 rails-494b62826b6257f145cce9ebbd58a1d842486621.zip | |
Merge pull request #12657 from robin850/skip-javascript
Removal of javascript related files when creating an app
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 12 |
1 files changed, 7 insertions, 5 deletions
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 |