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.

Fix/sd 666 double title (#11184)

Damian Legawiec384544ca4796
diff --git a/core/lib/spree/core/controller_helpers/common.rb b/core/lib/spree/core/controller_helpers/common.rb
index a58f856b53..2aab4817b5 100644
--- a/core/lib/spree/core/controller_helpers/common.rb
+++ b/core/lib/spree/core/controller_helpers/common.rb
@@ -19,7 +19,7 @@ module Spree
def title
title_string = @title.present? ? @title : accurate_title
if title_string.present?
- if Spree::Config[:always_put_site_name_in_title]
+ if Spree::Config[:always_put_site_name_in_title] && !title_string.include?(default_title)
[title_string, default_title].join(" #{Spree::Config[:title_site_name_separator]} ")
else
title_string
diff --git a/core/spec/lib/spree/core/controller_helpers/common_spec.rb b/core/spec/lib/spree/core/controller_helpers/common_spec.rb
new file mode 100644
index 0000000000..d0acb40419
--- /dev/null
+++ b/core/spec/lib/spree/core/controller_helpers/common_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+class FakesController < ApplicationController
+ include Spree::Core::ControllerHelpers::Common
+end
+
+describe Spree::Core::ControllerHelpers::Common, type: :controller do
+ controller(FakesController) {}
+ let!(:helper) { Spree::Core::ControllerHelpers::Common }
+
+ describe '#title' do
+ before do
+ Spree::Config[:always_put_site_name_in_title] = true
+ Spree::Config[:title_site_name_separator] = '-'
+ end
+
+ context 'when title with current store name is present' do
+ let!(:store) { create(:store, name: 'Spree Test Store', seo_title: 'Spree - Spree Test Store') }
+
+ it 'returns that title' do
+ allow_any_instance_of(helper).to receive(:current_store).and_return(store)
+
+ expect(controller.send(:title)).to eq store.seo_title
+ end
+ end
+
+ context 'when title without current store name is present' do
+ let!(:store) { create(:store, name: 'Spree Test Store', seo_title: 'Spree') }
+
+ it 'returns title with current store name' do
+ allow_any_instance_of(helper).to receive(:current_store).and_return(store)
+
+ title = store.seo_title + ' - ' + store.name
+ expect(controller.send(:title)).to eq title
+ end
+ end
+ end
+end