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 fallback behavior for meta description to use cms_page meta_description else use store base meta data.

Matthew Kennedy787fb8b16d4b
diff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rb
index ca880c4447..c3006e24ae 100644
--- a/core/app/helpers/spree/base_helper.rb
+++ b/core/app/helpers/spree/base_helper.rb
@@ -118,7 +118,7 @@ module Spree
description: [object.name, current_store.meta_description].reject(&:blank?).join(', '))
else
meta.reverse_merge!(keywords: (current_store.meta_keywords || current_store.seo_title),
- description: (current_store.meta_description || current_store.seo_title))
+ description: (current_store.homepage(I18n.locale)&.seo_meta_description || current_store.seo_meta_description))
end
end
meta
@@ -194,7 +194,7 @@ module Spree
def base_cache_key
[I18n.locale, current_currency, defined?(try_spree_current_user) && try_spree_current_user.present?,
- defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
+ defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
end
def maximum_quantity
diff --git a/core/app/models/spree/cms/pages/homepage.rb b/core/app/models/spree/cms/pages/homepage.rb
index 647e945920..cdf64a5fab 100644
--- a/core/app/models/spree/cms/pages/homepage.rb
+++ b/core/app/models/spree/cms/pages/homepage.rb
@@ -9,6 +9,10 @@ module Spree::Cms::Pages
true
end
+ def seo_meta_description
+ meta_description if meta_description.present?
+ end
+
private
def empty_slug
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 62dc1cf6ae..db5a46ac10 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -120,6 +120,16 @@ module Spree
favicon_image.variant(resize: '32x32')
end
+ def seo_meta_description
+ if meta_description.present?
+ meta_description
+ elsif seo_title.present?
+ seo_title
+ else
+ name
+ end
+ end
+
private
def ensure_default_exists_and_is_unique
diff --git a/frontend/app/controllers/spree/home_controller.rb b/frontend/app/controllers/spree/home_controller.rb
index 0d6b241cc0..ceaae922f1 100644
--- a/frontend/app/controllers/spree/home_controller.rb
+++ b/frontend/app/controllers/spree/home_controller.rb
@@ -36,11 +36,7 @@ module Spree
end
def accurate_title
- if @cms_home_page
- @cms_home_page.seo_title
- else
- super
- end
+ @cms_home_page&.seo_title || super
end
def load_homepage
diff --git a/frontend/spec/features/cms_feature_page_spec.rb b/frontend/spec/features/cms_feature_page_spec.rb
index fa1396cb0b..1574678c47 100644
--- a/frontend/spec/features/cms_feature_page_spec.rb
+++ b/frontend/spec/features/cms_feature_page_spec.rb
@@ -20,7 +20,7 @@ describe 'cms_page feature page', type: :feature, js: true do
expect(page).not_to have_text('About Us')
end
- it 'displays meta_title as page title if no meta_title is set' do
+ it 'displays title as page title if no meta_title is set' do
expect(page).to have_title("#{cms_feature_page.title} - #{store.name}")
end
diff --git a/frontend/spec/features/cms_standard_page_spec.rb b/frontend/spec/features/cms_standard_page_spec.rb
index c9fa30ba2e..53b232530e 100644
--- a/frontend/spec/features/cms_standard_page_spec.rb
+++ b/frontend/spec/features/cms_standard_page_spec.rb
@@ -14,7 +14,7 @@ describe 'cms_page standard page', type: :feature, js: true do
expect(page).to have_text('About Us')
end
- it 'displays meta_title as page title if no meta_title is set' do
+ it 'displays title as page title if no meta_title is set' do
expect(page).to have_title("#{cms_page.title} - #{store.name}")
end
end
diff --git a/frontend/spec/features/homepage_spec.rb b/frontend/spec/features/homepage_spec.rb
index b6d44d7a57..f0a28a5584 100644
--- a/frontend/spec/features/homepage_spec.rb
+++ b/frontend/spec/features/homepage_spec.rb
@@ -4,6 +4,71 @@ describe 'homepage', type: :feature, js: true do
let!(:eu_store) { create(:store, default: true, supported_currencies: 'EUR', default_locale: 'de', supported_locales: 'de,fr') }
let!(:us_store) { create(:store, supported_currencies: 'USD', default_locale: 'en', supported_locales: 'en') }
+ context 'meta title' do
+ let!(:current_store) { create(:store) }
+ let!(:homepage_mt) { create(:cms_homepage, store: eu_store, locale: 'de') }
+
+ before { visit spree.root_path }
+
+ it 'displays page title as page title if no meta_title is set' do
+ expect(page).to have_title("#{homepage_mt.title} - #{current_store.name}")
+ end
+
+ it 'displays page meta_title as page title if meta_title is set' do
+ expect(page).to have_title("#{homepage_mt.meta_title} - #{current_store.name}")
+ end
+ end
+
+ context 'meta description - when no cms_homepage is set and store has no meta data set' do
+ let!(:current_store) { create(:store) }
+
+ before { visit spree.root_path }
+
+ it 'returns store_seo_description falling back to store name' do
+ expect(page).to have_meta(:description, current_store.name)
+ end
+ end
+
+ context 'meta description - when no cms_homepage is set and store has meta title set' do
+ let!(:current_store_with_seo_title) { create(:store, default: true, seo_title: 'Store SEO Title') }
+
+ before { visit spree.root_path }
+
+ it 'uses store seo_title as meta_description if no page meta_description or store meta_description have been set' do
+ expect(page).to have_meta(:description, current_store_with_seo_title.seo_title)
+ end
+ end
+
+ context 'meta description - when no cms_homepage is set and store has meta description set' do
+ let!(:current_store_with_seo_meta_desscription) { create(:store, default: true, meta_description: 'Store Meta Description') }
+
+ before { visit spree.root_path }
+
+ it 'uses store seo_title as meta_description if no page meta_description or store meta_description have been set' do
+ expect(page).to have_meta(:description, current_store_with_seo_meta_desscription.meta_description)
+ end
+ end
+
+ context 'meta description - when cms_homepage is set and has no meta description' do
+ let!(:homepage_with_no_meta_description) { create(:cms_homepage, store: eu_store, locale: 'de') }
+
+ before { visit spree.root_path }
+
+ it 'falls back to store seo_meta_description' do
+ expect(page).to have_meta(:description, eu_store.name)
+ end
+ end
+
+ context 'meta description - when cms_homepage is set and has meta description' do
+ let!(:homepage_with_meta_description) { create(:cms_homepage, store: eu_store, locale: 'de', meta_description: 'Page Meta Description') }
+
+ before { visit spree.root_path }
+
+ it 'falls back to store seo_meta_description' do
+ expect(page).to have_meta(:description, homepage_with_meta_description.meta_description)
+ end
+ end
+
context 'when no homepage is set' do
before { visit spree.root_path }