aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/shared_generator_tests.rb
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-10-21 23:08:43 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-10-22 16:54:10 +0300
commit2e37fb655d44e29ea68c28957bfa047f40469aeb (patch)
tree9a13f4bece881d4bf81156c28726e50183bc5b1d /railties/test/generators/shared_generator_tests.rb
parentdc6761592009e9146552fc9d6299bf58a34e187a (diff)
downloadrails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.gz
rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.bz2
rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.zip
Remove `--skip-yarn` in favor of `--skip-javascript`
Since #33079 Webpacker the default JavaScript compiler for Rails. Webpacker uses `yarn` so seems like it doesn't make sense for Rails to keep `--skip-yarn` option.
Diffstat (limited to 'railties/test/generators/shared_generator_tests.rb')
-rw-r--r--railties/test/generators/shared_generator_tests.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 9b980bd52b..a40ad158af 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -336,13 +336,14 @@ module SharedGeneratorTests
end
def test_generator_for_yarn
+ skip "#34009 disabled JS by default for plugins" if generator_class.name == "Rails::Generators::PluginGenerator"
run_generator
assert_file "#{application_path}/package.json", /dependencies/
assert_file "#{application_path}/config/initializers/assets.rb", /node_modules/
end
def test_generator_for_yarn_skipped
- run_generator([destination_root, "--skip-yarn"])
+ run_generator([destination_root, "--skip-javascript"])
assert_no_file "#{application_path}/package.json"
assert_no_file "#{application_path}/bin/yarn"