Skip to content

Commit aa3e731

Browse files
authored
Merge pull request #5806 from mamhoff/backport-3379
[v4.3] Add support for Sprockets v4 to the DummyApp (backports #3379)
2 parents 3ded512 + 055ac7c commit aa3e731

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Gemfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ else
1212
end
1313
# rubocop:enable Bundler/DuplicatedGem
1414

15-
# Temporarily locking sprockets to v3.x
16-
# see https://github.com/solidusio/solidus/issues/3374
17-
# and https://github.com/rails/sprockets-rails/issues/369
18-
gem 'sprockets', '~> 3'
19-
2015
gem 'pry'
2116
gem 'launchy', require: false
2217

@@ -32,6 +27,7 @@ gem 'rspec-rails', '~> 6.0.3', require: false
3227
gem 'rspec-retry', '~> 0.6.2', require: false
3328
gem 'simplecov', require: false
3429
gem 'simplecov-cobertura', require: false
30+
gem 'rack', '< 3', require: false
3531
gem 'rails-controller-testing', require: false
3632
gem 'puma', '< 6', require: false
3733
gem 'i18n-tasks', '~> 0.9', require: false

core/lib/spree/testing_support/dummy_app.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ module ApplicationHelper
3434
module DummyApp
3535
def self.setup(gem_root:, lib_name:, auto_migrate: true)
3636
ENV["LIB_NAME"] = lib_name
37-
DummyApp::Application.config.root = File.join(gem_root, 'spec', 'dummy')
37+
root = Pathname(gem_root).join('spec/dummy')
38+
root.join("app/assets/config").mkpath
39+
root.join("app/assets/config/manifest.js").write("// Intentionally empty\n")
3840

41+
DummyApp::Application.config.root = root
3942
DummyApp::Application.initialize! unless DummyApp::Application.initialized?
4043

4144
if auto_migrate

0 commit comments

Comments
 (0)