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 flaky FulfilmentChanger test by correcting quantity reduction logic (#13560)

Damian Legawiec040045e31967
diff --git a/backend/engines/core/app/models/spree/fulfilment_changer.rb b/backend/engines/core/app/models/spree/fulfilment_changer.rb
index 8bf2262824..b420d77313 100644
--- a/backend/engines/core/app/models/spree/fulfilment_changer.rb
+++ b/backend/engines/core/app/models/spree/fulfilment_changer.rb
@@ -85,8 +85,14 @@ module Spree
def reduce_units_quantities(reduced_quantity, units)
units.each do |unit|
- unit.quantity > reduced_quantity ? unit.update(quantity: unit.quantity - reduced_quantity) : unit.destroy!
- reduced_quantity -= unit.quantity
+ if unit.quantity > reduced_quantity
+ unit.update(quantity: unit.quantity - reduced_quantity)
+ reduced_quantity = 0
+ else
+ reduced_quantity -= unit.quantity
+ unit.destroy!
+ end
+ break if reduced_quantity.zero?
end
reduced_quantity
end
diff --git a/backend/engines/core/spec/models/spree/fulfilment_changer_spec.rb b/backend/engines/core/spec/models/spree/fulfilment_changer_spec.rb
index 68f00c2790..c7e9bc7d1c 100644
--- a/backend/engines/core/spec/models/spree/fulfilment_changer_spec.rb
+++ b/backend/engines/core/spec/models/spree/fulfilment_changer_spec.rb
@@ -212,7 +212,7 @@ describe Spree::FulfilmentChanger do
new_unit.update!(quantity: 5)
end
- it 'reduces the backordered items first', retry: 3 do
+ it 'reduces the backordered items first' do
expect(current_shipment.inventory_units.on_hand.count).to eq(2)
expect(current_shipment.inventory_units.on_hand.sum(:quantity)).to eq(6)
expect(current_shipment.inventory_units.backordered.count).to eq(1)