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.

Add tests for by_locale and by_store.

Matthew Kennedy1f0257a2efdc
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index 91f3f0e50b..8d4a2746ea 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -43,7 +43,7 @@ module Spree
def link
case linked_resource_type
when 'Spree::Taxon'
- return '' if linked_resource.nil?
+ return if linked_resource.nil?
if frontend_available?
Spree::Core::Engine.routes.url_helpers.nested_taxons_path(linked_resource.permalink)
@@ -51,7 +51,7 @@ module Spree
"/#{Spree::Config[:storefront_taxon_path]}/#{linked_resource.permalink}"
end
when 'Spree::Product'
- return '' if linked_resource.nil?
+ return if linked_resource.nil?
if frontend_available?
Spree::Core::Engine.routes.url_helpers.product_path(linked_resource)
@@ -61,7 +61,7 @@ module Spree
when 'Home Page'
'/'
when 'URL'
- destination || ''
+ destination
end
end
diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rb
index a8038bbafb..232139b6e7 100644
--- a/core/spec/models/spree/menu_item_spec.rb
+++ b/core/spec/models/spree/menu_item_spec.rb
@@ -119,11 +119,11 @@ describe Spree::MenuItem, type: :model do
expect(item_taxon.link).to eql "/t/#{taxon.permalink}"
end
- it 'returns empty string for destination when taxon is removed' do
+ it 'returns nil for destination when taxon is removed' do
item_taxon.update(linked_resource: taxon)
item_taxon.update(linked_resource_id: nil)
- expect(item_taxon.link).to eq ''
+ expect(item_taxon.link).to be nil
end
it 'returns correct product path' do
@@ -132,11 +132,11 @@ describe Spree::MenuItem, type: :model do
expect(item_product.link).to eql "/products/#{product.slug}"
end
- it 'returns empty string for destination when product is removed' do
+ it 'returns nil for destination when product is removed' do
item_product.update(linked_resource: product)
item_product.update(linked_resource_id: nil)
- expect(item_product.link).to eq ''
+ expect(item_product.link).to be nil
end
it 'returns correct root path' do
@@ -147,8 +147,8 @@ describe Spree::MenuItem, type: :model do
expect(item_url.link).to eql 'https://some-other-website.com'
end
- it 'returns empty string when URL is nil' do
- expect(item_empty_url.link).to eq ''
+ it 'returns nil when URL is nil' do
+ expect(item_empty_url.link).to be nil
end
end
diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rb
index 489d21ce78..c747e1f2d2 100644
--- a/core/spec/models/spree/menu_spec.rb
+++ b/core/spec/models/spree/menu_spec.rb
@@ -9,6 +9,28 @@ describe Spree::Menu, type: :model do
expect(described_class).not_to respond_to(:for_some_other_location)
end
+ describe 'by_store' do
+ let!(:store) { create(:store) }
+ let!(:store_b) { create(:store) }
+ let!(:menu_a) { create(:menu, store: store) }
+ let!(:menu_b) { create(:menu, store: store_b) }
+ let!(:menu_c) { create(:menu, store: store, location: 'footer') }
+
+ it 'returns menus for the requested store' do
+ expect(described_class.by_store(store)).to eq([menu_a, menu_c])
+ end
+ end
+
+ describe 'by_locale' do
+ let!(:store_milti) { create(:store) }
+ let!(:menu_en) { create(:menu, store: store_milti, locale: 'en') }
+ let!(:menu_fr) { create(:menu, store: store_milti, locale: 'fr') }
+
+ it 'returns menus for the requested locale' do
+ expect(described_class.by_locale('fr')).to eq([menu_fr])
+ end
+ end
+
describe 'creating new menu' do
let(:store_1) { create(:store) }
let(:store_2) { create(:store) }