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.

Upload image validation.

Matthew Kennedydab43d64ac14
diff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rb
index 9c4a972cfb..29fe45bcfc 100644
--- a/core/app/models/spree/cms_section.rb
+++ b/core/app/models/spree/cms_section.rb
@@ -2,6 +2,8 @@ module Spree
class CmsSection < Spree::Base
include Spree::DisplayLink
+ IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
+
acts_as_list scope: :cms_page
belongs_to :cms_page, touch: true
@@ -22,6 +24,9 @@ module Spree
validates :name, :cms_page, presence: true
+ validates :image_one, :image_two, :image_three, :image_four,
+ :image_five, :image_six, content_type: IMAGE_TYPES
+
LINKED_RESOURCE_TYPE = []
TYPES = ['Spree::Cms::Sections::HeroImage',
diff --git a/core/spec/models/spree/cms_section_spec.rb b/core/spec/models/spree/cms_section_spec.rb
index ea10f80d42..bbcbcf9d0f 100644
--- a/core/spec/models/spree/cms_section_spec.rb
+++ b/core/spec/models/spree/cms_section_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Spree::CmsSection, type: :model do
let!(:store_a) { create(:store) }
- let(:homepage) { create(:cms_homepage, store: store_a) }
+ 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
@@ -11,4 +11,21 @@ describe Spree::CmsSection, type: :model do
it 'validates presence of page' do
expect(described_class.new(name: 'Got Name')).not_to be_valid
end
+
+ context 'uploading a png' do
+ let!(:store_a) { create(:store) }
+ let!(:homepage) { create(:cms_homepage, store: store_a) }
+
+ let(:section) do
+ section = build(:cms_hero_image_section, cms_page: homepage)
+ section.image_one.attach(io: file, filename: 't-shirt.png')
+ section
+ end
+
+ let(:file) { File.open(file_fixture('icon_256x256.png')) }
+
+ it 'is valid' do
+ expect(section.valid?).to be(true)
+ end
+ end
end
diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rb
index 054c91ac15..422a65def1 100644
--- a/core/spec/models/spree/menu_item_spec.rb
+++ b/core/spec/models/spree/menu_item_spec.rb
@@ -172,7 +172,7 @@ describe Spree::MenuItem, type: :model do
end
it 'is level 1' do
- expect(item_x.level).to eql 1
+ expect(item_x.level).to be 1
end
end