aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-02-21 17:33:31 +0100
committerGitHub <noreply@github.com>2017-02-21 17:33:31 +0100
commit8e9e94391902b854662ba5eb06cc006cc4e85212 (patch)
tree016e6712fce4e24a6105701c5668fdb00a898727 /railties/test/generators
parent1d8466c38804a555df58ebe214c9aa0e240ad856 (diff)
downloadrails-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')
-rw-r--r--railties/test/generators/api_app_generator_test.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index c54d9cc599..bdef1798f8 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -117,7 +117,7 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
public/apple-touch-icon-precomposed.png
public/apple-touch-icon.png
public/favicon.icon
- vendor/package.json
+ package.json
)
end
end
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