Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix: string subscribers crash register_subscribers! outside development/test (#14768)

Matthew Kennedyc90d33f71cef
diff --git a/spree/core/lib/spree/events.rb b/spree/core/lib/spree/events.rb
index e761afc86e..e263405ad5 100644
--- a/spree/core/lib/spree/events.rb
+++ b/spree/core/lib/spree/events.rb
@@ -151,11 +151,12 @@ module Spree
# In development, Zeitwerk may have reloaded the class, creating a new
# class object while the old one is still referenced in Spree.subscribers.
# This method resolves the constant fresh to get the current class.
+ # A class name given as a String is resolved in every environment.
#
# @param subscriber [Class, String] The subscriber class or class name
# @return [Class, nil] The resolved class or nil if not found
def resolve_subscriber(subscriber)
- return subscriber unless Rails.env.development? || Rails.env.test?
+ return subscriber unless subscriber.is_a?(String) || Rails.env.development? || Rails.env.test?
class_name = subscriber.is_a?(String) ? subscriber : subscriber.name
return nil unless class_name
diff --git a/spree/core/spec/lib/spree/events_spec.rb b/spree/core/spec/lib/spree/events_spec.rb
index 7dee97d43e..777572f0a1 100644
--- a/spree/core/spec/lib/spree/events_spec.rb
+++ b/spree/core/spec/lib/spree/events_spec.rb
@@ -279,6 +279,24 @@ RSpec.describe Spree::Events, events: true do
expect(result).to eq(subscriber)
end
+ it 'resolves string class names in production' do
+ allow(Rails.env).to receive(:development?).and_return(false)
+ allow(Rails.env).to receive(:test?).and_return(false)
+
+ result = described_class.resolve_subscriber('Spree::Subscriber')
+
+ expect(result).to eq(Spree::Subscriber)
+ end
+
+ it 'returns nil for invalid string class names in production' do
+ allow(Rails.env).to receive(:development?).and_return(false)
+ allow(Rails.env).to receive(:test?).and_return(false)
+
+ result = described_class.resolve_subscriber('NonExistent::Class')
+
+ expect(result).to be_nil
+ end
+
it 'resolves subscriber by name in development' do
allow(Rails.env).to receive(:development?).and_return(true)
@@ -346,5 +364,15 @@ RSpec.describe Spree::Events, events: true do
# The constant TestEventSubscriber should be resolved, not the old_class directly
expect(described_class.subscriptions.first.subscriber).to eq(TestEventSubscriber)
end
+
+ it 'registers subscribers given as class names in production' do
+ allow(Rails.env).to receive(:development?).and_return(false)
+ allow(Rails.env).to receive(:test?).and_return(false)
+ allow(Spree).to receive(:subscribers).and_return(['TestEventSubscriber'])
+
+ described_class.register_subscribers!
+
+ expect(described_class.subscriptions.first.subscriber).to eq(TestEventSubscriber)
+ end
end
end