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.

Auto-assign default store to multi store resources without store spec… (#12166)

Damian Legawiec3ec2c27fb29a
diff --git a/core/app/models/concerns/spree/multi_store_resource.rb b/core/app/models/concerns/spree/multi_store_resource.rb
index be074eba69..109d38bbc3 100644
--- a/core/app/models/concerns/spree/multi_store_resource.rb
+++ b/core/app/models/concerns/spree/multi_store_resource.rb
@@ -5,6 +5,8 @@ module Spree
included do
scope :for_store, ->(store) { joins(:stores).where(Store.table_name => { id: store.id }) }
+ before_validation :set_default_store, if: :new_record?
+
validate :must_have_one_store, unless: :disable_store_presence_validation?
end
@@ -16,6 +18,13 @@ module Spree
errors.add(:stores, Spree.t(:must_have_one_store))
end
+ def set_default_store
+ return if disable_store_presence_validation?
+ return if stores.any?
+
+ stores << Spree::Store.default
+ end
+
# this can be overridden on model basis
def disable_store_presence_validation?
Spree::Config[:disable_store_presence_validation]
diff --git a/core/lib/spree/testing_support/factories/product_factory.rb b/core/lib/spree/testing_support/factories/product_factory.rb
index a65f6b5dd7..347b04e314 100644
--- a/core/lib/spree/testing_support/factories/product_factory.rb
+++ b/core/lib/spree/testing_support/factories/product_factory.rb
@@ -13,15 +13,9 @@ FactoryBot.define do
# ensure stock item will be created for this products master
# also attach this product to the default store if no stores are passed in
- before(:create) do |product|
+ before(:create) do |_product|
create(:stock_location) unless Spree::StockLocation.any?
-
- if product.stores.empty?
- default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
- store = default_store || create(:store)
-
- product.stores << [store]
- end
+ create(:store, default: true) unless Spree::Store.any?
end
after(:create) do |product|
Spree::StockLocation.all.each { |stock_location| stock_location.propagate_variant(product.master) unless stock_location.stock_items.exists?(variant: product.master) }
diff --git a/core/spec/models/spree/payment_method_spec.rb b/core/spec/models/spree/payment_method_spec.rb
index 861c3fbc09..fa2f4a1d31 100644
--- a/core/spec/models/spree/payment_method_spec.rb
+++ b/core/spec/models/spree/payment_method_spec.rb
@@ -141,30 +141,6 @@ describe Spree::PaymentMethod, type: :model do
end
end
- describe '#ensure_store_presence' do
- let(:valid_record) { build(:payment_method, stores: [create(:store)]) }
- let(:invalid_record) { build(:payment_method, stores: []) }
-
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).not_to be_valid }
-
- context 'validation disabled' do
- context 'method overwrite' do
- before { allow_any_instance_of(described_class).to receive(:disable_store_presence_validation?).and_return(true) }
-
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).to be_valid }
- end
-
- context 'preference set' do
- before { Spree::Config[:disable_store_presence_validation] = true }
-
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).to be_valid }
- end
- end
- end
-
describe '#source_required?' do
let(:payment_method) { create(:credit_card_payment_method) }
diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rb
index ce42fcd026..3a194c2bd4 100644
--- a/core/spec/models/spree/product_spec.rb
+++ b/core/spec/models/spree/product_spec.rb
@@ -884,31 +884,33 @@ describe Spree::Product, type: :model do
end
describe '#ensure_store_presence' do
- let(:valid_record) { build(:product, stores: [create(:store)]) }
- let(:invalid_record) { build(:product, stores: []) }
+ let(:product) { create(:product) }
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).not_to be_valid }
+ context 'no store passed' do
+ it 'auto-assigns store' do
+ expect(product.stores).to eq([Spree::Store.default])
+ end
+ end
- context 'validation disabled' do
- context 'method overwrite' do
- before { allow_any_instance_of(described_class).to receive(:disable_store_presence_validation?).and_return(true) }
+ context 'store passed' do
+ let(:store) { create(:store) }
+ let(:product) { create(:product, stores: [store]) }
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).to be_valid }
+ it 'does not auto-assign store' do
+ expect(product.stores).to eq([store])
end
+ end
+ context 'validation disabled' do
context 'preference set' do
before { Spree::Config[:disable_store_presence_validation] = true }
- it { expect(valid_record).to be_valid }
- it { expect(invalid_record).to be_valid }
+ it { expect(product.stores).to eq([]) }
end
end
end
describe '#taxons_for_store' do
- let(:store) { create(:store) }
let(:store_2) { create(:store) }
let(:product) { create(:product, stores: [store, store_2], taxons: [taxon, taxon_2]) }
let(:taxonomy) { create(:taxonomy, store: store) }