aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/isolation
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2019-02-13 10:41:28 -0800
committerXavier Noria <fxn@hashref.com>2019-02-13 12:27:53 -0800
commitc36b6c8d38c33fd03594ba54aaed0e945ddfe0ec (patch)
tree0946312983391ba1178a081eaa09f66e62f5efb6 /railties/test/isolation
parentb4dd69e59b3cb5c34bd58339d5b9a749e2cd82f3 (diff)
downloadrails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.tar.gz
rails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.tar.bz2
rails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.zip
Let Zeitwerk be a dependency of Active Support
Zeitwerk is a strong dependency, planned to replace AS::Dependencies. A line in the generated Gemfile does not convey this as much.
Diffstat (limited to 'railties/test/isolation')
-rw-r--r--railties/test/isolation/abstract_unit.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 47d42645c6..4442cdf4bf 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -491,11 +491,7 @@ Module.new do
# Fake 'Bundler.require' -- we run using the repo's Gemfile, not an
# app-specific one: we don't want to require every gem that lists.
contents = File.read("#{app_template_path}/config/application.rb")
- if RUBY_ENGINE == "ruby"
- contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker zeitwerk).each { |r| require r }")
- else
- contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker).each { |r| require r }")
- end
+ contents.sub!(/^Bundler\.require.*/, "%w(turbolinks webpacker).each { |r| require r }")
File.write("#{app_template_path}/config/application.rb", contents)
require "rails"