diff --git a/Gemfile b/Gemfile index 2bb47a99322..2bf72d6a7a6 100644 --- a/Gemfile +++ b/Gemfile @@ -12,11 +12,6 @@ else end # rubocop:enable Bundler/DuplicatedGem -# Temporarily locking sprockets to v3.x -# see https://github.com/solidusio/solidus/issues/3374 -# and https://github.com/rails/sprockets-rails/issues/369 -gem 'sprockets', '~> 3' - gem 'pry' gem 'launchy', require: false diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb index f78ebf645e9..a557949d5a8 100644 --- a/core/lib/spree/testing_support/dummy_app.rb +++ b/core/lib/spree/testing_support/dummy_app.rb @@ -34,8 +34,11 @@ module ApplicationHelper module DummyApp def self.setup(gem_root:, lib_name:, auto_migrate: true) ENV["LIB_NAME"] = lib_name - DummyApp::Application.config.root = File.join(gem_root, 'spec', 'dummy') + root = Pathname(gem_root).join('spec/dummy') + root.join("app/assets/config").mkpath + root.join("app/assets/config/manifest.js").write("// Intentionally empty\n") + DummyApp::Application.config.root = root DummyApp::Application.initialize! unless DummyApp::Application.initialized? if auto_migrate