diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2019-01-05 18:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 18:29:55 -0500 |
| commit | 1e09019088760adafaa122eb11c24effdb4c1160 (patch) | |
| tree | 67de7e7bd5848ad5e49f2ff05e760b657b262faf /railties/test | |
| parent | 02d2958b6cd84d687d89112eb7e2306a6a89c082 (diff) | |
| parent | 814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1 (diff) | |
| download | rails-1e09019088760adafaa122eb11c24effdb4c1160.tar.gz rails-1e09019088760adafaa122eb11c24effdb4c1160.tar.bz2 rails-1e09019088760adafaa122eb11c24effdb4c1160.zip | |
Merge pull request #34882 from bogdanvlviv/revert-129f8ac6ff
Revert "Remove node_modules path from assets load paths since we use webpack by default"
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 670f521a0f..4dfcb35ad9 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -346,11 +346,16 @@ module SharedGeneratorTests run_generator assert_file "#{application_path}/package.json", /dependencies/ assert_file "#{application_path}/bin/yarn" + assert_file "#{application_path}/config/initializers/assets.rb", /node_modules/ end def test_generator_for_yarn_skipped run_generator([destination_root, "--skip-javascript"]) assert_no_file "#{application_path}/package.json" assert_no_file "#{application_path}/bin/yarn" + + assert_file "#{application_path}/config/initializers/assets.rb" do |content| + assert_no_match(/node_modules/, content) + end end end |