Merge pull request #2358 from jhawthorn/no_sprockets

Allow loading solidus_core without Sprockets
solidusio · Nov 15, 2017 · 87154a0 · 87154a0
2 parents 82d8a5a + 15b450a
commit 87154a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/config/initializers/assets.rb b/core/config/initializers/assets.rb
@@ -1 +1,3 @@
-Rails.application.config.assets.precompile << 'solidus_core_manifest.js'
+if Rails.application.config.respond_to?(:assets)
+  Rails.application.config.assets.precompile << 'solidus_core_manifest.js'
+end
diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb
@@ -73,8 +73,10 @@ class Application < ::Rails::Application
 
     config.action_controller.include_all_helpers = false
 
-    config.assets.paths << File.expand_path('../dummy_app/assets/javascripts', __FILE__)
-    config.assets.paths << File.expand_path('../dummy_app/assets/stylesheets', __FILE__)
+    if config.respond_to?(:assets)
+      config.assets.paths << File.expand_path('../dummy_app/assets/javascripts', __FILE__)
+      config.assets.paths << File.expand_path('../dummy_app/assets/stylesheets', __FILE__)
+    end
 
     config.paths["config/database"] = File.expand_path('../dummy_app/database.yml', __FILE__)
     config.paths['app/views'] = File.expand_path('../dummy_app/views', __FILE__)