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
Move more methods from Order/Cart to concerns for unified testing
Damian Legawiec4f9ae1afaaa2
diff --git a/spree/core/app/models/concerns/spree/purchase/digital_items.rb b/spree/core/app/models/concerns/spree/purchase/digital_items.rbindex 5c3fa6d7fe..be5d3026c0 100644--- a/spree/core/app/models/concerns/spree/purchase/digital_items.rb+++ b/spree/core/app/models/concerns/spree/purchase/digital_items.rb@@ -44,6 +44,14 @@ module Spreedef requires_ship_address?!digital?end++ # Whether any line item needs physical delivery (digital-only+ # purchases skip the address/delivery steps).+ #+ # @return [Boolean]+ def delivery_required?+ line_items.any? && !digital?+ endendendenddiff --git a/spree/core/app/models/concerns/spree/purchase/lifecycle.rb b/spree/core/app/models/concerns/spree/purchase/lifecycle.rbnew file mode 100644index 0000000000..679fb84435--- /dev/null+++ b/spree/core/app/models/concerns/spree/purchase/lifecycle.rb@@ -0,0 +1,50 @@+module Spree+ module Purchase+ # Lifecycle predicates shared by Spree::Cart and Spree::Order.+ # Cart-only markers (completing?, readonly completion lock) and+ # order-only ones (placed?, canceled?) stay on their hosts.+ module Lifecycle+ extend ActiveSupport::Concern++ included do+ alias_method :complete?, :completed?+ end++ # @return [Boolean]+ def completed?+ completed_at.present?+ end++ # Checkout begins once any checkout-only data is present (email or a+ # shipping address). Drives stock-reservation dispatch.+ #+ # @return [Boolean]+ def in_checkout?+ !completed? && (email.present? || ship_address_id.present?)+ end++ # A completed record is an immutable audit record, and settled money+ # must never be deleted.+ #+ # @return [Boolean]+ def can_be_deleted?+ !completed? && payments.completed.empty?+ end++ # @return [Boolean]+ def backordered?+ fulfillment_items.any?(&:backordered?)+ end++ # @return [Boolean]+ def guest_checkout_disallowed?+ return false if customer.present?++ resolved_channel = channel || store&.default_channel+ return false unless resolved_channel.respond_to?(:guest_checkout_enabled?)++ !resolved_channel.guest_checkout_enabled?+ end+ end+ end+enddiff --git a/spree/core/app/models/concerns/spree/purchase/payment_processing.rb b/spree/core/app/models/concerns/spree/purchase/payment_processing.rbindex b62d441ac5..0a7ed75aa3 100644--- a/spree/core/app/models/concerns/spree/purchase/payment_processing.rb+++ b/spree/core/app/models/concerns/spree/purchase/payment_processing.rb@@ -21,6 +21,13 @@ module Spreepayments.pendingend+ # Active front-end payment methods available for this record.+ #+ # @return [Array<Spree::PaymentMethod>]+ def payment_methods+ store.payment_methods.active.available_on_front_end.select { |payment_method| payment_method.available_for_order?(self) }+ end+# Free checkouts have no money to collect.## @return [Boolean]diff --git a/spree/core/app/models/concerns/spree/purchase/totals.rb b/spree/core/app/models/concerns/spree/purchase/totals.rbnew file mode 100644index 0000000000..3743a052f6--- /dev/null+++ b/spree/core/app/models/concerns/spree/purchase/totals.rb@@ -0,0 +1,38 @@+module Spree+ module Purchase+ # Money readers shared by Spree::Cart and Spree::Order. The raw+ # +outstanding_balance+ stays host-specific on purpose: an order nets+ # reimbursement payouts and inverts on cancellation, a cart is plain+ # total minus payments.+ module Totals+ # @return [Integer] total units across line items+ def quantity+ line_items.sum(:quantity)+ end++ # @return [Boolean]+ def outstanding_balance?+ outstanding_balance != 0+ end++ # Balance still to collect after applied store credit, never negative.+ #+ # @return [BigDecimal]+ def amount_due+ [outstanding_balance - total_applied_store_credit, 0].max+ end++ # @return [Boolean]+ def paid?+ total.positive? && payment_total >= total+ end++ # Total fulfillment discount applied by promotions, as a positive amount.+ #+ # @return [BigDecimal]+ def fulfillment_discount+ discounts.for_fulfillments.sum(:amount) * -1+ end+ end+ end+enddiff --git a/spree/core/app/models/concerns/spree/purchase/validations.rb b/spree/core/app/models/concerns/spree/purchase/validations.rbnew file mode 100644index 0000000000..99f0c4e51e--- /dev/null+++ b/spree/core/app/models/concerns/spree/purchase/validations.rb@@ -0,0 +1,45 @@+module Spree+ module Purchase+ # Column-level validations shared by Spree::Cart and Spree::Order: the+ # money-column battery and item counts. Email validation stays+ # host-specific (orders require one via require_email; carts validate+ # shape only, with presence enforced by Checkout::Requirements) — as do+ # the order-only status inclusions.+ module Validations+ extend ActiveSupport::Concern++ MONEY_THRESHOLD = 100_000_000+ MONEY_VALIDATION = {+ presence: true,+ numericality: {+ greater_than: -MONEY_THRESHOLD,+ less_than: MONEY_THRESHOLD,+ allow_blank: true+ },+ format: { with: /\A-?\d+(?:\.\d{1,2})?\z/, allow_blank: true }+ }.freeze++ POSITIVE_MONEY_VALIDATION = MONEY_VALIDATION.deep_dup.tap do |validation|+ validation.fetch(:numericality)[:greater_than_or_equal_to] = 0+ end.freeze++ NEGATIVE_MONEY_VALIDATION = MONEY_VALIDATION.deep_dup.tap do |validation|+ validation.fetch(:numericality)[:less_than_or_equal_to] = 0+ end.freeze++ included do+ validates :total_quantity, presence: true,+ numericality: { greater_than_or_equal_to: 0, less_than: 2**31, only_integer: true, allow_blank: true }++ validates :item_total, POSITIVE_MONEY_VALIDATION+ validates :adjustment_total, MONEY_VALIDATION+ validates :included_tax_total, POSITIVE_MONEY_VALIDATION+ validates :additional_tax_total, POSITIVE_MONEY_VALIDATION+ validates :payment_total, MONEY_VALIDATION+ validates :delivery_total, MONEY_VALIDATION+ validates :discount_total, NEGATIVE_MONEY_VALIDATION+ validates :total, MONEY_VALIDATION+ end+ end+ end+enddiff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rbindex 0befbf99e2..317353f152 100644--- a/spree/core/app/models/spree/cart.rb+++ b/spree/core/app/models/spree/cart.rb@@ -28,6 +28,9 @@ module Spreeinclude Spree::Purchase::LineItemCurrenciesinclude Spree::Purchase::PaymentProcessinginclude Spree::Purchase::Addresses+ include Spree::Purchase::Validations+ include Spree::Purchase::Totals+ include Spree::Purchase::Lifecycle# Concurrency is manual (the API's OrderLock semantics — compare# client-sent version, 409 on mismatch); Rails auto-locking must not@@ -108,15 +111,14 @@ module Spreealias items line_items- accepts_nested_attributes_for :line_items- accepts_nested_attributes_for :payments-scope :complete, -> { where.not(completed_at: nil) }scope :incomplete, -> { where(completed_at: nil) }- self.whitelisted_ransackable_attributes = %w[email completed_at token updated_at]+ # Shape only — email presence during checkout is a Checkout::Requirements+ # concern, never a model validation (guest carts have no email).+ validates :email, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }- attr_accessor :skip_market_resolution+ self.whitelisted_ransackable_attributes = %w[email completed_at token updated_at]before_update :ensure_updated_fulfillments, :homogenize_line_item_currencies, if: :currency_changed?@@ -129,12 +131,6 @@ module Spreeprefixed_idend- # @return [Boolean]- def completed?- completed_at.present?- end- alias complete? completed?-# A completed cart is an immutable audit record — post-checkout life# belongs to the order. Blocks save/update_columns/touch/destroy at the# model level; the completion write itself passes because it fires while@@ -148,20 +144,6 @@ module Spreecompleting_at.present?end- # Mirrors Order#can_be_deleted? — a completed cart is an immutable audit- # record, and settled money must never be deleted.- #- # @return [Boolean]- def can_be_deleted?- !completed? && payments.completed.empty?- end-- # Checkout begins once any checkout-only data is present (email or a- # shipping address). Drives stock-reservation dispatch.- def in_checkout?- !completed? && (email.present? || ship_address_id.present?)- end-# Recomputes and persists money totals (item, tax, promotion, delivery)# and derived item counts. Convenience for# {Spree::Carts::RecalculateTotals}.@@ -169,48 +151,10 @@ module SpreeSpree.cart_recalculate_totals_workflow.call(cart: self)end- def quantity- line_items.sum(:quantity)- end-def outstanding_balancetotal - payment_totalend- # Total fulfillment discount applied by promotions, as a positive amount.- #- # @return [BigDecimal]- def fulfillment_discount- discounts.for_fulfillments.sum(:amount) * -1- end-- def outstanding_balance?- outstanding_balance != 0- end-- # Whether every line item can be delivered without a shipping address- # (digital-only carts skip the address/delivery steps).- def delivery_required?- line_items.any? && !digital?- end-- def paid?- total.positive? && payment_total >= total- end-- def backordered?- fulfillment_items.any?(&:backordered?)- end-- def guest_checkout_disallowed?- return false if customer.present?-- resolved_channel = channel || store&.default_channel- return false unless resolved_channel.respond_to?(:guest_checkout_enabled?)-- !resolved_channel.guest_checkout_enabled?- end-# Idempotent delivery-proposal rebuild — replaces the destructive# order-side create_proposed_fulfillments. Open fulfillments are rebuilt from# the current items/address; nothing here touches a completed cart.@@ -273,7 +217,12 @@ module Spree)endalias set_shipments_cost set_fulfillments_cost- alias create_proposed_fulfillments rebuild_fulfillments!++ # @deprecated Use {#rebuild_fulfillments!}; removed in 6.1.+ def create_proposed_fulfillments+ Spree::Deprecation.warn('Spree::Cart#create_proposed_fulfillments is deprecated and will be removed in Spree 6.1. Use #rebuild_fulfillments! instead.')+ rebuild_fulfillments!+ enddef ensure_updated_fulfillmentsrebuild_fulfillments! unless completed?@@ -290,19 +239,6 @@ module Spreeend- def amount_due- [outstanding_balance - total_applied_store_credit, 0].max- end-- # Serializer surface: available payment methods for this cart.- def payment_methods- collect_frontend_payment_methods- end-- def collect_frontend_payment_methods- store.payment_methods.active.available_on_front_end.select { |payment_method| payment_method.available_for_order?(self) }- end-# Binds a signing-in user to the cart through the swappable associate# service (same seam Order#associate_user! uses).def associate_user!(user, override_email = true)diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex 7728787a15..0cdf125378 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -30,6 +30,9 @@ module Spreeinclude Spree::Purchase::LineItemCurrenciesinclude Spree::Purchase::PaymentProcessinginclude Spree::Purchase::Addresses+ include Spree::Purchase::Validations+ include Spree::Purchase::Totals+ include Spree::Purchase::Lifecycleinclude Spree::Core::NumberGenerator.new(prefix: 'R')include Spree::NumberIdentifier@@ -59,9 +62,6 @@ module Spreealias display_ship_total display_delivery_totalalias_attribute :ship_total, :delivery_total- def amount_due- [outstanding_balance - total_applied_store_credit, 0].max- end# Transient warnings populated by remove_out_of_stock_items! and ensure_available_shipping_ratesattribute :warnings, default: -> { [] }@@ -101,25 +101,6 @@ module Spreeself.customer_note = valueend- MONEY_THRESHOLD = 100_000_000- MONEY_VALIDATION = {- presence: true,- numericality: {- greater_than: -MONEY_THRESHOLD,- less_than: MONEY_THRESHOLD,- allow_blank: true- },- format: { with: /\A-?\d+(?:\.\d{1,2})?\z/, allow_blank: true }- }.freeze-- POSITIVE_MONEY_VALIDATION = MONEY_VALIDATION.deep_dup.tap do |validation|- validation.fetch(:numericality)[:greater_than_or_equal_to] = 0- end.freeze-- NEGATIVE_MONEY_VALIDATION = MONEY_VALIDATION.deep_dup.tap do |validation|- validation.fetch(:numericality)[:less_than_or_equal_to] = 0- end.freeze-# lock_version (renamed from state_lock_version) drives the API's manual# optimistic concurrency (compare client-sent version, 409 on mismatch) —# Rails auto-locking must not raise on internal saves.@@ -154,6 +135,13 @@ module SpreeASSOCIATED_USER_ATTRIBUTES = [:user_id, :email, :bill_address_id, :ship_address_id]+ # @deprecated Use {Spree::Purchase::PaymentProcessing#payment_methods};+ # removed in 6.1.+ def collect_frontend_payment_methods+ Spree::Deprecation.warn('Spree::Order#collect_frontend_payment_methods is deprecated and will be removed in Spree 6.1. Use #payment_methods instead.')+ payment_methods+ end+# 6.0 forward-compat: User→Customer rename. Column stays user_id in 5.x.alias_attribute :customer_id, :user_id@@ -229,22 +217,11 @@ module Spreebefore_create :link_by_emailbefore_update :ensure_updated_fulfillments, :homogenize_line_item_currencies, if: :currency_changed?- with_options presence: true do- # we want to have this case_sentive: true as changing it to false causes all SQL to use LOWER(slug)- # which is very costly and slow on large set of records- validates :email, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email- validates :total_quantity, numericality: { greater_than_or_equal_to: 0, less_than: 2**31, only_integer: true, allow_blank: true }- end- validates :payment_status, inclusion: { in: PAYMENT_STATES, allow_blank: true }- validates :fulfillment_status, inclusion: { in: FULFILLMENT_STATUSES, allow_blank: true }- validates :item_total, POSITIVE_MONEY_VALIDATION- validates :adjustment_total, MONEY_VALIDATION- validates :included_tax_total, POSITIVE_MONEY_VALIDATION- validates :additional_tax_total, POSITIVE_MONEY_VALIDATION- validates :payment_total, MONEY_VALIDATION- validates :delivery_total, MONEY_VALIDATION- validates :discount_total, NEGATIVE_MONEY_VALIDATION- validates :total, MONEY_VALIDATION+ # Shared money/quantity validations live in Spree::Purchase::Validations;+ # only order-specific rules stay here.+ validates :email, presence: true, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email+ validates :payment_status, inclusion: { in: PAYMENT_STATES, allow_blank: true }+ validates :fulfillment_status, inclusion: { in: FULFILLMENT_STATUSES, allow_blank: true }# @deprecated Both warn and run the full recalculation; use# {#recalculate_totals!}. Removed in 6.1.@@ -368,12 +345,6 @@ module Spree(item_total + line_items.sum(:promo_total)).to_fend- # Total fulfillment discount applied by promotions, as a positive amount.- #- # @return [BigDecimal]- def fulfillment_discount- discounts.for_fulfillments.sum(:amount) * -1- end# @deprecated Use {#fulfillment_discount}; removed in 6.1.def shipping_discount@@ -381,15 +352,7 @@ module Spreefulfillment_discountend- def completed?- completed_at.present?- end- # Orders are never mid-checkout since the cart flip — only a draft mid- # completion (or an admin draft) is still mutable.- def in_checkout?- draft? && !completed? && !canceled? && !cart?- enddef draft?status == 'draft'@@ -403,8 +366,6 @@ module Spreestatus == 'canceled'end- alias complete? completed?-# @deprecated machine vocabulary — data-derived bridge for the 6.0# transition, removed in 6.1. An order is "cart-like" while a draft# with no checkout data.@@ -447,18 +408,11 @@ module Spreeline_items.exists?end- # Does this order require a delivery (physical or digital).- def delivery_required?- true # true for Spree, can be decorated- enddef email_required?require_emailend- def backordered?- fulfillments.any?(&:backordered?)- end# Check if the shipping address is a quick checkout address# quick checkout addresses are incomplete as wallet providers like Apple Pay and Google Pay@@ -513,22 +467,6 @@ module Spree@merger ||= Spree::OrderMerger.new(self)end- # @return [Boolean] true when this order has no registered user and its- # channel forbids guest checkout (see Spree::Channel::Gating). Enforced by- # the checkout completion service and the v3 Store API so every completion- # path (controller, payment webhook) is covered.- #- # A +prices_hidden+ channel also disallows guest completion regardless of- # the +guest_checkout+ flag — prices are withheld from guests, and a buyer- # who cannot see prices cannot meaningfully place an order. This dissolves- # the otherwise contradictory "prices hidden but guests may buy" config.- def guest_checkout_disallowed?- return false if user_id.present?- return false if channel.blank?- return true if channel.storefront_prices_hidden?-- !channel.resolved_guest_checkout- enddef allow_cancel?return false if !completed? || canceled?@@ -598,9 +536,6 @@ module Spreereimbursements.sum(&:paid_amount)end- def outstanding_balance?- outstanding_balance != 0- enddef nameif (address = bill_address || ship_address)@@ -663,17 +598,10 @@ module Spreeupdate_statuses!end- # Helper methods for checkout steps- def paid?- payments.valid.completed.size == payments.valid.size && payments.valid.sum(:amount) >= total- end- def payment_methods- @payment_methods ||= store.payment_methods.active.available_on_front_end.select { |pm| pm.available_for_order?(self) }- enddef available_payment_methods(store = nil)- Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')+ Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 6.1. Use `payment_methods` instead.')@available_payment_methods ||= collect_payment_methods(store)end@@ -749,7 +677,7 @@ module Spreefully_fulfilled?end- def create_proposed_fulfillments+ def rebuild_fulfillments!discounts.for_fulfillments.delete_alltax_lines.for_fulfillments.delete_allfees.for_fulfillments.delete_all@@ -769,10 +697,16 @@ module Spreeendend- # @deprecated Use {#create_proposed_fulfillments}; removed in 6.1.+ # @deprecated Use {#rebuild_fulfillments!}; removed in 6.1.+ def create_proposed_fulfillments+ Spree::Deprecation.warn('Spree::Order#create_proposed_fulfillments is deprecated and will be removed in Spree 6.1. Use #rebuild_fulfillments! instead.')+ rebuild_fulfillments!+ end++ # @deprecated Use {#rebuild_fulfillments!}; removed in 6.1.def create_proposed_shipments- Spree::Deprecation.warn('Spree::Order#create_proposed_shipments is deprecated and will be removed in Spree 6.1. Use #create_proposed_fulfillments instead.')- create_proposed_fulfillments+ Spree::Deprecation.warn('Spree::Order#create_proposed_shipments is deprecated and will be removed in Spree 6.1. Use #rebuild_fulfillments! instead.')+ rebuild_fulfillments!end# Resolves the routing strategy from the channel override first, then the@@ -933,9 +867,6 @@ module Spree!approved?end- def can_be_deleted?- !completed? && payments.completed.empty?- enddef consider_riskconsidered_risky! if is_risky? && !approved?@@ -956,9 +887,6 @@ module SpreeSpree.order_approve_service.call(order: self)end- def quantity- line_items.sum(:quantity)- enddef has_non_reimbursement_related_refunds?refunds.non_reimbursement.exists? ||@@ -969,9 +897,6 @@ module Spreestore.payment_methods.active.available_on_back_end.select { |pm| pm.available_for_order?(self) }end- def collect_frontend_payment_methods- store.payment_methods.active.available_on_front_end.select { |pm| pm.available_for_order?(self) }- end# determines whether the inventory is fully discounted#@@ -1093,7 +1018,7 @@ module Spreeenddef collect_payment_methods- Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')+ Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 6.1. Use `payment_methods` instead.')store.payment_methods.available_on_front_end.select { |pm| pm.available_for_order?(self) }enddiff --git a/spree/core/app/models/spree/order_inventory.rb b/spree/core/app/models/spree/order_inventory.rbindex bfc086418d..68d3d858d7 100644--- a/spree/core/app/models/spree/order_inventory.rb+++ b/spree/core/app/models/spree/order_inventory.rb@@ -101,7 +101,7 @@ module Spreedef add_to_shipment(shipment, quantity)if shipment.nil?- shipment = order.create_proposed_fulfillments.first+ shipment = order.rebuild_fulfillments!.firstelsif variant.should_track_inventory?on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)diff --git a/spree/core/app/services/spree/carts/update.rb b/spree/core/app/services/spree/carts/update.rbindex 0359f33a92..5b82bf661f 100644--- a/spree/core/app/services/spree/carts/update.rb+++ b/spree/core/app/services/spree/carts/update.rb@@ -142,16 +142,7 @@ module Spreereturn if cart.complete?if @address_invalidated || address_changed?- if cart.respond_to?(:recalculate_for_address_change!)- cart.recalculate_for_address_change!- else- cart.ensure_updated_fulfillments- if cart.ship_address.present? && cart.respond_to?(:create_proposed_fulfillments)- cart.create_proposed_fulfillments- cart.set_fulfillments_cost- end- cart.recalculate_totals!- end+ cart.recalculate_for_address_change!elsecart.recalculate_totals!enddiff --git a/spree/core/app/services/spree/payments/create.rb b/spree/core/app/services/spree/payments/create.rbindex 75c38c7ebd..b41778b146 100644--- a/spree/core/app/services/spree/payments/create.rb+++ b/spree/core/app/services/spree/payments/create.rb@@ -14,7 +14,7 @@ module Spreeprotecteddef prepare_payment_attributes(order:, params:)- payment_method = order.collect_frontend_payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }+ payment_method = order.payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }payment_attributes = {amount: params[:amount] || order.order_total_after_store_credit,diff --git a/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rb b/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rbnew file mode 100644index 0000000000..fb74f61431--- /dev/null+++ b/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rb@@ -0,0 +1,93 @@+require 'spec_helper'++RSpec.shared_examples 'a purchase lifecycle host' do+ describe '#completed? / #complete?' do+ it 'keys on completed_at' do+ expect(new_record(completed_at: Time.current)).to be_completed+ expect(new_record(completed_at: Time.current)).to be_complete+ expect(new_record).not_to be_completed+ end+ end++ describe '#in_checkout?' do+ it 'begins once checkout-only data appears and ends at completion' do+ expect(new_record).not_to be_in_checkout+ expect(new_record(email: '[email protected]')).to be_in_checkout+ expect(new_record(ship_address: create(:address))).to be_in_checkout+ expect(new_record(email: '[email protected]', completed_at: Time.current)).not_to be_in_checkout+ end+ end++ describe '#can_be_deleted?' do+ it 'is true only for an open record without settled payments' do+ expect(new_record).to be_can_be_deleted+ expect(new_record(completed_at: Time.current)).not_to be_can_be_deleted++ record = new_record_with_line_items+ create_payment(record, state: 'completed', amount: record.total)+ expect(record.reload).not_to be_can_be_deleted+ end+ end++ describe '#backordered?' do+ it 'reflects backordered fulfillment items' do+ record = new_record+ allow(record).to receive(:fulfillment_items).and_return([double(backordered?: false), double(backordered?: true)])++ expect(record).to be_backordered+ end+ end++ describe '#guest_checkout_disallowed?' do+ it 'never blocks a signed-in customer' do+ expect(new_record(customer: create(:user)).guest_checkout_disallowed?).to be(false)+ end++ it 'follows the channel guest-checkout flag for guests' do+ record = new_record+ record.valid? # resolve the default channel++ allow(record.channel).to receive(:guest_checkout_enabled?).and_return(false)+ expect(record.guest_checkout_disallowed?).to be(true)++ allow(record.channel).to receive(:guest_checkout_enabled?).and_return(true)+ expect(record.guest_checkout_disallowed?).to be(false)+ end+ end+end++RSpec.describe Spree::Purchase::Lifecycle do+ let(:store) { @default_store }++ context 'included in Spree::Cart' do+ def new_record(customer: nil, **attributes)+ build(:cart, store: @default_store, customer: customer, **attributes)+ end++ def new_record_with_line_items+ create(:cart_with_line_items, store: @default_store)+ end++ def create_payment(record, **attributes)+ create(:payment, cart: record, order: nil, **attributes)+ end++ it_behaves_like 'a purchase lifecycle host'+ end++ context 'included in Spree::Order' do+ def new_record(customer: nil, **attributes)+ build(:order, store: @default_store, user: customer, **attributes)+ end++ def new_record_with_line_items+ create(:order_with_line_items, store: @default_store)+ end++ def create_payment(record, **attributes)+ create(:payment, order: record, **attributes)+ end++ it_behaves_like 'a purchase lifecycle host'+ end+enddiff --git a/spree/core/spec/models/concerns/spree/purchase/payment_processing_spec.rb b/spree/core/spec/models/concerns/spree/purchase/payment_processing_spec.rbindex 2115669162..6d842819c7 100644--- a/spree/core/spec/models/concerns/spree/purchase/payment_processing_spec.rb+++ b/spree/core/spec/models/concerns/spree/purchase/payment_processing_spec.rb@@ -131,6 +131,28 @@ RSpec.shared_examples 'a payment processing host' doendend+ describe '#payment_methods' do+ let(:record) { new_record_with_line_items }+ let(:store) { record.store }++ it 'lists active front-end methods available for this record' do+ available = create(:credit_card_payment_method, store: store)+ inactive = create(:credit_card_payment_method, store: store, active: false)+ back_office_only = create(:credit_card_payment_method, store: store, display_on: 'back_end')++ expect(record.payment_methods).to include(available)+ expect(record.payment_methods).not_to include(inactive)+ expect(record.payment_methods).not_to include(back_office_only)+ end++ it 'excludes methods that report themselves unavailable for the record' do+ # Store credit is only offered when the customer actually holds credit.+ store_credit_method = create(:store_credit_payment_method, store: store)++ expect(record.payment_methods).not_to include(store_credit_method)+ end+ end+describe '#payment_required?' dolet(:record) { new_record_with_line_items }@@ -222,5 +244,13 @@ RSpec.describe Spree::Purchase::PaymentProcessing doendit_behaves_like 'a payment processing host'++ it 'bridges the deprecated collect_frontend_payment_methods to payment_methods' do+ order = new_record_with_line_items+ available = create(:credit_card_payment_method, store: order.store)++ expect(Spree::Deprecation).to receive(:warn).with(/collect_frontend_payment_methods/)+ expect(order.collect_frontend_payment_methods).to include(available)+ endendenddiff --git a/spree/core/spec/models/concerns/spree/purchase/totals_spec.rb b/spree/core/spec/models/concerns/spree/purchase/totals_spec.rbnew file mode 100644index 0000000000..2df4aee401--- /dev/null+++ b/spree/core/spec/models/concerns/spree/purchase/totals_spec.rb@@ -0,0 +1,94 @@+require 'spec_helper'++RSpec.shared_examples 'a purchase totals host' do+ describe '#quantity' do+ it 'sums line item quantities' do+ record = new_record_with_line_items+ record.line_items.first.update_column(:quantity, 3)++ expect(record.quantity).to eq(3)+ end+ end++ describe '#outstanding_balance?' do+ it 'reflects a non-zero balance' do+ expect(new_record(total: 10.10, payment_total: 9.50).outstanding_balance?).to be(true)+ expect(new_record(total: 8.25, payment_total: 10.44).outstanding_balance?).to be(true)+ expect(new_record(total: 10.10, payment_total: 10.10).outstanding_balance?).to be(false)+ end+ end++ describe '#paid?' do+ it 'requires a positive total fully covered by payments' do+ expect(new_record(total: 100, payment_total: 100)).to be_paid+ expect(new_record(total: 100, payment_total: 40)).not_to be_paid+ expect(new_record(total: 0, payment_total: 0)).not_to be_paid+ end+ end++ describe '#amount_due' do+ it 'nets applied store credit and never goes negative' do+ record = new_record(total: 100, payment_total: 40)++ allow(record).to receive(:total_applied_store_credit).and_return(70)+ expect(record.amount_due).to eq(0)++ allow(record).to receive(:total_applied_store_credit).and_return(10)+ expect(record.amount_due).to eq(50)+ end+ end++ describe '#fulfillment_discount' do+ it 'sums fulfillment-attached discounts as a positive amount' do+ record = new_record_with_line_items+ fulfillment = create_fulfillment(record)+ create_fulfillment_discount(record, fulfillment)++ expect(record.fulfillment_discount).to eq(4)+ end+ end+end++RSpec.describe Spree::Purchase::Totals do+ let(:store) { @default_store }++ context 'included in Spree::Cart' do+ def new_record(**attributes)+ build(:cart, store: @default_store, **attributes)+ end++ def new_record_with_line_items+ create(:cart_with_line_items, store: @default_store)+ end++ def create_fulfillment(record)+ create(:fulfillment, cart: record, order: nil)+ end++ def create_fulfillment_discount(record, fulfillment)+ create(:discount, order: nil, cart: record, line_item: nil, fulfillment: fulfillment, amount: -4, kind: 'promotion')+ end++ it_behaves_like 'a purchase totals host'+ end++ context 'included in Spree::Order' do+ def new_record(**attributes)+ build(:order, store: @default_store, **attributes)+ end++ def new_record_with_line_items+ create(:order_with_line_items, store: @default_store)+ end++ def create_fulfillment(record)+ create(:fulfillment, order: record)+ end++ def create_fulfillment_discount(record, fulfillment)+ create(:discount, order: record, cart: nil, line_item: nil, fulfillment: fulfillment, amount: -4, kind: 'promotion')+ end++ it_behaves_like 'a purchase totals host'+ end+enddiff --git a/spree/core/spec/models/concerns/spree/purchase/validations_spec.rb b/spree/core/spec/models/concerns/spree/purchase/validations_spec.rbnew file mode 100644index 0000000000..f853f5328f--- /dev/null+++ b/spree/core/spec/models/concerns/spree/purchase/validations_spec.rb@@ -0,0 +1,55 @@+require 'spec_helper'++RSpec.shared_examples 'a purchase validations host' do+ describe 'money columns' do+ it 'rejects a negative positive-only total' do+ record = new_record(item_total: -1)++ expect(record).not_to be_valid+ expect(record.errors[:item_total]).to be_present+ end++ it 'rejects a positive discount_total' do+ record = new_record(discount_total: 3)++ expect(record).not_to be_valid+ expect(record.errors[:discount_total]).to be_present+ end++ it 'rejects totals beyond the money threshold' do+ record = new_record(total: Spree::Purchase::Validations::MONEY_THRESHOLD)++ expect(record).not_to be_valid+ expect(record.errors[:total]).to be_present+ end+ end++ describe 'total_quantity' do+ it 'rejects negative and fractional quantities' do+ expect(new_record(total_quantity: -1)).not_to be_valid+ expect(new_record(total_quantity: 1.5)).not_to be_valid+ expect(new_record(total_quantity: 3)).to be_valid+ end+ end++end++RSpec.describe Spree::Purchase::Validations do+ let(:store) { @default_store }++ context 'included in Spree::Cart' do+ def new_record(**attributes)+ build(:cart, store: @default_store, **attributes)+ end++ it_behaves_like 'a purchase validations host'+ end++ context 'included in Spree::Order' do+ def new_record(**attributes)+ build(:order, store: @default_store, email: '[email protected]', **attributes)+ end++ it_behaves_like 'a purchase validations host'+ end+enddiff --git a/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rb b/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rbindex 1c89456d01..b2c16bce87 100644--- a/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rb+++ b/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rb@@ -31,7 +31,7 @@ RSpec.describe Spree::Calculator::Shipping::DigitalDelivery dopackage = Spree::Stock::Package.new(create(:stock_location), [])variants.each do |v|add_line_item_to_order(order, v, 1)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!package.add(order.inventory_units.where(variant_id: v.id).first, 1)endpackage@@ -44,7 +44,7 @@ RSpec.describe Spree::Calculator::Shipping::DigitalDelivery dopackage = Spree::Stock::Package.new(create(:stock_location), [])variants.each do |v|add_line_item_to_order(order, v, 1)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!package.add(order.inventory_units.where(variant_id: v.id).first, 1)endpackage@@ -56,7 +56,7 @@ RSpec.describe Spree::Calculator::Shipping::DigitalDelivery dopackage = Spree::Stock::Package.new(create(:stock_location), [])variants.each do |v|add_line_item_to_order(order, v, 1)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!package.add(order.inventory_units.where(variant_id: v.id).first, 1)endpackagediff --git a/spree/core/spec/models/spree/cart_spec.rb b/spree/core/spec/models/spree/cart_spec.rbindex 772fed64a3..668c2db33c 100644--- a/spree/core/spec/models/spree/cart_spec.rb+++ b/spree/core/spec/models/spree/cart_spec.rb@@ -4,6 +4,25 @@ describe Spree::Cart, type: :model dolet(:store) { @default_store }let(:customer) { create(:user) }+ describe 'Validations' do+ describe '#email' do+ it 'allows a blank email — presence during checkout is a Requirements concern' do+ expect(build(:cart, store: store, email: nil)).to be_valid+ end++ it 'rejects a malformed email whenever one is present' do+ cart = build(:cart, store: store, email: 'not-an-email')++ expect(cart).not_to be_valid+ expect(cart.errors[:email]).to be_present+ end++ it 'rejects an email longer than 254 characters' do+ expect(build(:cart, store: store, email: "#{'a' * 250}@x.com")).not_to be_valid+ end+ end+ end+describe '#checkout_steps' dolet(:cart) { build(:cart, store: store) }@@ -267,32 +286,6 @@ describe Spree::Cart, type: :model doendend- describe '#can_be_deleted?' do- it 'is true for an open cart without settled payments' do- expect(build(:cart)).to be_can_be_deleted- end-- it 'is false once completed' do- expect(build(:cart, completed_at: Time.current)).not_to be_can_be_deleted- end-- it 'is false with a completed payment' do- cart = create(:cart_with_line_items, store: store)- create(:payment, cart: cart, order: nil, state: 'completed', amount: cart.total)-- expect(cart.reload).not_to be_can_be_deleted- end- end-- describe '#in_checkout?' do- it 'begins once checkout-only data appears and ends at completion' do- expect(build(:cart)).not_to be_in_checkout- expect(build(:cart, email: '[email protected]')).to be_in_checkout- expect(build(:cart, ship_address: create(:address))).to be_in_checkout- expect(build(:cart, email: '[email protected]', completed_at: Time.current)).not_to be_in_checkout- end- end-describe '#recalculate_totals!' doit 'runs the configured totals workflow on itself' docart = create(:cart, store: store)@@ -302,105 +295,9 @@ describe Spree::Cart, type: :model doendend- describe '#quantity' do- it 'sums line item quantities' do- cart = create(:cart_with_line_items, line_items_count: 2)- cart.line_items.first.update_column(:quantity, 3)-- expect(cart.quantity).to eq(4)- end- end-- describe 'money readers' do- let(:cart) { build(:cart, total: 100, payment_total: 40) }-- it '#outstanding_balance is total minus payment_total' do- expect(cart.outstanding_balance).to eq(60)- end-- it '#outstanding_balance? reflects a non-zero balance' do- expect(cart.outstanding_balance?).to be(true)- expect(build(:cart, total: 40, payment_total: 40).outstanding_balance?).to be(false)- end-- it '#paid? requires a positive total fully covered by payments' do- expect(build(:cart, total: 100, payment_total: 100)).to be_paid- expect(build(:cart, total: 100, payment_total: 40)).not_to be_paid- expect(build(:cart, total: 0, payment_total: 0)).not_to be_paid- end-- it '#amount_due nets applied store credit and never goes negative' do- allow(cart).to receive(:total_applied_store_credit).and_return(70)-- expect(cart.amount_due).to eq(0)-- allow(cart).to receive(:total_applied_store_credit).and_return(10)- expect(cart.amount_due).to eq(50)- end- end-- describe '#fulfillment_discount' do- it 'sums fulfillment-attached discounts as a positive amount' do- cart = create(:cart_with_line_items, store: store)- fulfillment = create(:fulfillment, cart: cart, order: nil)- create(:discount, order: nil, cart: cart, line_item: nil, fulfillment: fulfillment, amount: -4, kind: 'promotion')-- expect(cart.fulfillment_discount).to eq(4)- end- end-- describe '#delivery_required?' do- it 'is false for an empty cart and true with physical items' do- expect(build(:cart)).not_to be_delivery_required- expect(create(:cart_with_line_items)).to be_delivery_required- end-- it 'is false for a digital-only cart' do- cart = create(:cart_with_line_items)- allow(cart).to receive(:digital?).and_return(true)-- expect(cart).not_to be_delivery_required- end- end-- describe '#backordered?' do- let(:cart) { create(:cart_with_line_items, store: store) }- let!(:fulfillment) { create(:fulfillment, cart: cart, order: nil) }-- it 'reflects backordered fulfillment items' do- expect(cart.reload).not_to be_backordered-- fulfillment.fulfillment_items.update_all(status: 'backordered')- expect(Spree::Cart.find(cart.id)).to be_backordered- end- end-- describe '#guest_checkout_disallowed?' do- it 'never blocks a signed-in customer' do- expect(build(:cart, customer: create(:user)).guest_checkout_disallowed?).to be(false)- end-- it 'follows the channel guest-checkout flag for guests' do- cart = create(:cart, store: store, customer: nil)-- allow(cart.channel).to receive(:guest_checkout_enabled?).and_return(false)- expect(cart.guest_checkout_disallowed?).to be(true)-- allow(cart.channel).to receive(:guest_checkout_enabled?).and_return(true)- expect(cart.guest_checkout_disallowed?).to be(false)- end- end-- describe '#payment_methods' do- let(:cart) { create(:cart, store: store) }-- it 'lists active front-end methods available for this cart' do- available = create(:credit_card_payment_method, store: store)- inactive = create(:credit_card_payment_method, store: store, active: false)-- expect(cart.payment_methods).to include(available)- expect(cart.payment_methods).not_to include(inactive)- expect(cart.collect_frontend_payment_methods).to eq(cart.payment_methods)+ describe '#outstanding_balance' do+ it 'is total minus payment_total (carts never net refunds)' do+ expect(build(:cart, total: 100, payment_total: 40).outstanding_balance).to eq(60)endenddiff --git a/spree/core/spec/models/spree/delivery_method_rule_spec.rb b/spree/core/spec/models/spree/delivery_method_rule_spec.rbindex 6bf25128c9..48e0f7beb8 100644--- a/spree/core/spec/models/spree/delivery_method_rule_spec.rb+++ b/spree/core/spec/models/spree/delivery_method_rule_spec.rb@@ -59,7 +59,7 @@ describe Spree::DeliveryMethodRule, type: :model doit 'drops ineligible methods from rate estimation' dofulfillment = order.fulfillments.first || begin- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.fulfillments.firstendmethod = fulfillment.refresh_rates.map(&:delivery_method).first@@ -74,7 +74,7 @@ describe Spree::DeliveryMethodRule, type: :model doendit 'keeps methods whose rules pass' do- order.create_proposed_fulfillments if order.fulfillments.none?+ order.rebuild_fulfillments! if order.fulfillments.none?fulfillment = order.fulfillments.firstmethod = fulfillment.refresh_rates.map(&:delivery_method).first@@ -87,7 +87,7 @@ describe Spree::DeliveryMethodRule, type: :model doendit 'ignores inactive rules' do- order.create_proposed_fulfillments if order.fulfillments.none?+ order.rebuild_fulfillments! if order.fulfillments.none?fulfillment = order.fulfillments.firstmethod = fulfillment.refresh_rates.map(&:delivery_method).firstdiff --git a/spree/core/spec/models/spree/line_item_spec.rb b/spree/core/spec/models/spree/line_item_spec.rbindex ba094aca8f..1f94d99c6a 100644--- a/spree/core/spec/models/spree/line_item_spec.rb+++ b/spree/core/spec/models/spree/line_item_spec.rb@@ -376,7 +376,7 @@ describe Spree::LineItem, type: :model dobefore dovariant.stock_items.update_all count_on_hand: 5, backorderable: falseSpree::Orders::AddItem.call(order: order, variant: variant, quantity: 5)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.finalize!order.reloadend@@ -405,7 +405,7 @@ describe Spree::LineItem, type: :model dobefore dovariant.stock_items.update_all count_on_hand: 7, backorderable: falseSpree::Orders::AddItem.call(order: order, variant: variant, quantity: 5)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.finalize!order.reloadenddiff --git a/spree/core/spec/models/spree/order/adjustments_spec.rb b/spree/core/spec/models/spree/order/adjustments_spec.rbindex 6c7491ccc7..c16cbcaa27 100644--- a/spree/core/spec/models/spree/order/adjustments_spec.rb+++ b/spree/core/spec/models/spree/order/adjustments_spec.rb@@ -14,7 +14,7 @@ describe Spree::Order dobefore dopersisted_order.line_items << line_itempersisted_order.update!(ship_address: create(:address))- persisted_order.create_proposed_fulfillments+ persisted_order.rebuild_fulfillments!persisted_order.set_fulfillments_costcreate(:discount, order: persisted_order, line_item: line_item, amount: -line_item.amount, label: 'Promotion', kind: 'manual')persisted_order.recalculate_totals!@@ -57,7 +57,7 @@ describe Spree::Order dobefore doorder.line_items << line_itemorder.ship_address = address- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.send :ensure_available_shipping_ratesorder.set_fulfillments_costorder.create_shipment_tax_charge!diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rbindex ccb942c209..5226faf80d 100644--- a/spree/core/spec/models/spree/order_spec.rb+++ b/spree/core/spec/models/spree/order_spec.rb@@ -17,6 +17,37 @@ describe Spree::Order, type: :model doit_behaves_like 'metadata'+ describe 'Validations' do+ describe '#email' do+ it 'is not required on drafts' do+ expect(build(:order, store: store, email: nil)).to be_valid+ end++ it 'is required once placed' do+ order = create(:order, store: store, email: '[email protected]')+ order.assign_attributes(email: nil, status: 'placed', completed_at: Time.current)++ expect(order).not_to be_valid+ expect(order.errors[:email]).to be_present+ end++ it 'rejects a malformed email when required' do+ order = create(:order, store: store, email: '[email protected]')+ order.assign_attributes(email: 'not-an-email', status: 'placed', completed_at: Time.current)++ expect(order).not_to be_valid+ expect(order.errors[:email]).to be_present+ end++ it 'rejects an email longer than 254 characters when required' do+ order = create(:order, store: store, email: '[email protected]')+ order.assign_attributes(email: "#{'a' * 250}@x.com", status: 'placed', completed_at: Time.current)++ expect(order).not_to be_valid+ end+ end+ end+describe 'Scopes' dolet!(:user) { create(:user) }let!(:completed_order) { create(:order, user: user, completed_at: Time.current) }@@ -378,72 +409,6 @@ describe Spree::Order, type: :model doendend- describe '#amount_due' do- let(:store_credit) { create(:store_credit, amount: 200, store: order.store, user: order.user) }- let(:store_credit_payment_method) { create(:store_credit_payment_method, store: order.store) }-- before { order.update_columns(total: 100, payment_total: 0) }-- context 'without store credit' do- it 'returns the outstanding balance' do- expect(order.amount_due).to eq(100)- end- end-- context 'with store credit payment in checkout state' do- before do- create(:store_credit_payment, order: order, amount: 60, state: 'checkout',- source: store_credit, payment_method: store_credit_payment_method)- end-- it 'subtracts the applied store credit from outstanding balance' do- expect(order.amount_due).to eq(40)- end- end-- context 'with store credit covering the full order total' do- before do- create(:store_credit_payment, order: order, amount: 100, state: 'checkout',- source: store_credit, payment_method: store_credit_payment_method)- end-- it 'returns zero' do- expect(order.amount_due).to eq(0)- end- end-- context 'with completed store credit and card payment' do- before do- create(:store_credit_payment, order: order, amount: 60, state: 'completed',- source: store_credit, payment_method: store_credit_payment_method)- create(:payment, order: order, amount: 40, state: 'completed')- order.update_columns(payment_total: 100)- end-- it 'returns zero when fully paid' do- expect(order.amount_due).to eq(0)- end- end-- context 'with invalid store credit payment' do- before do- create(:store_credit_payment, order: order, amount: 60, state: 'invalid',- source: store_credit, payment_method: store_credit_payment_method)- end-- it 'ignores invalid store credit payments' do- expect(order.amount_due).to eq(100)- end- end-- it 'never returns a negative value' do- create(:store_credit_payment, order: order, amount: 60, state: 'checkout',- source: store_credit, payment_method: store_credit_payment_method)- order.update_columns(payment_total: 80)- expect(order.amount_due).to eq(0)- end- end-describe '#display_outstanding_balance' doit 'returns the value as a spree money' doallow(order).to receive(:outstanding_balance).and_return(10.55)@@ -619,6 +584,19 @@ describe Spree::Order, type: :model dolet(:order) { build(:order, order_attributes) }+ # The user-default ship address only copies onto records needing+ # physical delivery (Spree::Carts::Associate).+ before { allow(order).to receive(:delivery_required?).and_return(true) }++ it 'does not copy the ship address onto a record without physical delivery' do+ empty_order = create(:order, user: nil, ship_address: nil)++ empty_order.associate_user!(user)++ expect(empty_order.reload.user).to eq(user)+ expect(empty_order.ship_address_id).to be_nil+ end+let(:order_attributes) do{user: nil,@@ -835,7 +813,7 @@ describe Spree::Order, type: :model docontext 'when order has shipments and is not completed' dobefore do- order.create_proposed_fulfillments+ order.rebuild_fulfillments!endit 'destroys all shipments' do@@ -966,20 +944,6 @@ describe Spree::Order, type: :model doendend- describe '#backordered?' do- let(:shipments) { create_list(:shipment, 2) }-- before do- allow(shipments.first).to receive_messages(backordered?: true)- allow(shipments.second).to receive_messages(backordered?: false)- allow(order).to receive_messages(fulfillments: shipments)- end-- it 'is backordered if one of the shipments is backordered' do- expect(order).to be_backordered- end- end-describe '#can_cancel?' doit 'is false for a canceled order' doorder.status = 'canceled'@@ -1121,7 +1085,7 @@ describe Spree::Order, type: :model doendend- describe '#create_proposed_fulfillments' do+ describe '#rebuild_fulfillments!' docontext 'has unassociated inventory units' dolet!(:inventory_unit) { create(:inventory_unit, order: subject) }@@ -1135,7 +1099,7 @@ describe Spree::Order, type: :model doendit 'does not delete inventory_unit' do- subject.create_proposed_fulfillments+ subject.rebuild_fulfillments!expect(inventory_unit.reload).to eq inventory_unitendend@@ -1146,7 +1110,7 @@ describe Spree::Order, type: :model doendit 'does not delete inventory_unit' do- subject.create_proposed_fulfillments+ subject.rebuild_fulfillments!expect(inventory_unit.reload).to eq inventory_unitendend@@ -1157,7 +1121,7 @@ describe Spree::Order, type: :model doendit 'deletes inventory_unit' do- subject.create_proposed_fulfillments+ subject.rebuild_fulfillments!expect { inventory_unit.reload }.to raise_error(ActiveRecord::RecordNotFound)endend@@ -1168,7 +1132,7 @@ describe Spree::Order, type: :model doendit 'deletes inventory_unit' do- subject.create_proposed_fulfillments+ subject.rebuild_fulfillments!expect { inventory_unit.reload }.to raise_error(ActiveRecord::RecordNotFound)endend@@ -1183,7 +1147,7 @@ describe Spree::Order, type: :model doallow(strategy).to receive(:for_allocation).and_return([package])allow(subject).to receive(:order_routing_strategy).and_return(strategy)- subject.create_proposed_fulfillments+ subject.rebuild_fulfillments!expect(subject.fulfillments).to eq [shipment]endend@@ -1859,134 +1823,14 @@ describe Spree::Order, type: :model doendend- describe '#paid?' do- subject { order.paid? }-- let!(:payment_0) { create(:payment, order: order, amount: amount) }- let!(:payment_1) { create(:payment, order: order, amount: amount) }- let!(:payment_2) { create(:payment, order: order, amount: amount) }- let(:amount) { 100 }- let(:order) { create(:order, total: total) }- let(:total) { 200 }-- before { payment_1.complete }-- context 'when all order valid payments are completed' do- before do- payment_1.complete- payment_2.complete- end-- context 'when the amount of the valid payments < the order total' do- let(:total) { 201 }-- it { expect(subject).to eq(false) }- end-- context 'when the amount of the valid payments == the order total' do- let(:total) { 200 }-- it { expect(subject).to eq(true) }- end-- context 'when the amount of the valid payments > the order total' do- let(:total) { 199 }-- it { expect(subject).to eq(true) }- end- end-- context 'when not all order payments are completed one is void' do- before do- payment_0.void- payment_1.complete- payment_2.complete- end-- context 'when the amount of the valid payments < the order total' do- let(:total) { 201 }-- it { expect(subject).to eq(false) }- end-- context 'when the amount of the valid payments == the order total' do- let(:total) { 200 }-- it { expect(subject).to eq(true) }- end-- context 'when the amount of the valid payments > the order total' do- let(:total) { 199 }-- it { expect(subject).to eq(true) }- end- end-- context 'when not all order payments are completed one is failed' do- before do- payment_0.state = 'failed'- payment_0.save!-- payment_1.complete- payment_2.complete- end-- context 'when the amount of the valid payments < the order total' do- let(:total) { 201 }-- it { expect(subject).to eq(false) }- end-- context 'when the amount of the valid payments == the order total' do- let(:total) { 200 }-- it { expect(subject).to eq(true) }- end-- context 'when the amount of the valid payments > the order total' do- let(:total) { 199 }-- it { expect(subject).to eq(true) }- end- end-- context 'when not all order payments are completed one is invalid' do- before do- payment_0.state = 'invalid'- payment_0.save!-- payment_1.complete- payment_2.complete- end-- context 'when the amount of the valid payments < the order total' do- let(:total) { 201 }-- it { expect(subject).to eq(false) }- end-- context 'when the amount of the valid payments == the order total' do- let(:total) { 200 }-- it { expect(subject).to eq(true) }- end-- context 'when the amount of the valid payments > the order total' do- let(:total) { 199 }-- it { expect(subject).to eq(true) }- end- end- end-- describe '#create_proposed_shipments' do+ describe '#rebuild_fulfillments!' doit 'delegates to #create_proposed_fulfillments with a deprecation warning' doorder = create(:order)expect(Spree::Deprecation).to receive(:warn).with(/create_proposed_fulfillments/)expect(order).to receive(:create_proposed_fulfillments)- order.create_proposed_shipments+ order.rebuild_fulfillments!endend@@ -2386,7 +2230,7 @@ describe Spree::Order, type: :model dophysical_line_itemdigital_line_itemorder.recalculate_totals!- order.create_proposed_fulfillments+ order.rebuild_fulfillments!expect(order.shipments.count).to eq(2)@@ -2405,17 +2249,18 @@ describe Spree::Order, type: :model doenddescribe '#quick_checkout_require_address?' do- let(:order) { create(:order) }+ let(:order) { create(:order_with_line_items) }it 'returns true if the order is not digital and delivery is required' doexpect(order.quick_checkout_require_address?).to be trueendit 'returns false if the order is digital' do- digital_line_item- order.recalculate_totals!+ digital_order = create(:order)+ create(:line_item, variant: digital_variant, quantity: 1, order: digital_order)+ digital_order.recalculate_totals!- expect(order.quick_checkout_require_address?).to be false+ expect(digital_order.reload.quick_checkout_require_address?).to be falseendit 'returns false if the order does not require delivery' dodiff --git a/spree/core/spec/models/spree/shipment_spec.rb b/spree/core/spec/models/spree/shipment_spec.rbindex 7ff9b955c0..df9e39634b 100644--- a/spree/core/spec/models/spree/shipment_spec.rb+++ b/spree/core/spec/models/spree/shipment_spec.rb@@ -380,7 +380,7 @@ describe Spree::Shipment, type: :model dolet(:order) { Spree::Order.create }let(:variant) { create(:variant) }let!(:line_item) { Spree::Orders::AddItem.call(order: order, variant: variant).value }- let!(:shipment) { order.create_proposed_fulfillments.first }+ let!(:shipment) { order.rebuild_fulfillments!.first }it 'returns variant expected' doexpect(shipment.manifest.first.variant).to eq variant@@ -675,10 +675,10 @@ describe Spree::Shipment, type: :model dobefore doSpree::Orders::AddItem.call(order: order, variant: variant)- order.create_proposed_fulfillments+ order.rebuild_fulfillments!Spree::Carts::AddItem.call(order: other_order, variant: variant)- other_order.create_proposed_fulfillments+ other_order.rebuild_fulfillments!endit "doesn't fill backorders when restocking inventory units" dodiff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rbindex 422586bde4..2dd130b57a 100644--- a/spree/core/spec/services/spree/carts/update_spec.rb+++ b/spree/core/spec/services/spree/carts/update_spec.rb@@ -152,7 +152,7 @@ module Spreeendit 'drops delivery proposals built for the cleared address' do- cart.create_proposed_fulfillments+ cart.rebuild_fulfillments!expect(cart.fulfillments).to be_presentexpect(subject).to be_successexpect(cart.reload.fulfillments).to be_empty@@ -337,7 +337,7 @@ module Spreeendit 'preserves existing delivery proposals' do- cart.create_proposed_fulfillments+ cart.rebuild_fulfillments!fulfillment_ids = cart.fulfillments.pluck(:id)expect(fulfillment_ids).not_to be_emptydiff --git a/spree/core/spec/services/spree/checkout/select_shipping_method_spec.rb b/spree/core/spec/services/spree/checkout/select_shipping_method_spec.rbindex dc664cc6d5..e3fe3bedfc 100644--- a/spree/core/spec/services/spree/checkout/select_shipping_method_spec.rb+++ b/spree/core/spec/services/spree/checkout/select_shipping_method_spec.rb@@ -50,7 +50,7 @@ module Spreecontext 'one shipment' dobefore do- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.reloadend@@ -87,7 +87,7 @@ module Spreelet(:shipment_2) { order.shipments.last }before do- order.create_proposed_fulfillments+ order.rebuild_fulfillments!order.reloadend