Merge pull request #47 from nebulab/spaghetticode/check-for-events

Load event subscribers only when Spree::Event is available
solidusio · Jun 5, 2020 · 540b4f6 · 540b4f6
2 parents b4629c3 + 7764ae0
commit 540b4f6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/solidus_support/engine_extensions.rb b/lib/solidus_support/engine_extensions.rb
@@ -32,10 +32,12 @@ def activate
       # This allows to add event subscribers to extensions without explicitly subscribing them,
       # similarly to what happens in Solidus core.
       def load_solidus_subscribers_from(path)
-        path.glob("**/*_subscriber.rb") do |subscriber_path|
-          require_dependency(subscriber_path)
+        if defined? Spree::Event
+          path.glob("**/*_subscriber.rb") do |subscriber_path|
+            require_dependency(subscriber_path)
+          end
+          Spree::Event.subscribers.each(&:subscribe!)
         end
-        Spree::Event.subscribers.each(&:subscribe!)
       end
 
       # Loads decorator files.