aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/shared_generator_tests.rb
diff options
context:
space:
mode:
authorJavan Makhmali <javan@javan.us>2019-01-10 11:50:32 -0500
committerGitHub <noreply@github.com>2019-01-10 11:50:32 -0500
commit2163762c3cd7cb58223f882405ed3c6dcfb6a2cd (patch)
tree567546bda56ed0be9b3408ec10ead32adc62e43a /railties/test/generators/shared_generator_tests.rb
parent9edc84cdfa8908a436901d85309cadf65d457d8f (diff)
parent86b489e3d6a9efbefbc62e8531d0f5850934d4e1 (diff)
downloadrails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.tar.gz
rails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.tar.bz2
rails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.zip
Merge pull request #34905 from javan/move-npm-packages-to-rails-scope
Move all npm packages to @rails scope
Diffstat (limited to 'railties/test/generators/shared_generator_tests.rb')
-rw-r--r--railties/test/generators/shared_generator_tests.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 4dfcb35ad9..f673832caa 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -206,7 +206,7 @@ module SharedGeneratorTests
unless generator_class.name == "Rails::Generators::PluginGenerator"
assert_file "#{application_path}/app/javascript/packs/application.js" do |content|
- assert_match(/^import \* as ActiveStorage from "activestorage"\nActiveStorage.start\(\)/, content)
+ assert_match(/^import \* as ActiveStorage from "@rails\/activestorage"\nActiveStorage.start\(\)/, content)
end
end
@@ -267,7 +267,7 @@ module SharedGeneratorTests
assert_file "#{application_path}/config/application.rb", /#\s+require\s+["']active_storage\/engine["']/
assert_file "#{application_path}/app/javascript/packs/application.js" do |content|
- assert_no_match(/^import * as ActiveStorage from "activestorage"\nActiveStorage.start\(\)/, content)
+ assert_no_match(/^import * as ActiveStorage from "@rails\/activestorage"\nActiveStorage.start\(\)/, content)
end
assert_file "#{application_path}/config/environments/development.rb" do |content|