Skip to content

Commit 87154a0

Browse files
authored
Merge pull request #2358 from jhawthorn/no_sprockets
Allow loading solidus_core without Sprockets
2 parents 82d8a5a + 15b450a commit 87154a0

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

core/config/initializers/assets.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
Rails.application.config.assets.precompile << 'solidus_core_manifest.js'
1+
if Rails.application.config.respond_to?(:assets)
2+
Rails.application.config.assets.precompile << 'solidus_core_manifest.js'
3+
end

core/lib/spree/testing_support/dummy_app.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ class Application < ::Rails::Application
7373

7474
config.action_controller.include_all_helpers = false
7575

76-
config.assets.paths << File.expand_path('../dummy_app/assets/javascripts', __FILE__)
77-
config.assets.paths << File.expand_path('../dummy_app/assets/stylesheets', __FILE__)
76+
if config.respond_to?(:assets)
77+
config.assets.paths << File.expand_path('../dummy_app/assets/javascripts', __FILE__)
78+
config.assets.paths << File.expand_path('../dummy_app/assets/stylesheets', __FILE__)
79+
end
7880

7981
config.paths["config/database"] = File.expand_path('../dummy_app/database.yml', __FILE__)
8082
config.paths['app/views'] = File.expand_path('../dummy_app/views', __FILE__)

0 commit comments

Comments
 (0)