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 section.

Matthew Kennedy11f54a4bfd47
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index a917bff763..1f16482d72 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -13,7 +13,7 @@ module Spree
before_validation :handle_slug
- validates :title, presence: true
+ validates :title, :store, :locale, presence: true
validates :slug, uniqueness: { scope: :store, allow_nil: true, case_sensitive: true }
scope :visible, -> { where(visible: true) }
diff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rb
index d8e64aa267..2779eb33bb 100644
--- a/core/app/models/spree/cms_section.rb
+++ b/core/app/models/spree/cms_section.rb
@@ -20,6 +20,8 @@ module Spree
default_scope { order(position: :asc) }
+ validates :name, :cms_page, presence: true
+
LINKED_RESOURCE_TYPE = []
TYPES = ['Spree::Cms::Sections::FullScreenHeroImage',
diff --git a/core/lib/spree/testing_support/factories/cms_section_factory.rb b/core/lib/spree/testing_support/factories/cms_section_factory.rb
index f45be1821f..a3643fa9b3 100644
--- a/core/lib/spree/testing_support/factories/cms_section_factory.rb
+++ b/core/lib/spree/testing_support/factories/cms_section_factory.rb
@@ -1,8 +1,5 @@
FactoryBot.define do
- factory :base_cms_section, class: Spree::CmsSection do
+ factory :cms_section, class: Spree::CmsSection do
name { generate(:random_string) }
-
- factory :cms_section do
- end
end
end
diff --git a/core/spec/models/spree/cms_page_spec.rb b/core/spec/models/spree/cms_page_spec.rb
index 4c74fcdd9e..80254972b2 100644
--- a/core/spec/models/spree/cms_page_spec.rb
+++ b/core/spec/models/spree/cms_page_spec.rb
@@ -4,6 +4,18 @@ describe Spree::CmsPage, type: :model do
let!(:store_a) { create(:store) }
let!(:store_b) { create(:store) }
+ it 'validates presence of title' do
+ expect(described_class.new(title: nil, store: store_a, locale: :en)).not_to be_valid
+ end
+
+ it 'validates presence of store' do
+ expect(described_class.new(title: 'Got Name', store: nil, locale: :en)).not_to be_valid
+ end
+
+ it 'validates presence of locale' do
+ expect(described_class.new(title: 'Got Name', store: store_a, locale: nil)).not_to be_valid
+ end
+
describe 'Spree::Cms::Pages::Homepage' do
let(:homepage) { create(:cms_homepage, store: store_a) }
diff --git a/core/spec/models/spree/cms_section_spec.rb b/core/spec/models/spree/cms_section_spec.rb
index 35b2d7e398..ea10f80d42 100644
--- a/core/spec/models/spree/cms_section_spec.rb
+++ b/core/spec/models/spree/cms_section_spec.rb
@@ -1,5 +1,14 @@
require 'spec_helper'
describe Spree::CmsSection, type: :model do
+ let!(:store_a) { create(:store) }
+ let(:homepage) { create(:cms_homepage, store: store_a) }
+ it 'validates presence of name' do
+ expect(described_class.new(name: nil, cms_page: homepage)).not_to be_valid
+ end
+
+ it 'validates presence of page' do
+ expect(described_class.new(name: 'Got Name')).not_to be_valid
+ end
end
diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rb
index c2872993c8..9369a57d17 100644
--- a/core/spec/models/spree/menu_spec.rb
+++ b/core/spec/models/spree/menu_spec.rb
@@ -62,11 +62,11 @@ describe Spree::Menu, type: :model do
let!(:menu) { create(:menu, name: 'Footer Menu', location: 'Footer', store: store_1) }
it 'validates presence of name' do
- expect(described_class.new(name: '', location: 'Header', store: store_3)).not_to be_valid
+ expect(described_class.new(name: nil, location: 'Header', store: store_3)).not_to be_valid
end
it 'validates presence of store' do
- expect(described_class.new(name: 'Got Name', location: 'Header', store_id: nil)).not_to be_valid
+ expect(described_class.new(name: 'Got Name', location: 'Header', store: nil)).not_to be_valid
end
it 'validates presence of locale' do