aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2019-01-06 01:02:03 +0200
committerbogdanvlviv <bogdanvlviv@gmail.com>2019-01-06 01:07:36 +0200
commit814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1 (patch)
tree67de7e7bd5848ad5e49f2ff05e760b657b262faf /railties/test/generators
parent02d2958b6cd84d687d89112eb7e2306a6a89c082 (diff)
downloadrails-814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1.tar.gz
rails-814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1.tar.bz2
rails-814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1.zip
Revert "Remove node_modules path from assets load paths since we use webpack by default"
This reverts commit 129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d. See https://github.com/rails/rails/commit/02d2958b6cd84d687d89112eb7e2306a6a89c082#commitcomment-31849196
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/shared_generator_tests.rb5
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