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.

Revert "clone address instead of using same objects to stop overwriti… (#12288)

Damian Legawiece77419077c4b
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index a4e50e3a8c..3bbfb082b5 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -307,8 +307,8 @@ module Spree
# we need to check if user is of admin user class to avoid mismatch type error
# in a scenario where we have separate classes for admin and regular users
self.created_by ||= user if user.is_a?(Spree.admin_user_class)
- self.bill_address ||= user.bill_address.try(:clone)
- self.ship_address ||= user.ship_address.try(:clone)
+ self.bill_address ||= user.bill_address
+ self.ship_address ||= user.ship_address
changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 8128681dbb..746586ce35 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -672,9 +672,11 @@ describe Spree::Order, type: :model do
expect(order.created_by).to eql(created_by)
expect(order.created_by_id).to eql(created_by.id)
- expect(order.bill_address == bill_address).to be(true) if order.bill_address
+ expect(order.bill_address).to eql(bill_address)
+ expect(order.bill_address_id).to eql(bill_address&.id)
- expect(order.ship_address == ship_address).to be(true) if order.ship_address
+ expect(order.ship_address).to eql(ship_address)
+ expect(order.ship_address_id).to eql(ship_address&.id)
end
shared_examples_for '#associate_user!' do |persisted = false|
@@ -729,7 +731,7 @@ describe Spree::Order, type: :model do
end
context 'when the user is not persisted' do
- let(:user) { build(:user) }
+ let(:user) { build(:user_with_addreses) }
it 'does not persist the user' do
expect { order.associate_user!(user) }.