Skip to content

Commit

Permalink
Merge pull request solidusio#5806 from mamhoff/backport-3379
Browse files Browse the repository at this point in the history
[v4.3]  Add support for Sprockets v4 to the DummyApp (backports solidusio#3379)
  • Loading branch information
tvdeyen committed Jun 28, 2024
2 parents 3ded512 + 055ac7c commit aa3e731
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -32,6 +27,7 @@ gem 'rspec-rails', '~> 6.0.3', require: false
gem 'rspec-retry', '~> 0.6.2', require: false
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'rack', '< 3', require: false
gem 'rails-controller-testing', require: false
gem 'puma', '< 6', require: false
gem 'i18n-tasks', '~> 0.9', require: false
Expand Down
5 changes: 4 additions & 1 deletion core/lib/spree/testing_support/dummy_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aa3e731

Please sign in to comment.