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
VEN-187 Edit Product/Properties: New property can be saved without “value” (#11567)
Aleksandar Petrushev1dc48ef40ca5
diff --git a/api/spec/requests/spree/api/v2/platform/products_spec.rb b/api/spec/requests/spree/api/v2/platform/products_spec.rbindex 0c9b7ea67e..a4a860e287 100644--- a/api/spec/requests/spree/api/v2/platform/products_spec.rb+++ b/api/spec/requests/spree/api/v2/platform/products_spec.rb@@ -23,8 +23,9 @@ describe 'API V2 Platform Products Spec' dolet!(:not_backorderable_product) { create(:product_in_stock, :without_backorder, stores: [store]) }let!(:property) { create(:property) }let!(:new_property) { create(:property) }- let!(:product_with_property) { create(:product, properties: [property], stores: [store]) }+ let!(:product_with_property) { create(:product, stores: [store]) }let!(:product_property) { create(:product_property, property: new_property, product: product_with_property, value: 'Some Value') }+ let!(:product_property2) { create(:product_property, property: property, product: product_with_property, value: 'Some Value 2') }describe 'products#index' docontext 'with no params' dodiff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rbindex fc11879ab1..b4b9421d38 100644--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb@@ -20,8 +20,9 @@ describe 'API V2 Storefront Products Spec', type: :request dolet!(:not_backorderable_product) { create(:product_in_stock, :without_backorder, stores: [store]) }let!(:property) { create(:property) }let!(:new_property) { create(:property) }- let!(:product_with_property) { create(:product, properties: [property], stores: [store]) }+ let!(:product_with_property) { create(:product, stores: [store]) }let!(:product_property) { create(:product_property, property: new_property, product: product_with_property, value: 'Some Value') }+ let!(:product_property2) { create(:product_property, property: property, product: product_with_property, value: 'Some Value 2') }before { Spree::Api::Config[:api_v2_per_page_limit] = 4 }diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex 24ab187476..be5087f7d2 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -340,7 +340,7 @@ module Spreedef add_associations_from_prototypeif prototype_id && prototype = Spree::Prototype.find_by(id: prototype_id)prototype.properties.each do |property|- product_properties.create(property: property)+ product_properties.create(property: property, value: 'Placeholder')endself.option_types = prototype.option_typesself.taxons = prototype.taxonsdiff --git a/core/app/models/spree/product_property.rb b/core/app/models/spree/product_property.rbindex 7471cf81e0..785cb7bba0 100644--- a/core/app/models/spree/product_property.rb+++ b/core/app/models/spree/product_property.rb@@ -13,6 +13,7 @@ module Spreevalidates :property, presence: truevalidates :property_id, uniqueness: { scope: :product_id }+ validates :value, presence: truedefault_scope { order(:position) }diff --git a/core/lib/spree/testing_support/factories/product_property_factory.rb b/core/lib/spree/testing_support/factories/product_property_factory.rbindex 4dca3fc7af..eb1f34e1c9 100644--- a/core/lib/spree/testing_support/factories/product_property_factory.rb+++ b/core/lib/spree/testing_support/factories/product_property_factory.rb@@ -1,6 +1,7 @@FactoryBot.define dofactory :product_property, class: Spree::ProductProperty doproduct { create(:product, stores: [create(:store)]) }+ value { "val-#{rand(50)}" }propertyendenddiff --git a/core/spec/models/spree/product_duplicator_spec.rb b/core/spec/models/spree/product_duplicator_spec.rbindex 99e578c0ea..78a79e0ded 100644--- a/core/spec/models/spree/product_duplicator_spec.rb+++ b/core/spec/models/spree/product_duplicator_spec.rb@@ -3,7 +3,8 @@ require 'spec_helper'module Spreedescribe Spree::ProductDuplicator, type: :model dolet(:store) { create(:store) }- let!(:product) { create(:product, properties: [create(:property, name: 'MyProperty')], stores: [store]) }+ let!(:product_property) { create(:product_property, product: product) }+ let!(:product) { create(:product, stores: [store]) }let!(:duplicator) { Spree::ProductDuplicator.new(product) }let(:file) { File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __dir__)) }@@ -80,8 +81,8 @@ module Spreeendit 'copied the properties' do- expect(new_product.product_properties.count).to be 1- expect(new_product.product_properties.first.property.name).to eql 'MyProperty'+ expect(new_product.product_properties.count).to eq 1+ expect(new_product.product_properties.first.property.name).to eql product_property.property.nameendenddiff --git a/core/spec/models/spree/product_filter_spec.rb b/core/spec/models/spree/product_filter_spec.rbindex cec94eb99d..e30a6fad84 100644--- a/core/spec/models/spree/product_filter_spec.rb+++ b/core/spec/models/spree/product_filter_spec.rb@@ -20,10 +20,5 @@ describe 'product filters', type: :model doit "can find products in the 'Nike' brand" doexpect(Spree::Product.brand_any('Nike')).to include(product)end- it 'sorts products without brand specified' do- product.set_property('brand', 'Nike')- create(:product, stores: [store]).set_property('brand', nil)- expect { Spree::Core::ProductFilters.brand_filter[:labels] }.not_to raise_error- endendenddiff --git a/core/spec/models/spree/product_property_spec.rb b/core/spec/models/spree/product_property_spec.rbindex f57bd4b089..5fc468ac64 100644--- a/core/spec/models/spree/product_property_spec.rb+++ b/core/spec/models/spree/product_property_spec.rb@@ -10,6 +10,15 @@ describe Spree::ProductProperty, type: :model doexpect(duplicated_property.save).to be_falsyexpect(duplicated_property.errors.messages).to have_key(:property_id)end++ context 'value field' do+ let(:product_property) { build(:product_property, value: nil) }++ it 'validates presence' do+ expect(product_property.save).to be_falsy+ expect(product_property.errors.messages).to have_key(:value)+ end+ endendcontext 'touching' dodiff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex 0421008d14..50150e1f42 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -560,12 +560,12 @@ describe Spree::Product, type: :model dolet(:product) { create(:product, stores: [store]) }it 'is infinite if track_inventory_levels is false' do- Spree::Config[:track_inventory_levels] = false+ allow(Spree::Config).to receive(:track_inventory_levels).and_return(false)expect(build(:product, variants_including_master: [build(:master_variant)]).total_on_hand).to eql(Float::INFINITY)endit 'is infinite if variant is on demand' do- Spree::Config[:track_inventory_levels] = true+ allow(Spree::Config).to receive(:track_inventory_levels).and_return(true)expect(build(:product, variants_including_master: [build(:on_demand_master_variant)]).total_on_hand).to eql(Float::INFINITY)enddiff --git a/core/spec/models/spree/property_spec.rb b/core/spec/models/spree/property_spec.rbindex f88c712f3a..377f21832f 100644--- a/core/spec/models/spree/property_spec.rb+++ b/core/spec/models/spree/property_spec.rb@@ -83,7 +83,10 @@ describe Spree::Property, type: :model dolet(:product_property) { create(:product_property, property: property, product: product) }let(:product_property_2) { create(:product_property, property: property, product: product_2, value: 'Test Test') }- before { product_property.update_column(:value, 'some value') }+ before do+ product_property.update_column(:filter_param, nil)+ product_property.update_column(:value, 'some value')+ endcontext 'filterable property' doit { expect { property.update(filterable: true) }.to change { product_property.reload.filter_param }.from(nil) }