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
Follow the Rails default for belongs_to validation (#14483)
Damian Legawiec1c114e93dde8
diff --git a/docs/developer/upgrades/5.6-to-6.0.mdx b/docs/developer/upgrades/5.6-to-6.0.mdxindex 08b3e99739..431f37a65f 100644--- a/docs/developer/upgrades/5.6-to-6.0.mdx+++ b/docs/developer/upgrades/5.6-to-6.0.mdx@@ -363,11 +363,30 @@ A store or channel still carrying `preferred_order_routing_strategy: 'Spree::Ord`Spree::Stock::Coordinator` itself stays — cart fulfillment building, exchanges, and claims still use it.+### `belongs_to` is required by default++Spree models followed Rails' pre-5 rule, where a `belongs_to` was optional+unless you said otherwise. They now follow the modern default: a `belongs_to`+is **required** unless it is declared `optional: true`.++Two consequences for an application built on Spree:++- **Your own models change with it.** Anything inheriting from `Spree::Base`+ picks up the new default, so an association that is legitimately blank now+ needs `optional: true` on it. A model that relied on the old behaviour will+ start failing validation until you say which associations are optional.+- **The message changed.** A missing association reports `"must exist"` rather+ than `"can't be blank"`. Code that matches on the old wording — a test, or a+ client reading `details` out of a 422 — needs updating.++Setting a record's association to `nil` and saving it is the quickest way to+tell whether an association is required.+### `Store.default` no longer builds a store`Spree::Store.default` returned an **unpersisted** `Store.new(default: true)` when no default store existed. It now returns `nil`.-This matters more than it looks: `Spree::Current.store` falls back to `Store.default`, and every `Spree::SingleStoreResource` model resolves its own `store` from `Spree::Current.store`. Without a default store, those records now fail validation with "Store can't be blank" instead of silently attaching to a throwaway store.+This matters more than it looks: `Spree::Current.store` falls back to `Store.default`, and every `Spree::SingleStoreResource` model resolves its own `store` from `Spree::Current.store`. Without a default store, those records now fail validation with "Store must exist" instead of silently attaching to a throwaway store.Make sure a default store exists before creating store-scoped records, and set `Spree::Current.store` in jobs, rake tasks, and tests that run outside a request.diff --git a/spree/core/app/models/concerns/spree/purchase/channel.rb b/spree/core/app/models/concerns/spree/purchase/channel.rbindex b036349947..ba5975d46b 100644--- a/spree/core/app/models/concerns/spree/purchase/channel.rb+++ b/spree/core/app/models/concerns/spree/purchase/channel.rb@@ -6,8 +6,6 @@ module Spreeincluded dobelongs_to :channel, class_name: 'Spree::Channel'- validates :channel, presence: true-before_validation :ensure_channel_presenceenddiff --git a/spree/core/app/models/concerns/spree/purchase/market.rb b/spree/core/app/models/concerns/spree/purchase/market.rbindex 99609a5e0a..7858b5c36f 100644--- a/spree/core/app/models/concerns/spree/purchase/market.rb+++ b/spree/core/app/models/concerns/spree/purchase/market.rb@@ -6,9 +6,6 @@ module Spreeincluded dobelongs_to :market, class_name: 'Spree::Market'- validates :market, presence: true--attr_accessor :skip_market_resolutionbefore_validation :ensure_market_presencediff --git a/spree/core/app/models/concerns/spree/single_store_resource.rb b/spree/core/app/models/concerns/spree/single_store_resource.rbindex bb2b7893ee..deb32ca170 100644--- a/spree/core/app/models/concerns/spree/single_store_resource.rb+++ b/spree/core/app/models/concerns/spree/single_store_resource.rb@@ -6,7 +6,6 @@ module Spreebelongs_to :store, class_name: 'Spree::Store'before_validation :ensure_store, unless: :store_id?- validates :store, presence: truevalidate :ensure_store_association_is_not_changedscope :for_store, ->(store) { where(store_id: store.id) }diff --git a/spree/core/app/models/spree/allowed_origin.rb b/spree/core/app/models/spree/allowed_origin.rbindex 7155387702..0ae36067d3 100644--- a/spree/core/app/models/spree/allowed_origin.rb+++ b/spree/core/app/models/spree/allowed_origin.rb@@ -12,7 +12,7 @@ module Spreebelongs_to :store, class_name: 'Spree::Store'- validates :store, :origin, presence: true+ validates :origin, presence: truevalidates :origin, uniqueness: { scope: [:store_id, *spree_base_uniqueness_scope] }validate :origin_must_be_valid_http_urldiff --git a/spree/core/app/models/spree/base.rb b/spree/core/app/models/spree/base.rbindex 9b0b7c29f9..e1893f059d 100644--- a/spree/core/app/models/spree/base.rb+++ b/spree/core/app/models/spree/base.rb@@ -48,10 +48,6 @@ class Spree::Base < ApplicationRecordselect("#{klass.table_name}.*").select(*(fields || klass::TRANSLATABLE_FIELDS))}- def self.belongs_to_required_by_default- false- end-def self.for_store(store)plural_model_name = model_name.plural.gsub(/spree_/, '').to_symdiff --git a/spree/core/app/models/spree/category.rb b/spree/core/app/models/spree/category.rbindex 03a8abd1f2..24e2ea0265 100644--- a/spree/core/app/models/spree/category.rb+++ b/spree/core/app/models/spree/category.rb@@ -38,7 +38,7 @@ module Spree## @deprecated Read only by the 5.6 -> 6.0 upgrade task, which needs the# column to find the rows it migrates. Removed in 6.1 with Spree::Taxonomy.- belongs_to :taxonomy, class_name: 'Spree::Taxonomy', inverse_of: :taxons, deprecated: true+ belongs_to :taxonomy, class_name: 'Spree::Taxonomy', inverse_of: :taxons, optional: true, deprecated: truehas_many :product_categories, -> { order(:position) }, class_name: 'Spree::ProductCategory', dependent: :destroy_async, inverse_of: :categoryhas_many :products, through: :product_categoriesdiff --git a/spree/core/app/models/spree/channel.rb b/spree/core/app/models/spree/channel.rbindex edb6c660be..bfe5b5664d 100644--- a/spree/core/app/models/spree/channel.rb+++ b/spree/core/app/models/spree/channel.rb@@ -37,7 +37,7 @@ module Spreebefore_validation :backfill_code_from_name, if: -> { code.blank? && name.present? }before_validation :promote_first_channel_to_default- validates :name, :store, presence: true+ validates :name, presence: truevalidates :code, presence: true, uniqueness: { scope: spree_base_uniqueness_scope + [:store_id] }# Demote any prior default in the same transaction so the partial uniquediff --git a/spree/core/app/models/spree/claim.rb b/spree/core/app/models/spree/claim.rbindex 1625bab50b..46499d108b 100644--- a/spree/core/app/models/spree/claim.rb+++ b/spree/core/app/models/spree/claim.rb@@ -33,7 +33,6 @@ module Spreedependent: :destroy, inverse_of: :claimhas_many :refunds, class_name: 'Spree::Refund', as: :originator, dependent: :nullify- validates :order, presence: truevalidates :claim_line_items, presence: true, on: :createvalidates :resolution, inclusion: { in: RESOLUTIONS }, allow_nil: truediff --git a/spree/core/app/models/spree/claim_line_item.rb b/spree/core/app/models/spree/claim_line_item.rbindex 1cd4e13c61..5d0d8c33d3 100644--- a/spree/core/app/models/spree/claim_line_item.rb+++ b/spree/core/app/models/spree/claim_line_item.rb@@ -13,7 +13,6 @@ module Spree# Photographic evidence of damage, supplied by the customer.has_many_attached :images- validates :line_item, :variant, presence: truevalidates :quantity, numericality: { greater_than: 0 }validates :refund_amount, numericality: { greater_than_or_equal_to: 0 }diff --git a/spree/core/app/models/spree/collection_rule.rb b/spree/core/app/models/spree/collection_rule.rbindex a6528ef7fe..2c3b8853f5 100644--- a/spree/core/app/models/spree/collection_rule.rb+++ b/spree/core/app/models/spree/collection_rule.rb@@ -8,7 +8,7 @@ module Spreebelongs_to :collection, class_name: 'Spree::Collection', inverse_of: :rules, touch: true- validates :collection, :type, :value, presence: true+ validates :type, :value, presence: truevalidates :match_policy, inclusion: { in: MATCH_POLICIES }, presence: trueafter_commit :regenerate_collection_products,diff --git a/spree/core/app/models/spree/coupon_code.rb b/spree/core/app/models/spree/coupon_code.rbindex 19dbfdcea3..759f18ec03 100644--- a/spree/core/app/models/spree/coupon_code.rb+++ b/spree/core/app/models/spree/coupon_code.rb@@ -29,7 +29,7 @@ module Spreeendvalidates :code, presence: true, uniqueness: { scope: spree_base_uniqueness_scope, conditions: -> { where(deleted_at: nil) } }- validates :state, :promotion, presence: true+ validates :state, presence: trueself.whitelisted_ransackable_attributes = %w[state code promotion_id]self.whitelisted_ransackable_associations = %w[promotion]diff --git a/spree/core/app/models/spree/custom_field.rb b/spree/core/app/models/spree/custom_field.rbindex edcd0ec9b7..45a015de80 100644--- a/spree/core/app/models/spree/custom_field.rb+++ b/spree/core/app/models/spree/custom_field.rb@@ -63,7 +63,7 @@ module Spree## Validations#- validates :custom_field_definition, :type, :resource, :value, presence: true+ validates :type, :resource, :value, presence: truevalidates :custom_field_definition_id, uniqueness: { scope: [:resource_type, :resource_id] }validate :type_must_match_custom_field_definitionvalidate :resource_type_must_match_custom_field_definitiondiff --git a/spree/core/app/models/spree/customer_group_user.rb b/spree/core/app/models/spree/customer_group_user.rbindex d25f62bfaf..1eb0a5af15 100644--- a/spree/core/app/models/spree/customer_group_user.rb+++ b/spree/core/app/models/spree/customer_group_user.rb@@ -12,7 +12,6 @@ module Spree## Validations#- validates :customer_group, presence: truevalidates :customer, presence: truevalidates :customer_group_id, uniqueness: { scope: [:customer_id, :customer_type] }enddiff --git a/spree/core/app/models/spree/delivery_method_rule.rb b/spree/core/app/models/spree/delivery_method_rule.rbindex 8d21030bef..5790091e03 100644--- a/spree/core/app/models/spree/delivery_method_rule.rb+++ b/spree/core/app/models/spree/delivery_method_rule.rb@@ -17,7 +17,7 @@ module Spreeattribute :active, :boolean, default: true- validates :type, :delivery_method, presence: true+ validates :type, presence: true# One instance of each rule kind per method — duplicates would either be# a no-op or contradict themselves under AND semantics.validates :type, uniqueness: { scope: [:delivery_method_id, *spree_base_uniqueness_scope] }diff --git a/spree/core/app/models/spree/delivery_method_rule_product.rb b/spree/core/app/models/spree/delivery_method_rule_product.rbindex f7313a1c27..688408258f 100644--- a/spree/core/app/models/spree/delivery_method_rule_product.rb+++ b/spree/core/app/models/spree/delivery_method_rule_product.rb@@ -3,7 +3,6 @@ module Spreebelongs_to :delivery_method_rule, class_name: 'Spree::DeliveryMethodRule'belongs_to :product, class_name: 'Spree::Product'- validates :delivery_method_rule, :product, presence: truevalidates :product_id, uniqueness: { scope: :delivery_method_rule_id }, allow_nil: trueendenddiff --git a/spree/core/app/models/spree/delivery_method_stock_location.rb b/spree/core/app/models/spree/delivery_method_stock_location.rbindex bc33144f80..6f3b46f087 100644--- a/spree/core/app/models/spree/delivery_method_stock_location.rb+++ b/spree/core/app/models/spree/delivery_method_stock_location.rb@@ -6,7 +6,6 @@ module Spreebelongs_to :delivery_method, class_name: 'Spree::DeliveryMethod', inverse_of: :delivery_method_stock_locationsbelongs_to :stock_location, class_name: 'Spree::StockLocation'- validates :delivery_method, :stock_location, presence: truevalidates :stock_location_id, uniqueness: { scope: :delivery_method_id }endenddiff --git a/spree/core/app/models/spree/delivery_rate.rb b/spree/core/app/models/spree/delivery_rate.rbindex 651193420c..8294169bd7 100644--- a/spree/core/app/models/spree/delivery_rate.rb+++ b/spree/core/app/models/spree/delivery_rate.rb@@ -8,7 +8,7 @@ module Spreeserialize :metadata, coder: Spree::Metadata::HashSerializerbelongs_to :fulfillment, class_name: 'Spree::Fulfillment'- belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'+ belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate', optional: truebelongs_to :delivery_method, -> { with_deleted }, class_name: 'Spree::DeliveryMethod', inverse_of: :delivery_rates# Legacy names — removed in 6.1.belongs_to :shipment, class_name: 'Spree::Fulfillment', foreign_key: :fulfillment_id, optional: true, deprecated: truediff --git a/spree/core/app/models/spree/digital.rb b/spree/core/app/models/spree/digital.rbindex 25e754e77a..ebcafe63c3 100644--- a/spree/core/app/models/spree/digital.rb+++ b/spree/core/app/models/spree/digital.rb@@ -10,7 +10,6 @@ module Spreehas_one_attached :attachment, service: Spree.private_storage_service_namevalidates :attachment, attached: true- validates :variant, presence: truedelegate :product, to: :variantdelegate :filename, :content_type, to: :attachmentdiff --git a/spree/core/app/models/spree/digital_link.rb b/spree/core/app/models/spree/digital_link.rbindex 0e79ce16d0..23c829b16f 100644--- a/spree/core/app/models/spree/digital_link.rb+++ b/spree/core/app/models/spree/digital_link.rb@@ -18,7 +18,6 @@ module Spreebelongs_to :line_itembefore_validation :set_defaults, on: :create- validates :digital, :line_item, presence: truevalidates :access_counter, numericality: { greater_than_or_equal_to: 0 }delegate :filename, :content_type, to: :digitaldiff --git a/spree/core/app/models/spree/exchange.rb b/spree/core/app/models/spree/exchange.rbindex cc5b314246..296e1b1674 100644--- a/spree/core/app/models/spree/exchange.rb+++ b/spree/core/app/models/spree/exchange.rb@@ -32,7 +32,6 @@ module Spreedependent: :destroy, inverse_of: :exchangehas_many :refunds, class_name: 'Spree::Refund', as: :originator, dependent: :nullify- validates :order, :stock_location, presence: truevalidates :exchange_line_items, presence: true, on: :createaccepts_nested_attributes_for :exchange_line_items, allow_destroy: truediff --git a/spree/core/app/models/spree/exchange_line_item.rb b/spree/core/app/models/spree/exchange_line_item.rbindex 8f986c749d..6beacafcec 100644--- a/spree/core/app/models/spree/exchange_line_item.rb+++ b/spree/core/app/models/spree/exchange_line_item.rb@@ -10,7 +10,6 @@ module Spreebelongs_to :original_variant, -> { with_deleted }, class_name: 'Spree::Variant'belongs_to :new_variant, -> { with_deleted }, class_name: 'Spree::Variant'- validates :fulfillment_item, :line_item, :original_variant, :new_variant, presence: truevalidates :quantity, numericality: { greater_than: 0 }validates :received_quantity, numericality: { greater_than_or_equal_to: 0 }diff --git a/spree/core/app/models/spree/export.rb b/spree/core/app/models/spree/export.rbindex f34ce92f4b..baad1a911f 100644--- a/spree/core/app/models/spree/export.rb+++ b/spree/core/app/models/spree/export.rb@@ -30,7 +30,7 @@ module Spree## Validations#- validates :format, :store, :type, presence: true+ validates :format, :type, presence: true## Enumsdiff --git a/spree/core/app/models/spree/fulfillment.rb b/spree/core/app/models/spree/fulfillment.rbindex 61364c8a52..cb207dfe4f 100644--- a/spree/core/app/models/spree/fulfillment.rb+++ b/spree/core/app/models/spree/fulfillment.rb@@ -46,7 +46,6 @@ module Spreebefore_validation :set_cost_zero_when_nilbefore_save :detect_tracking_carrier, if: -> { will_save_change_to_tracking? && tracking_carrier.blank? }- validates :stock_location, presence: truevalidate :exactly_one_ownerattr_accessor :special_instructionsdiff --git a/spree/core/app/models/spree/gateway_customer.rb b/spree/core/app/models/spree/gateway_customer.rbindex 88028d1112..3347483557 100644--- a/spree/core/app/models/spree/gateway_customer.rb+++ b/spree/core/app/models/spree/gateway_customer.rb@@ -6,7 +6,6 @@ module Spreebelongs_to :customer, class_name: Spree.customer_class.to_sinclude Spree::DeprecatedCustomerAlias- validates :payment_method, presence: truevalidates :customer, presence: truevalidates :profile_id, presence: truevalidates :payment_method_id, uniqueness: { scope: :customer_id }diff --git a/spree/core/app/models/spree/gift_card.rb b/spree/core/app/models/spree/gift_card.rbindex c1ef9664c1..5023e778de 100644--- a/spree/core/app/models/spree/gift_card.rb+++ b/spree/core/app/models/spree/gift_card.rb@@ -24,7 +24,7 @@ module Spree# Validations#validates :code, presence: true, uniqueness: { scope: :store_id }- validates :store, :currency, presence: true+ validates :currency, presence: truevalidates :amount, presence: true, numericality: { greater_than: 0 }validates :amount_used, :amount_authorized, presence: true, numericality: { greater_than_or_equal_to: 0 }diff --git a/spree/core/app/models/spree/gift_card_batch.rb b/spree/core/app/models/spree/gift_card_batch.rbindex 50371263fc..370443bb51 100644--- a/spree/core/app/models/spree/gift_card_batch.rb+++ b/spree/core/app/models/spree/gift_card_batch.rb@@ -22,7 +22,7 @@ module Spreegreater_than: 0,less_than_or_equal_to: ->(_record) { Spree::Config[:gift_card_batch_limit].to_i }}- validates :store, :currency, presence: true+ validates :currency, presence: truevalidates :amount, numericality: { greater_than: 0 }#diff --git a/spree/core/app/models/spree/import_mapping.rb b/spree/core/app/models/spree/import_mapping.rbindex 3a7baca6c1..324eaffb27 100644--- a/spree/core/app/models/spree/import_mapping.rb+++ b/spree/core/app/models/spree/import_mapping.rb@@ -10,7 +10,7 @@ module Spree## Validations#- validates :import, :schema_field, presence: true+ validates :schema_field, presence: truevalidates :schema_field, uniqueness: { scope: [:import_id] }validates :file_column, uniqueness: { scope: [:import_id] }, allow_blank: truediff --git a/spree/core/app/models/spree/import_row.rb b/spree/core/app/models/spree/import_row.rbindex 61849ebfd1..8c1d2932c5 100644--- a/spree/core/app/models/spree/import_row.rb+++ b/spree/core/app/models/spree/import_row.rb@@ -15,7 +15,7 @@ module Spree## Validations#- validates :import, :data, presence: true+ validates :data, presence: truevalidates :row_number, uniqueness: { scope: :import_id }, numericality: { only_integer: true, greater_than: 0 }, presence: true#diff --git a/spree/core/app/models/spree/invitation.rb b/spree/core/app/models/spree/invitation.rbindex 46a09a94d9..0718f9fab0 100644--- a/spree/core/app/models/spree/invitation.rb+++ b/spree/core/app/models/spree/invitation.rb@@ -24,7 +24,7 @@ module Spree#validates :email, email: true, presence: truevalidates :token, presence: true, uniqueness: true- validates :inviter, :resource, :role, presence: true+ validates :inviter, :resource, presence: truevalidate :invitee_is_not_inviter, on: :createvalidate :invitee_already_exists, on: :createvalidate :role_belongs_to_resourcediff --git a/spree/core/app/models/spree/line_item.rb b/spree/core/app/models/spree/line_item.rbindex 4f4e954529..a7c304e5d5 100644--- a/spree/core/app/models/spree/line_item.rb+++ b/spree/core/app/models/spree/line_item.rb@@ -16,7 +16,7 @@ module Spreebelongs_to :cart, class_name: 'Spree::Cart', touch: true, optional: truebelongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'end- belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'+ belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: truebelongs_to :price_list, class_name: 'Spree::PriceList', optional: true# Snapshotted from the variant when the line is added — see copy_seller.# Nil is the operator's own first-party item.@@ -38,7 +38,6 @@ module Spreebefore_validation :copy_tax_categorybefore_validation :copy_seller- validates :variant, presence: truevalidate :exactly_one_ownerDB_INTEGER_MAX = (2**31) - 1diff --git a/spree/core/app/models/spree/market_country.rb b/spree/core/app/models/spree/market_country.rbindex 8971d2bf1c..067e8b8433 100644--- a/spree/core/app/models/spree/market_country.rb+++ b/spree/core/app/models/spree/market_country.rb@@ -6,7 +6,6 @@ module Spreehas_iso_geography state: false- validates :market, presence: truevalidates :country_code, presence: truevalidates :country_code, uniqueness: { scope: spree_base_uniqueness_scope + [:market_id] }validate :country_covered_by_shipping_zonediff --git a/spree/core/app/models/spree/media.rb b/spree/core/app/models/spree/media.rbindex 7914546d24..e5c68bcbae 100644--- a/spree/core/app/models/spree/media.rb+++ b/spree/core/app/models/spree/media.rb@@ -25,7 +25,7 @@ module Spreeafter_initialize { self.media_type ||= 'image' }- belongs_to :viewable, polymorphic: true, touch: true+ belongs_to :viewable, polymorphic: true, touch: true, optional: truehas_many :variant_media, class_name: 'Spree::VariantMedia', foreign_key: :media_id,dependent: :destroy, inverse_of: :assethas_many :variants, through: :variant_media, source: :variant, class_name: 'Spree::Variant'diff --git a/spree/core/app/models/spree/option_type_product_type.rb b/spree/core/app/models/spree/option_type_product_type.rbindex 5fb61228ff..ec9aeab8de 100644--- a/spree/core/app/models/spree/option_type_product_type.rb+++ b/spree/core/app/models/spree/option_type_product_type.rb@@ -3,7 +3,6 @@ module Spreebelongs_to :option_type, class_name: 'Spree::OptionType'belongs_to :product_type, class_name: 'Spree::ProductType'- validates :product_type, :option_type, presence: truevalidates :product_type_id, uniqueness: { scope: :option_type_id }endenddiff --git a/spree/core/app/models/spree/option_value_variant.rb b/spree/core/app/models/spree/option_value_variant.rbindex 52e9506368..0f943fddf6 100644--- a/spree/core/app/models/spree/option_value_variant.rb+++ b/spree/core/app/models/spree/option_value_variant.rb@@ -3,7 +3,6 @@ module Spreebelongs_to :option_value, class_name: 'Spree::OptionValue'belongs_to :variant, touch: true, class_name: 'Spree::Variant'- validates :option_value, :variant, presence: truevalidates :option_value_id, uniqueness: { scope: :variant_id }scope :for_option_types, lambda { |option_types|diff --git a/spree/core/app/models/spree/order_approval.rb b/spree/core/app/models/spree/order_approval.rbindex fc052e2228..dd54c546a2 100644--- a/spree/core/app/models/spree/order_approval.rb+++ b/spree/core/app/models/spree/order_approval.rb@@ -9,7 +9,6 @@ module Spreebelongs_to :order, class_name: 'Spree::Order', inverse_of: :approvalsbelongs_to :approver, polymorphic: true, optional: true- validates :order, presence: truevalidates :status, presence: true, inclusion: { in: STATUSES }scope :approved, -> { where(status: 'approved') }diff --git a/spree/core/app/models/spree/order_cancellation.rb b/spree/core/app/models/spree/order_cancellation.rbindex 45167540a8..9d676400f5 100644--- a/spree/core/app/models/spree/order_cancellation.rb+++ b/spree/core/app/models/spree/order_cancellation.rb@@ -12,7 +12,6 @@ module Spreebelongs_to :order, class_name: 'Spree::Order', inverse_of: :cancellationsbelongs_to :canceled_by, polymorphic: true, optional: true- validates :order, presence: truevalidates :reason, presence: true, inclusion: { in: REASONS }validates :refund_amount, numericality: { greater_than_or_equal_to: 0, allow_nil: true }enddiff --git a/spree/core/app/models/spree/order_promotion.rb b/spree/core/app/models/spree/order_promotion.rbindex d94d84a586..19761d40f4 100644--- a/spree/core/app/models/spree/order_promotion.rb+++ b/spree/core/app/models/spree/order_promotion.rb@@ -11,7 +11,6 @@ module Spreedelegate :name, :description, :code, to: :promotiondelegate :currency, to: :owner- validates :promotion, presence: truevalidates :order, uniqueness: { scope: :promotion }, allow_nil: truevalidates :cart, uniqueness: { scope: :promotion }, allow_nil: truevalidate :exactly_one_ownerdiff --git a/spree/core/app/models/spree/order_routing_rule.rb b/spree/core/app/models/spree/order_routing_rule.rbindex 4830846b7e..8f7712b1cc 100644--- a/spree/core/app/models/spree/order_routing_rule.rb+++ b/spree/core/app/models/spree/order_routing_rule.rb@@ -34,7 +34,7 @@ module Spree# position would 422. Default to the end of the channel's list instead.before_validation :set_position_to_end, on: :create, if: -> { position.blank? && channel.present? }- validates :type, :channel, presence: true+ validates :type, presence: true# One instance of each rule kind per channel — a duplicate signal would# either be a no-op or fight itself in the reducer walk.validates :type, uniqueness: { scope: [:channel_id, *spree_base_uniqueness_scope] }diff --git a/spree/core/app/models/spree/payment.rb b/spree/core/app/models/spree/payment.rbindex ee72f88d48..d31d04dee2 100644--- a/spree/core/app/models/spree/payment.rb+++ b/spree/core/app/models/spree/payment.rb@@ -35,7 +35,7 @@ module Spreeendhas_many :payment_splits, class_name: 'Spree::PaymentSplit', dependent: :destroy, inverse_of: :payment- belongs_to :source, polymorphic: true+ belongs_to :source, polymorphic: true, optional: truevalidate :exactly_one_ownerdiff --git a/spree/core/app/models/spree/payment_session.rb b/spree/core/app/models/spree/payment_session.rbindex 2b6f41cc37..ca1f272eda 100644--- a/spree/core/app/models/spree/payment_session.rb+++ b/spree/core/app/models/spree/payment_session.rb@@ -19,7 +19,7 @@ module Spreeforeign_key: :response_code,primary_key: :external_id- validates :payment_method, :external_id, :status, :currency, presence: true+ validates :external_id, :status, :currency, presence: truevalidate :exactly_one_ownervalidates :external_id, uniqueness: { scope: [:order_id, :payment_method_id] }validates :amount, presence: true, numericality: { greater_than: 0 }diff --git a/spree/core/app/models/spree/payment_setup_session.rb b/spree/core/app/models/spree/payment_setup_session.rbindex 4efb9096f2..c98c2a1415 100644--- a/spree/core/app/models/spree/payment_setup_session.rb+++ b/spree/core/app/models/spree/payment_setup_session.rb@@ -14,7 +14,7 @@ module Spreebelongs_to :payment_method, class_name: 'Spree::PaymentMethod'belongs_to :payment_source, polymorphic: true, optional: true- validates :payment_method, :status, presence: true+ validates :status, presence: truevalidates :external_id, uniqueness: { scope: :payment_method_id }, allow_nil: trueinclude Spree::PaymentSessionTransitionsdiff --git a/spree/core/app/models/spree/price_history.rb b/spree/core/app/models/spree/price_history.rbindex 1c5f05705c..884d127de5 100644--- a/spree/core/app/models/spree/price_history.rb+++ b/spree/core/app/models/spree/price_history.rb@@ -3,7 +3,7 @@module Spreeclass PriceHistory < Spree.base_classbelongs_to :price, class_name: 'Spree::Price'- belongs_to :variant, class_name: 'Spree::Variant'+ belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'validates :amount, presence: true, numericality: { greater_than_or_equal_to: 0 }validates :currency, presence: truediff --git a/spree/core/app/models/spree/price_list.rb b/spree/core/app/models/spree/price_list.rbindex 0d8e220b66..82d19f1083 100644--- a/spree/core/app/models/spree/price_list.rb+++ b/spree/core/app/models/spree/price_list.rb@@ -33,7 +33,7 @@ module Spreeassign_typed_association(:price_rules, rows)end- validates :name, :store, presence: true+ validates :name, presence: truevalidates :match_policy, presence: true, inclusion: { in: MATCH_POLICIES }validate :starts_at_before_ends_atdiff --git a/spree/core/app/models/spree/price_rule.rb b/spree/core/app/models/spree/price_rule.rbindex dee76e0d5a..9cdf7eb7aa 100644--- a/spree/core/app/models/spree/price_rule.rb+++ b/spree/core/app/models/spree/price_rule.rb@@ -6,7 +6,7 @@ module Spreedelegate :store, to: :price_list- validates :type, :price_list, presence: true+ validates :type, presence: truevalidates :type, uniqueness: { scope: [:price_list_id, *spree_base_uniqueness_scope] }# Returns true if the price rule is applicable to the contextdiff --git a/spree/core/app/models/spree/product.rb b/spree/core/app/models/spree/product.rbindex eb59bf1bcd..cdac950ef8 100644--- a/spree/core/app/models/spree/product.rb+++ b/spree/core/app/models/spree/product.rb@@ -119,7 +119,7 @@ module Spreeclass_name: 'Spree::Promotion',source: :promotion- belongs_to :tax_category, class_name: 'Spree::TaxCategory'+ belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: truebelongs_to :product_type, class_name: 'Spree::ProductType', optional: true, counter_cache: :products_count# The seller this product belongs to on a marketplace. Nil is the# operator's own catalog — which is everything, on a store selling onlydiff --git a/spree/core/app/models/spree/product_category.rb b/spree/core/app/models/spree/product_category.rbindex 7344715986..89d00fc6f3 100644--- a/spree/core/app/models/spree/product_category.rb+++ b/spree/core/app/models/spree/product_category.rb@@ -11,7 +11,6 @@ module Spreebelongs_to :category, class_name: 'Spree::Category'end- validates :category, :product, presence: truevalidates :position, numericality: { only_integer: true, allow_blank: true, allow_nil: true }# For #3494validates :category_id, uniqueness: { scope: :product_id, message: :already_linked, allow_blank: true }diff --git a/spree/core/app/models/spree/product_collection.rb b/spree/core/app/models/spree/product_collection.rbindex bd94c19f20..6701cb5c1a 100644--- a/spree/core/app/models/spree/product_collection.rb+++ b/spree/core/app/models/spree/product_collection.rb@@ -12,7 +12,6 @@ module Spreebelongs_to :collection, class_name: 'Spree::Collection', counter_cache: :products_count, touch: true,inverse_of: :product_collections- validates :product, :collection, presence: truevalidates :position, numericality: { only_integer: true, allow_blank: true, allow_nil: true }validates :collection_id, uniqueness: { scope: :product_id, message: :already_linked, allow_blank: true }diff --git a/spree/core/app/models/spree/product_option_type.rb b/spree/core/app/models/spree/product_option_type.rbindex b917720c5d..19fdd9198b 100644--- a/spree/core/app/models/spree/product_option_type.rb+++ b/spree/core/app/models/spree/product_option_type.rb@@ -6,7 +6,6 @@ module Spreeendacts_as_list scope: :product- validates :product, :option_type, presence: truevalidates :product_id, uniqueness: { scope: :option_type_id }, allow_nil: trueendenddiff --git a/spree/core/app/models/spree/product_promotion_rule.rb b/spree/core/app/models/spree/product_promotion_rule.rbindex 0f833ba46d..1b43727b00 100644--- a/spree/core/app/models/spree/product_promotion_rule.rb+++ b/spree/core/app/models/spree/product_promotion_rule.rb@@ -3,7 +3,6 @@ module Spreebelongs_to :product, class_name: 'Spree::Product'belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'- validates :product, :promotion_rule, presence: truevalidates :product_id, uniqueness: { scope: :promotion_rule_id }, allow_nil: trueendenddiff --git a/spree/core/app/models/spree/product_publication.rb b/spree/core/app/models/spree/product_publication.rbindex 072d5f80b9..7b9615adca 100644--- a/spree/core/app/models/spree/product_publication.rb+++ b/spree/core/app/models/spree/product_publication.rb@@ -13,7 +13,6 @@ module Spreebelongs_to :product, class_name: 'Spree::Product', touch: truebelongs_to :channel, class_name: 'Spree::Channel'- validates :product, :channel, presence: truevalidates :product_id, uniqueness: { scope: :channel_id }validate :unpublished_at_after_published_at, if: -> { published_at && unpublished_at }diff --git a/spree/core/app/models/spree/product_type_category.rb b/spree/core/app/models/spree/product_type_category.rbindex 77458bcc15..2c100afdbb 100644--- a/spree/core/app/models/spree/product_type_category.rb+++ b/spree/core/app/models/spree/product_type_category.rb@@ -3,7 +3,6 @@ module Spreebelongs_to :category, class_name: 'Spree::Category'belongs_to :product_type, class_name: 'Spree::ProductType'- validates :product_type, :category, presence: truevalidates :product_type_id, uniqueness: { scope: :category_id }endenddiff --git a/spree/core/app/models/spree/product_type_custom_field_definition.rb b/spree/core/app/models/spree/product_type_custom_field_definition.rbindex 88960cec8a..9f8a24507d 100644--- a/spree/core/app/models/spree/product_type_custom_field_definition.rb+++ b/spree/core/app/models/spree/product_type_custom_field_definition.rb@@ -10,7 +10,6 @@ module Spree# still named CustomFieldDefinition until the rename wave lands.belongs_to :custom_field_definition, class_name: 'Spree::CustomFieldDefinition'- validates :product_type, :custom_field_definition, presence: truevalidates :custom_field_definition_id, uniqueness: { scope: :product_type_id }validate :custom_field_definition_applies_to_productsdiff --git a/spree/core/app/models/spree/promotion_action.rb b/spree/core/app/models/spree/promotion_action.rbindex 4b72fc7cf7..631b437816 100644--- a/spree/core/app/models/spree/promotion_action.rb+++ b/spree/core/app/models/spree/promotion_action.rb@@ -10,7 +10,7 @@ module Spreebelongs_to :promotion, class_name: 'Spree::Promotion', touch: true- validates :promotion, :type, presence: true+ validates :type, presence: truescope :of_type, ->(t) { where(type: t) }diff --git a/spree/core/app/models/spree/promotion_action_line_item.rb b/spree/core/app/models/spree/promotion_action_line_item.rbindex 69ba28a003..63e7ad6808 100644--- a/spree/core/app/models/spree/promotion_action_line_item.rb+++ b/spree/core/app/models/spree/promotion_action_line_item.rb@@ -3,7 +3,7 @@ module Spreebelongs_to :promotion_action, class_name: 'Spree::Promotion::Actions::CreateLineItems'belongs_to :variant, class_name: 'Spree::Variant'- validates :promotion_action, :variant, :quantity, presence: true+ validates :quantity, presence: truevalidates :quantity, numericality: { only_integer: true, message: Spree.t('validation.must_be_int') }endenddiff --git a/spree/core/app/models/spree/promotion_rule.rb b/spree/core/app/models/spree/promotion_rule.rbindex 02600fec21..510a7e7f3f 100644--- a/spree/core/app/models/spree/promotion_rule.rb+++ b/spree/core/app/models/spree/promotion_rule.rb@@ -11,7 +11,6 @@ module Spreescope :of_type, ->(t) { where(type: t) }- validates :promotion, presence: truevalidates :type, uniqueness: { scope: [:promotion_id, *spree_base_uniqueness_scope] }def self.for(promotable)diff --git a/spree/core/app/models/spree/promotion_rule_category.rb b/spree/core/app/models/spree/promotion_rule_category.rbindex b50e0b48ef..3cc4b34640 100644--- a/spree/core/app/models/spree/promotion_rule_category.rb+++ b/spree/core/app/models/spree/promotion_rule_category.rb@@ -6,7 +6,6 @@ module Spreebelongs_to :promotion_rule, class_name: 'Spree::PromotionRule'belongs_to :category, class_name: 'Spree::Category'- validates :promotion_rule, :category, presence: truevalidates :promotion_rule_id, uniqueness: { scope: :category_id }, allow_nil: true# @deprecated Use #category / #category=; removed in 6.1.diff --git a/spree/core/app/models/spree/promotion_rule_user.rb b/spree/core/app/models/spree/promotion_rule_user.rbindex 6bfc3939e5..9d3b148d80 100644--- a/spree/core/app/models/spree/promotion_rule_user.rb+++ b/spree/core/app/models/spree/promotion_rule_user.rb@@ -4,7 +4,6 @@ module Spreebelongs_to :customer, class_name: "::#{Spree.customer_class}"include Spree::DeprecatedCustomerAlias- validates :user, :promotion_rule, presence: truevalidates :user_id, uniqueness: { scope: :promotion_rule_id }, allow_nil: trueendenddiff --git a/spree/core/app/models/spree/refund.rb b/spree/core/app/models/spree/refund.rbindex d7acffa930..d78bd99f65 100644--- a/spree/core/app/models/spree/refund.rb+++ b/spree/core/app/models/spree/refund.rb@@ -25,7 +25,6 @@ module Spreebelongs_to :originator, polymorphic: true, optional: truewith_options presence: true do- validates :payment, :reason# not required on create — perform! sets it after the gateway creditvalidates :transaction_id, on: :updatevalidates :amount, numericality: { greater_than: 0, allow_nil: true }diff --git a/spree/core/app/models/spree/report.rb b/spree/core/app/models/spree/report.rbindex bda32a45c0..1f0260d316 100644--- a/spree/core/app/models/spree/report.rb+++ b/spree/core/app/models/spree/report.rb@@ -25,7 +25,7 @@ module Spree## Validations#- validates :store, :date_from, :date_to, :currency, presence: true+ validates :date_from, :date_to, :currency, presence: true## Attachmentsdiff --git a/spree/core/app/models/spree/return.rb b/spree/core/app/models/spree/return.rbindex e770efe5c0..94aee77858 100644--- a/spree/core/app/models/spree/return.rb+++ b/spree/core/app/models/spree/return.rb@@ -38,7 +38,6 @@ module Spreehas_many :refunds, class_name: 'Spree::Refund', as: :originator, dependent: :nullifyhas_many :store_credits, class_name: 'Spree::StoreCredit', as: :originator, dependent: :nullify- validates :order, :stock_location, presence: truevalidates :return_line_items, presence: true, on: :createaccepts_nested_attributes_for :return_line_items, allow_destroy: truediff --git a/spree/core/app/models/spree/return_line_item.rb b/spree/core/app/models/spree/return_line_item.rbindex 61030cbce7..0e40144131 100644--- a/spree/core/app/models/spree/return_line_item.rb+++ b/spree/core/app/models/spree/return_line_item.rb@@ -11,7 +11,6 @@ module Spreebelongs_to :line_item, class_name: 'Spree::LineItem'belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'- validates :fulfillment_item, :line_item, :variant, presence: truevalidates :quantity, numericality: { greater_than: 0 }validates :received_quantity, numericality: { greater_than_or_equal_to: 0 }validates :pre_tax_amount, numericality: { greater_than_or_equal_to: 0 }diff --git a/spree/core/app/models/spree/role_user.rb b/spree/core/app/models/spree/role_user.rbindex ba1e0815bf..9a2b9bef04 100644--- a/spree/core/app/models/spree/role_user.rb+++ b/spree/core/app/models/spree/role_user.rb@@ -13,7 +13,6 @@ module Spree## Validations#- validates :role, presence: truevalidates :user, presence: truevalidates :role_id, uniqueness: { scope: [:user_id, :user_type] }diff --git a/spree/core/app/models/spree/seller_requirement_custom_field.rb b/spree/core/app/models/spree/seller_requirement_custom_field.rbindex e64b0abd7b..4b8e07caea 100644--- a/spree/core/app/models/spree/seller_requirement_custom_field.rb+++ b/spree/core/app/models/spree/seller_requirement_custom_field.rb@@ -9,7 +9,6 @@ module Spreebelongs_to :seller_requirement, class_name: 'Spree::SellerRequirement'belongs_to :custom_field_definition, class_name: 'Spree::CustomFieldDefinition'- validates :seller_requirement, :custom_field_definition, presence: truevalidates :custom_field_definition_id, uniqueness: { scope: :seller_requirement_id }, allow_nil: truevalidate :definition_must_describe_a_sellerdiff --git a/spree/core/app/models/spree/stock_level.rb b/spree/core/app/models/spree/stock_level.rbindex 8668acf1a7..ebd6a89bad 100644--- a/spree/core/app/models/spree/stock_level.rb+++ b/spree/core/app/models/spree/stock_level.rb@@ -19,7 +19,6 @@ module Spreehas_many :stock_reservations, class_name: 'Spree::StockReservation', inverse_of: :stock_level, dependent: :destroyhas_many :active_stock_reservations, -> { active }, class_name: 'Spree::StockReservation', inverse_of: :stock_level- validates :stock_location, :variant, presence: truevalidates :variant_id, uniqueness: { scope: :stock_location_id }, unless: :deleted_atvalidates :count_on_hand, numericality: {diff --git a/spree/core/app/models/spree/stock_movement.rb b/spree/core/app/models/spree/stock_movement.rbindex d6450c0295..1da7c520fe 100644--- a/spree/core/app/models/spree/stock_movement.rb+++ b/spree/core/app/models/spree/stock_movement.rb@@ -41,7 +41,7 @@ module Spreeafter_create :apply_to_stock_level- validates :stock_level, :quantity, :kind, presence: true+ validates :quantity, :kind, presence: truevalidates :kind, inclusion: { in: KINDS }, allow_blank: truevalidates :quantity, numericality: {other_than: 0,diff --git a/spree/core/app/models/spree/stock_reservation.rb b/spree/core/app/models/spree/stock_reservation.rbindex a3a55d5bbb..b2906276a9 100644--- a/spree/core/app/models/spree/stock_reservation.rb+++ b/spree/core/app/models/spree/stock_reservation.rb@@ -11,7 +11,7 @@ module Spreealias_attribute :stock_item_id, :stock_level_id- validates :stock_level, :line_item, :quantity, :expires_at, presence: true+ validates :quantity, :expires_at, presence: truevalidate :exactly_one_ownervalidates :quantity, numericality: { greater_than: 0, only_integer: true }, presence: truevalidates :line_item_id, uniqueness: { scope: :stock_level_id }, presence: truediff --git a/spree/core/app/models/spree/stock_transfer.rb b/spree/core/app/models/spree/stock_transfer.rbindex b1ffe7b878..83c9302c32 100644--- a/spree/core/app/models/spree/stock_transfer.rb+++ b/spree/core/app/models/spree/stock_transfer.rb@@ -24,7 +24,6 @@ module Spreevalidate :source_location_is_not_destination_locationvalidate :stock_movements_not_empty- validates :destination_location, presence: true# Transfers have no store of their own — they belong to the warehouses# they move stock between, and those are store-scoped. Used bydiff --git a/spree/core/app/models/spree/store_credit.rb b/spree/core/app/models/spree/store_credit.rbindex cfa0806449..52255e177e 100644--- a/spree/core/app/models/spree/store_credit.rb+++ b/spree/core/app/models/spree/store_credit.rb@@ -19,7 +19,9 @@ module SpreeALLOCATION_ACTION = 'allocation'.freezebelongs_to :store, class_name: 'Spree::Store'- belongs_to :customer, class_name: "::#{Spree.customer_class}"+ # A gift card applied to a guest cart issues store credit with no customer+ # to attach it to.+ belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: trueinclude Spree::DeprecatedCustomerAliasbelongs_to :created_by, class_name: Spree.admin_user_class.to_s, foreign_key: 'created_by_id', optional: truebelongs_to :originator, polymorphic: true, optional: true@@ -28,7 +30,7 @@ module Spreehas_many :payments, as: :source, class_name: 'Spree::Payment'has_many :orders, through: :payments, class_name: 'Spree::Order'- validates :currency, :store, presence: true+ validates :currency, presence: truevalidates :amount, numericality: { greater_than: 0 }validates :amount_used, numericality: { greater_than_or_equal_to: 0 }validate :amount_used_less_than_or_equal_to_amountdiff --git a/spree/core/app/models/spree/store_credit_event.rb b/spree/core/app/models/spree/store_credit_event.rbindex 61645a717d..337aa615bd 100644--- a/spree/core/app/models/spree/store_credit_event.rb+++ b/spree/core/app/models/spree/store_credit_event.rb@@ -7,7 +7,7 @@ module Spree## Associationsbelongs_to :store_credit- belongs_to :originator, polymorphic: true+ belongs_to :originator, polymorphic: true, optional: truehas_one :payment, -> { where(source_type: Spree::StoreCredit.to_s) }, foreign_key: :response_code, primary_key: :authorization_codehas_one :order, through: :paymentdiff --git a/spree/core/app/models/spree/store_payment_method.rb b/spree/core/app/models/spree/store_payment_method.rbindex f4fdc8fd60..adb9a7ced1 100644--- a/spree/core/app/models/spree/store_payment_method.rb+++ b/spree/core/app/models/spree/store_payment_method.rb@@ -9,7 +9,6 @@ module Spreebelongs_to :store, class_name: 'Spree::Store', touch: truebelongs_to :payment_method, class_name: 'Spree::PaymentMethod', touch: true- validates :store, :payment_method, presence: truevalidates :store_id, uniqueness: { scope: :payment_method_id }endenddiff --git a/spree/core/app/models/spree/store_product.rb b/spree/core/app/models/spree/store_product.rbindex 953190f883..29dcf5df6e 100644--- a/spree/core/app/models/spree/store_product.rb+++ b/spree/core/app/models/spree/store_product.rb@@ -11,7 +11,7 @@ module Spreeclass StoreProduct < Spree.base_classself.table_name = 'spree_products_stores'- belongs_to :product, class_name: 'Spree::Product'- belongs_to :store, class_name: 'Spree::Store'+ belongs_to :product, class_name: 'Spree::Product', optional: true+ belongs_to :store, class_name: 'Spree::Store', optional: trueendenddiff --git a/spree/core/app/models/spree/store_promotion.rb b/spree/core/app/models/spree/store_promotion.rbindex 0efe234357..f24eca69b2 100644--- a/spree/core/app/models/spree/store_promotion.rb+++ b/spree/core/app/models/spree/store_promotion.rb@@ -9,7 +9,6 @@ module Spreebelongs_to :store, class_name: 'Spree::Store', touch: truebelongs_to :promotion, class_name: 'Spree::Promotion', touch: true- validates :store, :promotion, presence: truevalidates :store_id, uniqueness: { scope: :promotion_id }endenddiff --git a/spree/core/app/models/spree/tax_rate.rb b/spree/core/app/models/spree/tax_rate.rbindex 77de58657e..0284231150 100644--- a/spree/core/app/models/spree/tax_rate.rb+++ b/spree/core/app/models/spree/tax_rate.rb@@ -25,7 +25,7 @@ module Spreewith_options presence: true dovalidates :amount, numericality: { allow_nil: true }- validates :tax_category, :name+ validates :nameend# The jurisdiction this rate applies in, held as codes: a blank country_codediff --git a/spree/core/app/models/spree/taxon_rule.rb b/spree/core/app/models/spree/taxon_rule.rbindex f7228d585d..cf36606991 100644--- a/spree/core/app/models/spree/taxon_rule.rb+++ b/spree/core/app/models/spree/taxon_rule.rb@@ -13,7 +13,7 @@ module Spree# manual in 6.0), so this is a plain belongs_to. Data-only until 6.1.belongs_to :taxon, class_name: 'Spree::Category', touch: true- validates :taxon, :type, :value, presence: true+ validates :type, :value, presence: truevalidates :match_policy, inclusion: { in: MATCH_POLICIES }, presence: truedelegate :store, to: :taxondiff --git a/spree/core/app/models/spree/variant_media.rb b/spree/core/app/models/spree/variant_media.rbindex 4123c979f2..611150bd25 100644--- a/spree/core/app/models/spree/variant_media.rb+++ b/spree/core/app/models/spree/variant_media.rb@@ -7,7 +7,6 @@ module Spreebelongs_to :variant, class_name: 'Spree::Variant', touch: truebelongs_to :asset, class_name: 'Spree::Media', foreign_key: :media_id, inverse_of: :variant_media- validates :variant, :asset, presence: truevalidates :media_id, uniqueness: { scope: :variant_id }validate :asset_belongs_to_variant_productdiff --git a/spree/core/app/models/spree/webhook_endpoint.rb b/spree/core/app/models/spree/webhook_endpoint.rbindex 685702d83d..305dfb36eb 100644--- a/spree/core/app/models/spree/webhook_endpoint.rb+++ b/spree/core/app/models/spree/webhook_endpoint.rb@@ -16,7 +16,7 @@ module Spreebelongs_to :store, class_name: 'Spree::Store'has_many :webhook_deliveries, class_name: 'Spree::WebhookDelivery', dependent: :destroy_async- validates :store, :url, presence: true+ validates :url, presence: truevalidates :url, format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), message: :invalid_url }validates :active, inclusion: { in: [true, false] }validate :url_must_not_resolve_to_private_ip, if: -> { !Rails.env.development? && url.present? && url_changed? }diff --git a/spree/core/app/models/spree/wished_item.rb b/spree/core/app/models/spree/wished_item.rbindex 40fa45f2c3..f84d15dfb7 100644--- a/spree/core/app/models/spree/wished_item.rb+++ b/spree/core/app/models/spree/wished_item.rb@@ -12,7 +12,6 @@ module Spreehas_one :product, class_name: 'Spree::Product', through: :variant- validates :variant, :wishlist, presence: truevalidates :variant, uniqueness: { scope: [:wishlist] }validates :quantity, numericality: { only_integer: true, greater_than: 0 }diff --git a/spree/core/app/models/spree/wishlist.rb b/spree/core/app/models/spree/wishlist.rbindex da8750eabe..bc16aed955 100644--- a/spree/core/app/models/spree/wishlist.rb+++ b/spree/core/app/models/spree/wishlist.rb@@ -22,7 +22,7 @@ module Spreehas_many :products, -> { distinct }, through: :variants, source: :product, class_name: 'Spree::Product'after_commit :ensure_default_exists_and_is_unique- validates :name, :store, :customer, presence: true+ validates :name, presence: truedef include?(variant_id)wished_items.exists?(variant_id: variant_id)diff --git a/spree/core/app/models/spree/zone_member.rb b/spree/core/app/models/spree/zone_member.rbindex a7cb42ee77..85e767a89e 100644--- a/spree/core/app/models/spree/zone_member.rb+++ b/spree/core/app/models/spree/zone_member.rb@@ -6,6 +6,5 @@ module Spree# tables by the data-migration tasks.belongs_to :zone, class_name: 'Spree::Zone', inverse_of: :zone_members- validates :zone, presence: trueendenddiff --git a/spree/core/db/sample_data/orders.rb b/spree/core/db/sample_data/orders.rbindex 8cd070d7e7..1cc4060b78 100644--- a/spree/core/db/sample_data/orders.rb+++ b/spree/core/db/sample_data/orders.rb@@ -115,6 +115,7 @@ if methodendcredit_card = Spree::CreditCard.find_or_initialize_by(gateway_customer_profile_id: 'BGS-1234')+ credit_card.payment_method = methodcredit_card.cc_type = 'visa'credit_card.month = 12credit_card.year = 2.years.from_now.yeardiff --git a/spree/core/spec/models/spree/base_spec.rb b/spree/core/spec/models/spree/base_spec.rbindex 0b46e9a142..0e747d901b 100644--- a/spree/core/spec/models/spree/base_spec.rb+++ b/spree/core/spec/models/spree/base_spec.rb@@ -1,51 +1,6 @@require 'spec_helper'-module Test- class Parent < ActiveRecord::Base- self.table_name = 'test_parents'- end-- class Child < ActiveRecord::Base- self.table_name = 'test_children'- belongs_to :parent, class_name: 'Test::Parent'- end-end-describe Spree::Base do- context 'AR overrides', skip: ENV['DB'] == 'mysql' do- let(:connection) { ActiveRecord::Base.connection }-- before do- connection.create_table :test_parents, force: true- connection.create_table :test_children, force: true do |t|- t.belongs_to :test_parent- end- end-- after do- connection.drop_table 'test_parents', if_exists: true- connection.drop_table 'test_children', if_exists: true- end-- it 'does not override Rails 5 default belongs_to_required_by_default' do- expect(described_class.belongs_to_required_by_default).to eq(false)- expect(Spree::Product.belongs_to_required_by_default).to be(false)-- expect(ApplicationRecord.belongs_to_required_by_default).to be(true)- expect(ActiveRecord::Base.belongs_to_required_by_default).to be(true)- expect(Test::Parent.belongs_to_required_by_default).to be(true)- expect(Test::Child.belongs_to_required_by_default).to be(true)- end-- it 'does not disable non-spree, Rails 5 models to validate their associated belongs_to model' do- model_instance = Test::Child.new-- expect(model_instance.validate).to eq(false)- expect(model_instance.errors.messages).to include(:parent)- expect(model_instance.errors.messages[:parent]).to include('must exist')- end- end-describe '.api_type' doit { expect(Spree::FulfillmentItem.api_type).to eq('fulfillment_item') }it { expect(Spree::Address.api_type).to eq('address') }diff --git a/spree/core/spec/models/spree/credit_card_spec.rb b/spree/core/spec/models/spree/credit_card_spec.rbindex 9bce9d5b57..d72985de54 100644--- a/spree/core/spec/models/spree/credit_card_spec.rb+++ b/spree/core/spec/models/spree/credit_card_spec.rb@@ -3,7 +3,7 @@ require 'spec_helper'describe Spree::CreditCard, type: :model doit_behaves_like 'metadata'- let(:credit_card) { Spree::CreditCard.new }+ let(:credit_card) { Spree::CreditCard.new(payment_method: payment_method) }let(:valid_credit_card_attributes) do{number: '4111111111111111',diff --git a/spree/core/spec/models/spree/import_mapping_spec.rb b/spree/core/spec/models/spree/import_mapping_spec.rbindex 1069a1213b..2ba117add3 100644--- a/spree/core/spec/models/spree/import_mapping_spec.rb+++ b/spree/core/spec/models/spree/import_mapping_spec.rb@@ -10,7 +10,7 @@ RSpec.describe Spree::ImportMapping, type: :model doit 'validates presence of import' domapping = build(:import_mapping, import: nil)expect(mapping).not_to be_valid- expect(mapping.errors[:import]).to include("can't be blank")+ expect(mapping.errors[:import]).to include('must exist')endit 'validates presence of schema_field' dodiff --git a/spree/core/spec/models/spree/inventory_unit_spec.rb b/spree/core/spec/models/spree/inventory_unit_spec.rbindex 36b8844b58..9925b195c4 100644--- a/spree/core/spec/models/spree/inventory_unit_spec.rb+++ b/spree/core/spec/models/spree/inventory_unit_spec.rb@@ -75,7 +75,8 @@ describe Spree::InventoryUnit, type: :model doit "does not find inventory units that aren't backordered" doon_hand_unit = shipment.inventory_units.buildon_hand_unit.state = 'on_hand'- on_hand_unit.variant_id = 1+ on_hand_unit.variant = create(:variant)+ on_hand_unit.line_item = order.line_items.firston_hand_unit.save!expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).not_to include(on_hand_unit)@@ -85,6 +86,7 @@ describe Spree::InventoryUnit, type: :model doother_variant_unit = shipment.inventory_units.buildother_variant_unit.state = 'backordered'other_variant_unit.variant = create(:variant)+ other_variant_unit.line_item = order.line_items.firstother_variant_unit.save!expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).not_to include(other_variant_unit)@@ -101,7 +103,8 @@ describe Spree::InventoryUnit, type: :model dolet(:other_order) doorder = create(:order)order.completed_at = nil- order.completed_at = nil+ create(:line_item, order: order, variant: stock_level.variant)+ order.line_items.reloadorder.tap(&:save!)end@@ -120,6 +123,7 @@ describe Spree::InventoryUnit, type: :model dounit.state = 'backordered'unit.variant_id = stock_level.variant.idunit.order_id = other_order.id+ unit.line_item = other_order.line_items.firstunit.tap(&:save!)enddiff --git a/spree/core/spec/models/spree/shipment_spec.rb b/spree/core/spec/models/spree/shipment_spec.rbindex e6827bb4b2..73c7ff75bc 100644--- a/spree/core/spec/models/spree/shipment_spec.rb+++ b/spree/core/spec/models/spree/shipment_spec.rb@@ -237,7 +237,9 @@ describe Spree::Shipment, type: :model doit 'equals line items final amount with tax' doshipment = create(:shipment, order: create(:order_with_line_item_quantity, line_items_quantity: 2))shipment.order.line_items.first.update_columns(adjustment_total: 2.0, additional_tax_total: 2.0)- expect(shipment.item_cost).to eq(22.0)+ # update_columns writes behind the loaded associations, so the manifest+ # has to re-read the line items to see the tax.+ expect(shipment.reload.item_cost).to eq(22.0)endend@@ -807,7 +809,8 @@ describe Spree::Shipment, type: :model dolet(:shipment) { Spree::Shipment.create order_id: order.id, stock_location: create(:stock_location) }let(:shipping_rate) do- Spree::ShippingRate.create shipment_id: shipment.id, cost: 10+ Spree::ShippingRate.create shipment_id: shipment.id, cost: 10,+ delivery_method: create(:delivery_method)endbefore dodiff --git a/spree/core/spec/services/spree/commissions/commission_order_spec.rb b/spree/core/spec/services/spree/commissions/commission_order_spec.rbindex ddb81e0fd6..bc14812b19 100644--- a/spree/core/spec/services/spree/commissions/commission_order_spec.rb+++ b/spree/core/spec/services/spree/commissions/commission_order_spec.rb@@ -95,7 +95,9 @@ RSpec.describe Spree::Commissions::CommissionOrder dodef fulfillment_carrying(*line_items, cost: 20)fulfillment = create(:fulfillment, order: order, cost: cost)fulfillment.fulfillment_items.destroy_all- line_items.each { |line_item| fulfillment.fulfillment_items.create!(line_item: line_item, quantity: 1) }+ line_items.each do |line_item|+ fulfillment.fulfillment_items.create!(line_item: line_item, variant: line_item.variant, quantity: 1)+ endfulfillmentend