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.

Merge branch 'main' into feature/storefront-v5

Damian Legawiecaa8a740fe8f4
diff --cc core/spec/models/spree/taxon_spec.rb
index 6a7813b458,8bae95a49f..3c16a8a8fe
--- a/core/spec/models/spree/taxon_spec.rb
+++ b/core/spec/models/spree/taxon_spec.rb
@@@ -127,7 -127,7 +127,11 @@@ describe Spree::Taxon, type: :model d
describe 'after_destroy :remove_all_featured_sections' do
let(:taxon) { create(:taxon) }
++<<<<<<< HEAD
+ let!(:featured_section) { create(:featured_taxon_section, preferred_taxon_id: taxon.id) }
++=======
+ let!(:featured_section) { create(:featured_taxon_page_section, preferred_taxon_id: taxon.id) }
++>>>>>>> main
it 'removes the associated featured section' do
expect { taxon.destroy! }.to change(Spree::PageSections::FeaturedTaxon, :count).from(3).to(2)