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
Fix tests.
Matthew Kennedy9ba1c212f83a
diff --git a/backend/spec/features/admin/cms_pages/new_page_spec.rb b/backend/spec/features/admin/cms_pages/new_page_spec.rbindex e140fd0dcb..9c6b619c94 100644--- a/backend/spec/features/admin/cms_pages/new_page_spec.rb+++ b/backend/spec/features/admin/cms_pages/new_page_spec.rb@@ -36,7 +36,7 @@ describe 'New Page', type: :feature docontext 'when a user tries to create a page with a duplicate slug' dolet!(:store_1) { create(:store) }- let!(:cms_page) { create(:cms_page, title: 'About Us', store: store_1) }+ let!(:cms_page) { create(:cms_standard_page, title: 'About Us', store: store_1) }before dovisit spree.new_admin_cms_page_pathdiff --git a/core/lib/spree/testing_support/factories/cms_page_factory.rb b/core/lib/spree/testing_support/factories/cms_page_factory.rbindex 86ecb69011..de4e197663 100644--- a/core/lib/spree/testing_support/factories/cms_page_factory.rb+++ b/core/lib/spree/testing_support/factories/cms_page_factory.rb@@ -3,15 +3,15 @@ FactoryBot.define dotitle { generate(:random_string) }locale { 'en' }- factory :cms_homepage, class: Spree::CmsPage do+ factory :cms_homepage dotype { 'Spree::Cms::Pages::Homepage' }end- factory :cms_standard_page, class: Spree::CmsPage do+ factory :cms_standard_page dotype { 'Spree::Cms::Pages::StandardPage' }end- factory :cms_feature_page, class: Spree::CmsPage do+ factory :cms_feature_page dotype { 'Spree::Cms::Pages::FeaturePage' }endenddiff --git a/core/lib/spree/testing_support/factories/cms_section_factory.rb b/core/lib/spree/testing_support/factories/cms_section_factory.rbnew file mode 100644index 0000000000..f45be1821f--- /dev/null+++ b/core/lib/spree/testing_support/factories/cms_section_factory.rb@@ -0,0 +1,8 @@+FactoryBot.define do+ factory :base_cms_section, class: Spree::CmsSection do+ name { generate(:random_string) }++ factory :cms_section do+ end+ end+enddiff --git a/core/spec/models/spree/cms_page_spec.rb b/core/spec/models/spree/cms_page_spec.rbindex 774d35e368..4c74fcdd9e 100644--- a/core/spec/models/spree/cms_page_spec.rb+++ b/core/spec/models/spree/cms_page_spec.rb@@ -93,8 +93,9 @@ describe Spree::CmsPage, type: :model dolet!(:homepage_b) { create(:cms_homepage, store: store_b) }it 'returns homepage for the requested store' do- expect(described_class.by_store(store_a)).to include(homepage_a)- expect(described_class.by_store(store_a)).not_to include(homepage_b)+ result_a = described_class.find(homepage_a.id)++ expect(described_class.by_store(store_a)).to eq([result_a])endend@@ -103,8 +104,9 @@ describe Spree::CmsPage, type: :model dolet!(:homepage_de) { create(:cms_homepage, store: store_a, locale: 'de') }it 'returns homepage for the requested locale' do- expect(described_class.by_locale(:de)).to include(homepage_de)- expect(described_class.by_locale(:de)).not_to include(homepage_en)+ result_de = described_class.find(homepage_de.id)++ expect(described_class.by_locale(:de)).to eq([result_de])endend@@ -113,8 +115,9 @@ describe Spree::CmsPage, type: :model dolet!(:standard_page_slug_b) { create(:cms_standard_page, store: store_a, title: 'Big Page') }it 'returns standard_page_slug_a for the requested locale' do- expect(described_class.by_slug('little-page')).to include(standard_page_slug_a)- expect(described_class.by_slug('not-little-page')).not_to include(standard_page_slug_a)+ result_slug_a = described_class.find(standard_page_slug_a.id)++ expect(described_class.by_slug('little-page')).to eq([result_slug_a])endend@@ -124,9 +127,10 @@ describe Spree::CmsPage, type: :model dolet!(:standard_page_linkable) { create(:cms_standard_page, store: store_a, title: 'Big Page') }it 'returns standard_page_slug_a for the requested locale' do- expect(described_class.linkable).to include(feature_page_linkable)- expect(described_class.linkable).to include(standard_page_linkable)- expect(described_class.linkable).not_to include(homepage_not_linkable)+ result_feature_page_linkable = described_class.find(feature_page_linkable.id)+ result_standard_page_linkable = described_class.find(standard_page_linkable.id)++ expect(described_class.linkable).to eq([result_feature_page_linkable, result_standard_page_linkable])endenddiff --git a/core/spec/models/spree/cms_section_spec.rb b/core/spec/models/spree/cms_section_spec.rbnew file mode 100644index 0000000000..35b2d7e398--- /dev/null+++ b/core/spec/models/spree/cms_section_spec.rb@@ -0,0 +1,5 @@+require 'spec_helper'++describe Spree::CmsSection, type: :model do++enddiff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rbindex 205c702cb3..c2872993c8 100644--- a/core/spec/models/spree/menu_spec.rb+++ b/core/spec/models/spree/menu_spec.rb@@ -22,9 +22,9 @@ describe Spree::Menu, type: :model doenddescribe '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') }+ let!(:store_multi) { create(:store) }+ let!(:menu_en) { create(:menu, store: store_multi, locale: 'en') }+ let!(:menu_fr) { create(:menu, store: store_multi, locale: 'fr') }it 'returns menus for the requested locale' doexpect(described_class.by_locale('fr')).to eq([menu_fr])