diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2017-02-21 17:33:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-21 17:33:31 +0100 |
commit | 8e9e94391902b854662ba5eb06cc006cc4e85212 (patch) | |
tree | 016e6712fce4e24a6105701c5668fdb00a898727 /railties/test/generators/app_generator_test.rb | |
parent | 1d8466c38804a555df58ebe214c9aa0e240ad856 (diff) | |
download | rails-8e9e94391902b854662ba5eb06cc006cc4e85212.tar.gz rails-8e9e94391902b854662ba5eb06cc006cc4e85212.tar.bz2 rails-8e9e94391902b854662ba5eb06cc006cc4e85212.zip |
Revert back to the original of using package.json in the root of the project (#28093)
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index bd1b412b36..1ac2b4cde0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -422,7 +422,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_if_skip_yarn_is_given run_generator [destination_root, "--skip-yarn"] - assert_no_file "vendor/package.json" + assert_no_file "package.json" assert_no_file "bin/yarn" end @@ -497,21 +497,21 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_for_yarn run_generator([destination_root]) - assert_file "vendor/package.json", /dependencies/ + assert_file "package.json", /dependencies/ assert_file "config/initializers/assets.rb", /node_modules/ end def test_generator_for_yarn_skipped run_generator([destination_root, "--skip-yarn"]) - assert_no_file "vendor/package.json" + assert_no_file "package.json" assert_file "config/initializers/assets.rb" do |content| assert_no_match(/node_modules/, content) end assert_file ".gitignore" do |content| - assert_no_match(/vendor\/node_modules/, content) - assert_no_match(/vendor\/yarn-error\.log/, content) + assert_no_match(/node_modules/, content) + assert_no_match(/yarn-error\.log/, content) end end |