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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Guard against nil value slug or permalink. (#11210)
Matthew Kennedycec90a7ae046
diff --git a/core/app/models/concerns/spree/display_link.rb b/core/app/models/concerns/spree/display_link.rbindex b1d5205ede..13cbca56ea 100644--- a/core/app/models/concerns/spree/display_link.rb+++ b/core/app/models/concerns/spree/display_link.rb@@ -3,7 +3,7 @@ module Spreedef linkcase linked_resource_typewhen 'Spree::Taxon'- return if linked_resource.nil?+ return if linked_resource&.permalink.blank?if spree_routes.method_defined?(:nested_taxons_path)spree_routes.nested_taxons_path(linked_resource.permalink)@@ -11,7 +11,7 @@ module Spree"/#{Spree::Config[:storefront_taxons_path]}/#{linked_resource.permalink}"endwhen 'Spree::Product'- return if linked_resource.nil?+ return if linked_resource&.slug.blank?if spree_routes.method_defined?(:products_path)spree_routes.product_path(linked_resource)@@ -19,7 +19,7 @@ module Spree"/#{Spree::Config[:storefront_products_path]}/#{linked_resource.slug}"endwhen 'Spree::CmsPage'- return if linked_resource.nil?+ return if linked_resource&.slug.blank?if spree_routes.method_defined?(:page_path)spree_routes.page_path(linked_resource.slug)diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rbindex 65ac2373eb..d502d7e8fa 100644--- a/core/spec/models/spree/menu_item_spec.rb+++ b/core/spec/models/spree/menu_item_spec.rb@@ -107,11 +107,16 @@ describe Spree::MenuItem, type: :model dodescribe '#link' dolet(:product) { create(:product, stores: [store]) }let(:taxon) { create(:taxon) }+ let(:cms_page) { create(:cms_standard_page) }+ let(:cms_page_with_no_slug) { create(:cms_homepage) }+let(:item_url) { create(:menu_item, name: 'URL To Random Site', item_type: 'Link', menu: menu, linked_resource_type: 'URL', destination: 'https://some-other-website.com') }let(:item_empty_url) { create(:menu_item, name: 'URL To Random Site', item_type: 'Link', menu: menu, linked_resource_type: 'URL', destination: nil) }let(:item_home) { create(:menu_item, name: 'Home', item_type: 'Link', menu: menu, linked_resource_type: 'Home Page') }let(:item_product) { create(:menu_item, name: product.name, item_type: 'Link', menu: menu, linked_resource_type: 'Spree::Product') }let(:item_taxon) { create(:menu_item, name: taxon.name, item_type: 'Link', menu: menu, linked_resource_type: 'Spree::Taxon') }+ let(:item_cms_page) { create(:menu_item, name: cms_page.title, item_type: 'Link', menu: menu, linked_resource_type: 'Spree::CmsPage') }+ let(:item_cms_page_with_no_slug) { create(:menu_item, name: cms_page_with_no_slug.title, item_type: 'Link', menu: menu, linked_resource_type: 'Spree::CmsPage') }it 'returns correct taxon path' doitem_taxon.update(linked_resource: taxon)@@ -119,6 +124,18 @@ describe Spree::MenuItem, type: :model doexpect(item_taxon.link).to eql "/t/#{taxon.permalink}"end+ it 'returns correct cms_standard_page path' do+ item_cms_page.update(linked_resource: cms_page)++ expect(item_cms_page.link).to eql "/pages/#{cms_page.slug}"+ end++ it 'returns nil if no slug is present' do+ item_cms_page_with_no_slug.update(linked_resource: cms_page_with_no_slug)++ expect(item_cms_page_with_no_slug.link).to be nil+ end+it 'returns nil for destination when taxon is removed' doitem_taxon.update(linked_resource: taxon)item_taxon.update(linked_resource_id: nil)