diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2016-12-09 12:08:13 +0900 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-12-08 19:08:13 -0800 |
| commit | 23f99ed7eb602c05952e53bc14afb9e692f7053d (patch) | |
| tree | 2fed6e4f26a0293a798550db5791dd4efca954b1 /railties | |
| parent | fbd33b911acd5a4487f37dc1df2aad439c090bfa (diff) | |
| download | rails-23f99ed7eb602c05952e53bc14afb9e692f7053d.tar.gz rails-23f99ed7eb602c05952e53bc14afb9e692f7053d.tar.bz2 rails-23f99ed7eb602c05952e53bc14afb9e692f7053d.zip | |
fix broken tests (#27308)
Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index d7c9ae5266..9285a9f091 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -495,10 +495,10 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_generator_for_yarn_skipped - run_generator([destination_root]) + run_generator([destination_root, "--skip-yarn"]) assert_no_file "vendor/package.json" - assert_file "config/environments/production.rb" do |content| + assert_file "config/initializers/assets.rb" do |content| assert_no_match(/node_modules/, content) end end @@ -741,7 +741,6 @@ class AppGeneratorTest < Rails::Generators::TestCase test/helpers test/integration tmp - vendor/assets/stylesheets ) folders_with_keep.each do |folder| assert_file("#{folder}/.keep") |