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.

Fixed Bug: Incorrect override detection for proc-based API dependencies

Damian Legawiec838cb135f320
diff --git a/api/spec/models/spree/api_dependencies_spec.rb b/api/spec/models/spree/api_dependencies_spec.rb
index 55a70e21bc..05317aba01 100644
--- a/api/spec/models/spree/api_dependencies_spec.rb
+++ b/api/spec/models/spree/api_dependencies_spec.rb
@@ -93,9 +93,11 @@ describe 'Spree.api accessor' do
end
describe 'Spree.api.<dependency>=' do
- let(:original_value) { Spree::Api::Dependencies.storefront_coupon_handler }
-
- after do
+ # Use around hook with ensure to guarantee cleanup even if test fails
+ around do |example|
+ original_value = Spree::Api::Dependencies.storefront_coupon_handler
+ example.run
+ ensure
# Restore original value using setter (which clears memoization)
Spree::Api::Dependencies.storefront_coupon_handler = original_value
# Clear override tracking for this test
diff --git a/core/lib/spree/core/dependencies_helper.rb b/core/lib/spree/core/dependencies_helper.rb
index 51909a9d36..e73ae717e4 100644
--- a/core/lib/spree/core/dependencies_helper.rb
+++ b/core/lib/spree/core/dependencies_helper.rb
@@ -78,7 +78,9 @@ module Spree
name: point,
current: current,
default: default_val,
- overridden: current != default_val,
+ # Use overridden? to check if setter was called, not value comparison
+ # Value comparison fails for proc-based defaults that reference other dependencies
+ overridden: overridden?(point),
override_info: overrides[point]
}
end
diff --git a/core/spec/models/spree/app_dependencies_spec.rb b/core/spec/models/spree/app_dependencies_spec.rb
index 682f188b79..6ebe57c4a9 100644
--- a/core/spec/models/spree/app_dependencies_spec.rb
+++ b/core/spec/models/spree/app_dependencies_spec.rb
@@ -158,9 +158,11 @@ describe 'Spree module dependency accessors' do
end
describe 'Spree.<dependency>=' do
- let(:original_value) { Spree::Dependencies.cart_add_item_service }
-
- after do
+ # Use around hook with ensure to guarantee cleanup even if test fails
+ around do |example|
+ original_value = Spree::Dependencies.cart_add_item_service
+ example.run
+ ensure
# Restore original value using setter (which clears memoization)
Spree::Dependencies.cart_add_item_service = original_value
# Clear override tracking for this test