Skip to content

Commit

Permalink
Switch to using propshaft as the default (still need to find a way to…
Browse files Browse the repository at this point in the history
… tests against sprockets too)
  • Loading branch information
dhh committed May 15, 2024
1 parent ea0723c commit 39d28b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "minitest", ">= 5.15.0", "< 5.22.0"
# We need a newish Rake since Active Job sets its test tasks' descriptions.
gem "rake", ">= 13"

gem "sprockets-rails", ">= 2.0.0"
gem "sprockets-rails", ">= 2.0.0", require: false
gem "propshaft", ">= 0.1.7"
gem "capybara", ">= 3.39"
gem "selenium-webdriver", ">= 4.20.0"
Expand Down
4 changes: 2 additions & 2 deletions railties/test/isolation/abstract_unit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ def self.sh(cmd)
# 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")
contents.sub!(/^Bundler\.require.*/, "%w(sprockets/railtie importmap-rails).each { |r| require r }")
contents.sub!(/^Bundler\.require.*/, "%w(importmap-rails).each { |r| require r }")
File.write("#{app_template_path}/config/application.rb", contents)

require "rails"
Expand All @@ -637,7 +637,7 @@ def self.sh(cmd)
require "action_cable"
require "action_mailbox"
require "action_text"
require "sprockets"
require "propshaft"

require "action_view/helpers"
require "action_dispatch/routing/route_set"
Expand Down

0 comments on commit 39d28b0

Please sign in to comment.