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 user factory

Damian Legawiec89d77e61ae9d
diff --git a/core/lib/spree/testing_support/factories/user_factory.rb b/core/lib/spree/testing_support/factories/user_factory.rb
index d3810a08d4..45d3ecbecf 100644
--- a/core/lib/spree/testing_support/factories/user_factory.rb
+++ b/core/lib/spree/testing_support/factories/user_factory.rb
@@ -15,11 +15,12 @@ FactoryBot.define do
end
factory :user_with_addresses, aliases: [:user_with_addreses] do
- ship_address do |user_with_addresses|
- create(:address, user: user_with_addresses.instance)
- end
- bill_address do |user_with_addresses|
- create(:address, user: user_with_addresses.instance)
+ after(:create) do |user|
+ user.ship_address = create(:address, user: user)
+ user.bill_address = create(:address, user: user)
+ user.addresses << user.ship_address
+ user.addresses << user.bill_address
+ user.save
end
end
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 6c66bc8d29..1019494440 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -1480,9 +1480,9 @@ describe Spree::Order, type: :model do
context 'when user has address but without default bill address' do
let(:address) { create(:address, user: user) }
- let(:user) { create(:user_with_addresses, bill_address: nil) }
+ let(:user) { create(:user_with_addresses) }
- before { user.addresses << address }
+ before { user.bill_address = nil }
it 'changes user default bill addresss' do
expect(user.bill_address_id).to be nil
@@ -1545,9 +1545,9 @@ describe Spree::Order, type: :model do
context 'when user has address but without default ship address' do
let(:address) { create(:address, user: user) }
- let(:user) { create(:user_with_addresses, ship_address: nil) }
+ let(:user) { create(:user_with_addresses) }
- before { user.addresses << address }
+ before { user.update(ship_address: nil) }
it 'changes user default ship addresss' do
expect(user.ship_address_id).to be nil