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
Move validation of locale uniqueness on homepage to cms_page.rb - catches this validation when creating a new homepage before the type is set.
Matthew Kennedyb4f9fc180a26
diff --git a/core/app/models/spree/cms/pages/homepage.rb b/core/app/models/spree/cms/pages/homepage.rbindex cdf64a5fab..490ce88c02 100644--- a/core/app/models/spree/cms/pages/homepage.rb+++ b/core/app/models/spree/cms/pages/homepage.rb@@ -3,8 +3,6 @@ module Spree::Cms::Pagesbefore_create :empty_slugafter_save :empty_slug- validates :type, uniqueness: { scope: [:store, :locale] }-def sections?trueenddiff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbindex cc3811a74d..4fe0cf7c80 100644--- a/core/app/models/spree/cms_page.rb+++ b/core/app/models/spree/cms_page.rb@@ -18,6 +18,7 @@ module Spreevalidates :title, :store, :locale, presence: truevalidates :slug, uniqueness: { scope: :store_id, allow_nil: true, case_sensitive: true }+ validates :locale, uniqueness: { scope: [:store, :type] }, if: :homepage?scope :visible, -> { where(visible: true) }scope :by_locale, ->(locale) { where(locale: locale) }diff --git a/core/spec/models/spree/cms_page_spec.rb b/core/spec/models/spree/cms_page_spec.rbindex 05d4a9311f..e08c5cc82b 100644--- a/core/spec/models/spree/cms_page_spec.rb+++ b/core/spec/models/spree/cms_page_spec.rb@@ -16,8 +16,16 @@ describe Spree::CmsPage, type: :model doexpect(described_class.new(title: 'Got Name', store: store_a, locale: nil)).not_to be_validend+ describe 'validates uniqueness of homepage by locale' do+ let!(:homepage) { create(:cms_homepage, store: store_a, locale: 'en') }++ it 'valid' do+ expect(described_class.new(title: 'Got Name', store: store_a, locale: 'en', type: 'Spree::Cms::Pages::Homepage')).not_to be_valid+ end+ end+describe 'Spree::Cms::Pages::Homepage' do- let(:homepage) { create(:cms_homepage, store: store_a) }+ let(:homepage) { create(:cms_homepage, store: store_a, locale: 'en') }it 'has a type of Spree::Cms::Pages::Homepage' doexpect(homepage.type).to eq('Spree::Cms::Pages::Homepage')