Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Create carts schema and dormant Cart model (cart/order split Wave 1)

Damian Legawiec02105b3283a9
diff --git a/spree/api/app/controllers/concerns/spree/api/v3/order_lock.rb b/spree/api/app/controllers/concerns/spree/api/v3/order_lock.rb
index 87d36b2e9b..87857a9ded 100644
--- a/spree/api/app/controllers/concerns/spree/api/v3/order_lock.rb
+++ b/spree/api/app/controllers/concerns/spree/api/v3/order_lock.rb
@@ -16,14 +16,14 @@ module Spree
order.with_lock do
# Persist increment within the transaction so reloads inside yield see the new version
- new_version = order.state_lock_version + 1
- order.update_column(:state_lock_version, new_version)
+ new_version = order.lock_version + 1
+ order.update_column(:lock_version, new_version)
yield
if performed? && response.status >= 400
# Operation failed — revert the increment
- order.update_column(:state_lock_version, new_version - 1)
+ order.update_column(:lock_version, new_version - 1)
end
end
end
diff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rb
new file mode 100644
index 0000000000..40312ce1f4
--- /dev/null
+++ b/spree/core/app/models/spree/cart.rb
@@ -0,0 +1,51 @@
+module Spree
+ # The pre-completion (shopping + checkout) phase of a purchase. Completing
+ # checkout copies a cart into an immutable {Spree::Order}; the cart is
+ # retained with +completed_at+ set. Carts have no status column —
+ # +completed_at+ is the only lifecycle marker.
+ #
+ # Dormant until the 6.0 checkout flip: the storefront cart endpoints still
+ # operate on incomplete orders. See docs/plans/6.0-cart-order-split.md.
+ class Cart < Spree.base_class
+ has_prefix_id :cart
+
+ has_secure_token
+
+ # Concurrency is manual (the API's OrderLock semantics — compare
+ # client-sent version, 409 on mismatch); Rails auto-locking must not
+ # raise on internal saves.
+ self.lock_optimistically = false
+
+ # Single consolidated metadata JSON column (docs/plans/decisions.md
+ # 2026-03-16 "Consolidate metadata").
+ attribute :metadata, default: -> { {} }
+ attribute :accept_marketing, :boolean, default: false
+
+ belongs_to :store, class_name: 'Spree::Store'
+ belongs_to :market, class_name: 'Spree::Market', optional: true
+ belongs_to :channel, class_name: 'Spree::Channel', optional: true
+ belongs_to :customer, class_name: "::#{Spree.user_class}", optional: true
+ belongs_to :ship_address, class_name: 'Spree::Address', optional: true
+ belongs_to :bill_address, class_name: 'Spree::Address', optional: true
+
+ has_many :line_items, -> { order(:created_at) }, class_name: 'Spree::LineItem', inverse_of: :cart, dependent: :destroy
+ has_one :order, class_name: 'Spree::Order', inverse_of: :cart
+
+ validates :store, :currency, presence: true
+
+ scope :complete, -> { where.not(completed_at: nil) }
+ scope :incomplete, -> { where(completed_at: nil) }
+
+ self.whitelisted_ransackable_attributes = %w[email completed_at]
+
+ # @return [Boolean]
+ def completed?
+ completed_at.present?
+ end
+
+ # @return [Boolean] whether a completion attempt currently holds this cart
+ def completing?
+ completing_at.present?
+ end
+ end
+end
diff --git a/spree/core/app/models/spree/checkout/registry.rb b/spree/core/app/models/spree/checkout/registry.rb
index 28116ba220..2da71c3369 100644
--- a/spree/core/app/models/spree/checkout/registry.rb
+++ b/spree/core/app/models/spree/checkout/registry.rb
@@ -69,18 +69,28 @@ module Spree
requirements.reject! { |r| r.step == step.to_s && r.field == field.to_s }
end
- # Returns steps sorted by +before+/+after+ constraints relative to the checkout flow.
+ # Canonical ordered list of built-in checkout step names, used to
+ # resolve +before:+/+after:+ anchors. The registry owns this list —
+ # installs that reorder or remove built-in steps set it directly
+ # (+base_step_names=+) instead of customizing the removed
+ # +checkout_flow+ state machine API.
#
- # The sort order is derived from {Spree::Order.checkout_step_names} so it
- # stays in sync with any customizations to the checkout state machine.
- # Steps with +before:+/+after:+ anchors are ordered by the anchor's position;
- # steps without constraints are appended at the end.
+ # @return [Array<String>]
+ def base_step_names
+ @base_step_names ||= %w[address delivery payment confirm complete]
+ end
+
+ attr_writer :base_step_names
+
+ # Returns steps sorted by +before+/+after+ constraints relative to
+ # {base_step_names}. Steps with anchors are ordered by the anchor's
+ # position; steps without constraints are appended at the end.
#
# @return [Array<Step>] steps in display order
def ordered_steps
return steps if steps.empty?
- step_order = Spree::Order.checkout_step_names.map(&:to_s)
+ step_order = base_step_names.map(&:to_s)
positioned, unpositioned = steps.partition { |s| s.before || s.after }
sorted = positioned.sort_by do |s|
@@ -105,6 +115,7 @@ module Spree
def reset!
@steps = []
@requirements = []
+ @base_step_names = nil
end
end
end
diff --git a/spree/core/app/models/spree/line_item.rb b/spree/core/app/models/spree/line_item.rb
index 9887f3b1b9..1fd94bfdd9 100644
--- a/spree/core/app/models/spree/line_item.rb
+++ b/spree/core/app/models/spree/line_item.rb
@@ -12,7 +12,8 @@ module Spree
before_validation :ensure_valid_quantity
with_options inverse_of: :line_items do
- belongs_to :order, class_name: 'Spree::Order', touch: true
+ belongs_to :order, class_name: 'Spree::Order', touch: true, optional: true
+ belongs_to :cart, class_name: 'Spree::Cart', touch: true, optional: true
belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
end
belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'
@@ -29,7 +30,8 @@ module Spree
before_validation :copy_price
before_validation :copy_tax_category
- validates :variant, :order, presence: true
+ validates :variant, presence: true
+ validate :exactly_one_owner
DB_INTEGER_MAX = (2**31) - 1
@@ -43,9 +45,9 @@ module Spree
validates :price, numericality: true
validates_with Spree::Stock::AvailabilityValidator, if: -> { variant.present? }
- validate :ensure_proper_currency, if: -> { order.present? }
+ validate :ensure_proper_currency, if: -> { owner.present? }
- before_destroy :verify_order_inventory_before_destroy, if: -> { order.has_checkout_step?('delivery') }
+ before_destroy :verify_order_inventory_before_destroy, if: -> { order&.has_checkout_step?('delivery') }
after_save :update_inventory
after_save :update_adjustments
@@ -61,7 +63,7 @@ module Spree
def thumbnail
variant.primary_media || product.primary_media
end
- delegate :tax_zone, to: :order
+ delegate :tax_zone, to: :owner
delegate :digital?, :can_supply?, to: :variant
scope :with_digital_assets, -> { joins(:variant).merge(Spree::Variant.with_digital_assets) }
@@ -75,16 +77,24 @@ module Spree
pre_tax_amount taxable_adjustment_total
non_taxable_adjustment_total]
+ # The exactly-one owner of this line item — the cart during checkout, the
+ # order after completion. New code must read +owner+, never assume +order+.
+ #
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ order || cart
+ end
+
def copy_price
if variant
update_price if price.nil?
self.cost_price = variant.cost_price if cost_price.nil?
- self.currency = order.currency if currency.nil?
+ self.currency = owner.currency if currency.nil? && owner
end
end
def update_price
- context = Spree::Pricing::Context.from_order(variant, order, quantity: quantity)
+ context = Spree::Pricing::Context.from_order(variant, owner, quantity: quantity)
currency_price = variant.price_for(context)
self.price = currency_price.price_including_vat_for(tax_zone: tax_zone) if currency_price.present?
@@ -156,12 +166,12 @@ module Spree
basis = taxable_amount
return basis if basis <= 0
- order_discount = order.order_level_promo_total
+ order_discount = owner.order_level_promo_total
return basis if order_discount.zero?
# summed in SQL so the allocation uses the persisted adjustment totals
# of all line items, not a possibly stale cached association
- items_total = order.line_items.reorder(nil).pick(
+ items_total = owner.line_items.reorder(nil).pick(
Arel.sql('COALESCE(SUM(price * quantity + taxable_adjustment_total), 0)')
)
return basis if items_total <= 0
@@ -250,7 +260,7 @@ module Spree
opts = options.dup # we will be deleting from the hash, so leave the caller's copy intact
- currency = opts.delete(:currency) || order.try(:currency)
+ currency = opts.delete(:currency) || owner&.currency
update_price_from_modifier(currency, opts)
assign_attributes opts
@@ -274,7 +284,7 @@ module Spree
# This is used for volume-based pricing and other price list rules
# @return [void]
def recalculate_price
- context = Spree::Pricing::Context.from_order(variant, order, quantity: quantity)
+ context = Spree::Pricing::Context.from_order(variant, owner, quantity: quantity)
currency_price = variant.price_for(context)
return unless currency_price.present?
@@ -311,7 +321,7 @@ module Spree
end
def update_inventory
- if (saved_changes? || target_shipment.present?) && order.has_checkout_step?('delivery')
+ if (saved_changes? || target_shipment.present?) && order&.has_checkout_step?('delivery')
verify_order_inventory
end
end
@@ -337,7 +347,7 @@ module Spree
# By default, prices are not updated after an order is completed
# @return [Boolean]
def should_update_price?
- !order.completed?
+ !owner.completed?
end
def recalculate_adjustments
@@ -345,13 +355,19 @@ module Spree
end
def update_tax_charge
+ return unless order
+
Spree::TaxRate.adjust(order, [self])
end
def ensure_proper_currency
- unless currency == order.currency
+ unless currency == owner.currency
errors.add(:currency, :must_match_order_currency)
end
end
+
+ def exactly_one_owner
+ errors.add(:base, Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+ end
end
end
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index 2d08a35a86..153d4ded4b 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -71,7 +71,7 @@ module Spree
# would drop warnings already recorded upstream.
def remove_out_of_stock_items!
existing_warnings = warnings
- result = Spree::Cart::RemoveOutOfStockItems.call(order: self)
+ result = Spree::Carts::RemoveOutOfStockItems.call(order: self)
return self unless result.success?
order, _messages, new_warnings = result.value
@@ -112,9 +112,14 @@ module Spree
go_to_state :complete
end
+ # 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.
+ self.lock_optimistically = false
+
self.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store channel tags]
self.whitelisted_ransackable_attributes = %w[
- completed_at email number state status payment_state shipment_state
+ completed_at email number state status payment_status payment_state shipment_state
total item_total item_count considered_risky channel_id currency
]
self.whitelisted_ransackable_scopes = %w[complete incomplete refunded partially_refunded search multi_search]
@@ -149,6 +154,9 @@ module Spree
alias_attribute :customer_id, :user_id
belongs_to :user, class_name: "::#{Spree.user_class}", optional: true, autosave: true
+ # The cart this order was completed from (unique — the completion
+ # idempotency key). Backoffice draft orders have no cart.
+ belongs_to :cart, class_name: 'Spree::Cart', optional: true, inverse_of: :order
belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
belongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: true
belongs_to :canceler, class_name: "::#{Spree.admin_user_class}", optional: true
@@ -211,7 +219,8 @@ module Spree
alias_attribute :delivery_total, :shipment_total
alias display_delivery_total display_shipment_total
alias_attribute :fulfillment_status, :shipment_state
- alias_attribute :payment_status, :payment_state
+ # Deprecated alias — the column is payment_status since 6.0; remove in 6.1.
+ alias_attribute :payment_state, :payment_status
delegate :has_markets?, to: :store, prefix: true
@@ -246,7 +255,7 @@ module Spree
validates :currency
validates :locale
end
- validates :payment_state, inclusion: { in: PAYMENT_STATES, allow_blank: true }
+ validates :payment_status, inclusion: { in: PAYMENT_STATES, allow_blank: true }
validates :shipment_state, inclusion: { in: SHIPMENT_STATES, allow_blank: true }
validates :item_total, POSITIVE_MONEY_VALIDATION
validates :adjustment_total, MONEY_VALIDATION
@@ -551,7 +560,7 @@ module Spree
end
# Associates the specified user with the order.
- # Delegates to {Spree::Cart::Associate} service.
+ # Delegates to {Spree::Carts::Associate} service.
#
# @param user [Spree.user_class] the user to associate with the order
# @param override_email [Boolean] whether to override the order email with the user's email
diff --git a/spree/core/app/models/spree/order_contents.rb b/spree/core/app/models/spree/order_contents.rb
deleted file mode 100644
index ab87eda210..0000000000
--- a/spree/core/app/models/spree/order_contents.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Spree
- class OrderContents
- attr_accessor :order, :currency
-
- def initialize(order)
- @order = order
- end
-
- def add(variant, quantity = 1, options = {})
- Spree.cart_add_item_service.call(order: order,
- variant: variant,
- quantity: quantity,
- options: options).value
- end
-
- def remove(variant, quantity = 1, options = {})
- Spree.cart_remove_item_service.call(order: order,
- variant: variant,
- quantity: quantity,
- options: options).value
- end
-
- def remove_line_item(line_item, options = {})
- Spree::Cart::RemoveLineItem.call(order: @order, line_item: line_item, options: options).value
- end
-
- def update_cart(params)
- Spree.cart_update_service.call(order: order, params: params).value
- end
- end
-end
diff --git a/spree/core/app/services/spree/cart/change_currency.rb b/spree/core/app/services/spree/cart/change_currency.rb
deleted file mode 100644
index 1bda19dfd9..0000000000
--- a/spree/core/app/services/spree/cart/change_currency.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module Spree
- module Cart
- class ChangeCurrency
- prepend Spree::ServiceModule::Base
-
- def call(order:, new_currency:)
- return failure('Currency not supported') unless supported_currency?(order, new_currency)
-
- result = order.update!(currency: new_currency) rescue false
-
- if result
- success(order)
- else
- failure('Failed to update order')
- end
- end
-
- private
-
- def supported_currency?(order, currency)
- store = order.store
- supported_currencies = store.supported_currencies_list
- supported_currencies.map(&:iso_code).include?(currency.upcase)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/cart/create.rb b/spree/core/app/services/spree/cart/create.rb
deleted file mode 100644
index 4982c98759..0000000000
--- a/spree/core/app/services/spree/cart/create.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Spree
- module Cart
- class Create
- prepend Spree::ServiceModule::Base
-
- def call(user:, store:, currency:, public_metadata: {}, private_metadata: {}, order_params: {})
- order_params ||= {}
-
- # we cannot create an order without store
- return failure(:store_is_required) if store.nil?
-
- default_params = {
- user: user,
- market: Spree::Current.market,
- currency: currency || store.default_currency,
- token: Spree::GenerateToken.new.call(Spree::Order),
- public_metadata: public_metadata.to_h,
- private_metadata: private_metadata.to_h
- }
-
- order = store.orders.create!(default_params.merge(order_params))
- success(order)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/cart/estimate_shipping_rates.rb b/spree/core/app/services/spree/cart/estimate_shipping_rates.rb
deleted file mode 100644
index aabad35def..0000000000
--- a/spree/core/app/services/spree/cart/estimate_shipping_rates.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Spree
- module Cart
- class EstimateShippingRates
- prepend Spree::ServiceModule::Base
-
- def call(order:, country_iso: nil)
- country_id = country_id(order.store, country_iso)
- dummy_order = generate_dummy_order(order, country_id)
-
- packages = ::Spree::Stock::Coordinator.new(dummy_order).packages
- estimator = ::Spree::Stock::Estimator.new(dummy_order)
- shipping_rates = if order.line_items.any? && packages.any?
- estimator.shipping_rates(packages.first)
- else
- []
- end
-
- success(shipping_rates)
- end
-
- private
-
- def country_id(store, country_iso)
- if country_iso.present?
- ::Spree::Country.by_iso(country_iso)&.id
- else
- store.default_country_id
- end
- end
-
- def generate_dummy_order(order, country_id)
- dummy_order = order.dup
- dummy_order.line_items = order.line_items
- dummy_order.ship_address = ::Spree::Address.new(country_id: country_id)
- dummy_order
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/cart/update.rb b/spree/core/app/services/spree/cart/update.rb
deleted file mode 100644
index 3e1d21800c..0000000000
--- a/spree/core/app/services/spree/cart/update.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Spree
- module Cart
- class Update
- prepend Spree::ServiceModule::Base
-
- def call(order:, params:)
- return failure(order) unless order.update(filter_order_items(order, params))
-
- order.line_items = order.line_items.select { |li| li.quantity > 0 }
- # Update totals, then check if the order is eligible for any cart promotions.
- # If we do not update first, then the item total will be wrong and ItemTotal
- # promotion rules would not be triggered.
- ActiveRecord::Base.transaction do
- order.update_with_updater!
- ::Spree::PromotionHandler::Cart.new(order).activate
- order.ensure_updated_shipments
- order.payments.store_credits.checkout.destroy_all
- order.update_with_updater!
- end
- success(order)
- end
-
- private
-
- def filter_order_items(order, params)
- return params if params[:line_items_attributes].nil? || params[:line_items_attributes][:id]
-
- line_item_ids = order.line_item_ids.map(&:to_s)
-
- params[:line_items_attributes].each_pair do |id, value|
- params[:line_items_attributes].delete(id) unless line_item_ids.include?(value[:id].to_s) || value[:variant_id].present?
- end
- params
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/cart/add_item.rb b/spree/core/app/services/spree/carts/add_item.rb
similarity index 99%
rename from spree/core/app/services/spree/cart/add_item.rb
rename to spree/core/app/services/spree/carts/add_item.rb
index 092fbbbe3c..4ba29c3c2d 100644
--- a/spree/core/app/services/spree/cart/add_item.rb
+++ b/spree/core/app/services/spree/carts/add_item.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class AddItem
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/associate.rb b/spree/core/app/services/spree/carts/associate.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/associate.rb
rename to spree/core/app/services/spree/carts/associate.rb
index 8b47514e5f..29ef2ef4c8 100644
--- a/spree/core/app/services/spree/cart/associate.rb
+++ b/spree/core/app/services/spree/carts/associate.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class Associate
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/destroy.rb b/spree/core/app/services/spree/carts/destroy.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/destroy.rb
rename to spree/core/app/services/spree/carts/destroy.rb
index 316e537fe4..d18c2561d3 100644
--- a/spree/core/app/services/spree/cart/destroy.rb
+++ b/spree/core/app/services/spree/carts/destroy.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class Destroy
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/empty.rb b/spree/core/app/services/spree/carts/empty.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/empty.rb
rename to spree/core/app/services/spree/carts/empty.rb
index 567e746965..71797d2b3c 100644
--- a/spree/core/app/services/spree/cart/empty.rb
+++ b/spree/core/app/services/spree/carts/empty.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class Empty
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/recalculate.rb b/spree/core/app/services/spree/carts/recalculate.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/recalculate.rb
rename to spree/core/app/services/spree/carts/recalculate.rb
index 693e9cf839..e6acb1dee0 100644
--- a/spree/core/app/services/spree/cart/recalculate.rb
+++ b/spree/core/app/services/spree/carts/recalculate.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class Recalculate
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/remove_item.rb b/spree/core/app/services/spree/carts/remove_item.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/remove_item.rb
rename to spree/core/app/services/spree/carts/remove_item.rb
index 6045f954a0..21060a43c2 100644
--- a/spree/core/app/services/spree/cart/remove_item.rb
+++ b/spree/core/app/services/spree/carts/remove_item.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class RemoveItem
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/remove_line_item.rb b/spree/core/app/services/spree/carts/remove_line_item.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/remove_line_item.rb
rename to spree/core/app/services/spree/carts/remove_line_item.rb
index 54f5f5ccaf..50a9180be3 100644
--- a/spree/core/app/services/spree/cart/remove_line_item.rb
+++ b/spree/core/app/services/spree/carts/remove_line_item.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class RemoveLineItem
prepend Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/remove_out_of_stock_items.rb b/spree/core/app/services/spree/carts/remove_out_of_stock_items.rb
similarity index 99%
rename from spree/core/app/services/spree/cart/remove_out_of_stock_items.rb
rename to spree/core/app/services/spree/carts/remove_out_of_stock_items.rb
index 01cb21a573..a21eb36703 100644
--- a/spree/core/app/services/spree/cart/remove_out_of_stock_items.rb
+++ b/spree/core/app/services/spree/carts/remove_out_of_stock_items.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class RemoveOutOfStockItems
prepend ::Spree::ServiceModule::Base
diff --git a/spree/core/app/services/spree/cart/set_quantity.rb b/spree/core/app/services/spree/carts/set_quantity.rb
similarity index 98%
rename from spree/core/app/services/spree/cart/set_quantity.rb
rename to spree/core/app/services/spree/carts/set_quantity.rb
index 305eab3060..9ddb7496a8 100644
--- a/spree/core/app/services/spree/cart/set_quantity.rb
+++ b/spree/core/app/services/spree/carts/set_quantity.rb
@@ -1,5 +1,5 @@
module Spree
- module Cart
+ module Carts
class SetQuantity
prepend Spree::ServiceModule::Base
diff --git a/spree/core/db/migrate/20260728000003_create_spree_carts.rb b/spree/core/db/migrate/20260728000003_create_spree_carts.rb
new file mode 100644
index 0000000000..df77a05b2d
--- /dev/null
+++ b/spree/core/db/migrate/20260728000003_create_spree_carts.rb
@@ -0,0 +1,42 @@
+class CreateSpreeCarts < ActiveRecord::Migration[7.2]
+ def change
+ create_table :spree_carts do |t|
+ t.references :store, null: false
+ t.references :market, null: true
+ t.references :channel, null: true
+ t.references :customer, null: true
+ t.string :currency, null: false
+ t.string :locale
+ t.string :email
+ t.references :ship_address, null: true, index: false
+ t.references :bill_address, null: true, index: false
+ t.boolean :accept_marketing
+ t.text :special_instructions
+ t.string :last_ip_address
+ t.string :token, null: false
+ t.integer :lock_version
+ t.datetime :completed_at
+ t.datetime :completing_at
+ if t.respond_to?(:jsonb)
+ t.jsonb :metadata
+ else
+ t.json :metadata
+ end
+
+ t.timestamps
+ end
+ add_index :spree_carts, :token, unique: true
+ add_index :spree_carts, :completed_at
+ add_index :spree_carts, :updated_at
+
+ add_reference :spree_line_items, :cart, null: true, if_not_exists: true
+
+ # The completion idempotency key — one order per cart, enforced by the DB.
+ add_reference :spree_orders, :cart, null: true, index: { unique: true }, if_not_exists: true
+
+ rename_column :spree_orders, :payment_state, :payment_status
+ add_index :spree_orders, :payment_status
+
+ rename_column :spree_orders, :state_lock_version, :lock_version
+ end
+end
diff --git a/spree/core/lib/spree/core/dependencies.rb b/spree/core/lib/spree/core/dependencies.rb
index 8767a8293d..e2bcfa5117 100644
--- a/spree/core/lib/spree/core/dependencies.rb
+++ b/spree/core/lib/spree/core/dependencies.rb
@@ -7,21 +7,20 @@ module Spree
# ability
ability_class: 'Spree::Ability',
- # cart
+ # cart — the legacy Spree::Cart::* namespace is gone (Spree::Cart is the
+ # cart model since 6.0); surviving services live under Spree::Carts::.
+ # cart_create/update/estimate_shipping_rates/change_currency service
+ # registrations were removed with their dead implementations.
cart_compare_line_items_service: 'Spree::CompareLineItems',
- cart_create_service: 'Spree::Cart::Create',
- cart_add_item_service: 'Spree::Cart::AddItem',
- cart_update_service: 'Spree::Cart::Update',
- cart_recalculate_service: 'Spree::Cart::Recalculate',
- cart_remove_item_service: 'Spree::Cart::RemoveItem',
- cart_remove_line_item_service: 'Spree::Cart::RemoveLineItem',
- cart_set_item_quantity_service: 'Spree::Cart::SetQuantity',
- cart_estimate_shipping_rates_service: 'Spree::Cart::EstimateShippingRates',
- cart_empty_service: 'Spree::Cart::Empty',
- cart_destroy_service: 'Spree::Cart::Destroy',
- cart_associate_service: 'Spree::Cart::Associate',
- cart_change_currency_service: 'Spree::Cart::ChangeCurrency',
- cart_remove_out_of_stock_items_service: 'Spree::Cart::RemoveOutOfStockItems',
+ cart_add_item_service: 'Spree::Carts::AddItem',
+ cart_recalculate_service: 'Spree::Carts::Recalculate',
+ cart_remove_item_service: 'Spree::Carts::RemoveItem',
+ cart_remove_line_item_service: 'Spree::Carts::RemoveLineItem',
+ cart_set_item_quantity_service: 'Spree::Carts::SetQuantity',
+ cart_empty_service: 'Spree::Carts::Empty',
+ cart_destroy_service: 'Spree::Carts::Destroy',
+ cart_associate_service: 'Spree::Carts::Associate',
+ cart_remove_out_of_stock_items_service: 'Spree::Carts::RemoveOutOfStockItems',
# carts
carts_complete_service: 'Spree::Carts::Complete',
diff --git a/spree/core/lib/spree/testing_support/factories/cart_factory.rb b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
new file mode 100644
index 0000000000..d70c82bb72
--- /dev/null
+++ b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+ factory :cart, class: Spree::Cart do
+ store { Spree::Store.find_by(default: true) || association(:store) }
+ currency { 'USD' }
+ end
+end
diff --git a/spree/core/lib/spree/testing_support/factories/order_factory.rb b/spree/core/lib/spree/testing_support/factories/order_factory.rb
index 3ded3d33d1..f8a255555c 100644
--- a/spree/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/order_factory.rb
@@ -22,9 +22,6 @@ FactoryBot.define do
end
end
- factory :cart, class: Spree::Order do
- end
-
factory :order_with_totals do
after(:create) do |order, evaluator|
create(:line_item, order: order, price: evaluator.line_items_price)
diff --git a/spree/core/spec/models/spree/adjustable/adjuster/promotion_spec.rb b/spree/core/spec/models/spree/adjustable/adjuster/promotion_spec.rb
index 31a95a7614..b0b863bd6a 100644
--- a/spree/core/spec/models/spree/adjustable/adjuster/promotion_spec.rb
+++ b/spree/core/spec/models/spree/adjustable/adjuster/promotion_spec.rb
@@ -139,7 +139,7 @@ describe Spree::Adjustable::Adjuster::Promotion, type: :model do
msg = "Expected promo1 to be used (using sequence #{promo_sequence})"
expect(order.all_adjustments.eligible.first.source.promotion).to eq(order_promo1), msg
- Spree::Cart::AddItem.call(order: order, variant: create(:variant, price: 10))
+ Spree::Carts::AddItem.call(order: order, variant: create(:variant, price: 10))
order.save
order.reload
@@ -172,7 +172,7 @@ describe Spree::Adjustable::Adjuster::Promotion, type: :model do
msg = "Expected line_item_promo1 to be used (using sequence #{promo_sequence})"
expect(order.all_adjustments.first.source.promotion).to eq(line_item_promo1), msg
- Spree::Cart::AddItem.call(order: order, variant: create(:variant, price: 10))
+ Spree::Carts::AddItem.call(order: order, variant: create(:variant, price: 10))
order.save
order.reload
diff --git a/spree/core/spec/models/spree/app_dependencies_spec.rb b/spree/core/spec/models/spree/app_dependencies_spec.rb
index 6ebe57c4a9..b1daed6210 100644
--- a/spree/core/spec/models/spree/app_dependencies_spec.rb
+++ b/spree/core/spec/models/spree/app_dependencies_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-class MyCustomCreateService
+class MyCustomAddItemService
end
class MyCustomAddItemService
@@ -11,43 +11,43 @@ describe Spree::Core::Dependencies, type: :model do
describe 'backwards compatibility' do
it 'returns the default value as string' do
- expect(deps.cart_create_service).to eq('Spree::Cart::Create')
+ expect(deps.cart_add_item_service).to eq('Spree::Carts::AddItem')
end
it 'allows to overwrite the value with a class' do
- deps.cart_create_service = MyCustomCreateService
- expect(deps.cart_create_service).to eq MyCustomCreateService
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.cart_add_item_service).to eq MyCustomAddItemService
end
it 'allows to overwrite the value with a string' do
- deps.cart_create_service = 'MyCustomCreateService'
- expect(deps.cart_create_service).to eq 'MyCustomCreateService'
+ deps.cart_add_item_service = 'MyCustomAddItemService'
+ expect(deps.cart_add_item_service).to eq 'MyCustomAddItemService'
end
it 'works with constantize for string values' do
- expect(deps.cart_create_service.constantize).to eq Spree::Cart::Create
+ expect(deps.cart_add_item_service.constantize).to eq Spree::Carts::AddItem
end
end
describe '#<dependency>_class' do
it 'returns the constantized class for string values' do
- expect(deps.cart_create_service_class).to eq Spree::Cart::Create
+ expect(deps.cart_add_item_service_class).to eq Spree::Carts::AddItem
end
it 'returns the class directly when set as class' do
- deps.cart_create_service = MyCustomCreateService
- expect(deps.cart_create_service_class).to eq MyCustomCreateService
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.cart_add_item_service_class).to eq MyCustomAddItemService
end
it 'memoizes the resolved class' do
- deps.cart_create_service_class
- expect(deps.instance_variable_get(:@cart_create_service_resolved)).to eq Spree::Cart::Create
+ deps.cart_add_item_service_class
+ expect(deps.instance_variable_get(:@cart_add_item_service_resolved)).to eq Spree::Carts::AddItem
end
it 'clears memoization when value changes' do
- deps.cart_create_service_class
- deps.cart_create_service = MyCustomCreateService
- expect(deps.instance_variable_defined?(:@cart_create_service_resolved)).to be false
+ deps.cart_add_item_service_class
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.instance_variable_defined?(:@cart_add_item_service_resolved)).to be false
end
end
@@ -57,15 +57,15 @@ describe Spree::Core::Dependencies, type: :model do
end
it 'tracks overridden dependencies' do
- deps.cart_create_service = MyCustomCreateService
- expect(deps.overrides).to have_key(:cart_create_service)
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.overrides).to have_key(:cart_add_item_service)
end
it 'includes override metadata' do
- deps.cart_create_service = MyCustomCreateService
- override = deps.overrides[:cart_create_service]
+ deps.cart_add_item_service = MyCustomAddItemService
+ override = deps.overrides[:cart_add_item_service]
- expect(override[:value]).to eq MyCustomCreateService
+ expect(override[:value]).to eq MyCustomAddItemService
expect(override[:source]).to be_a(String)
expect(override[:set_at]).to be_a(Time)
end
@@ -73,30 +73,30 @@ describe Spree::Core::Dependencies, type: :model do
describe '#overridden?' do
it 'returns false for non-overridden dependencies' do
- expect(deps.overridden?(:cart_create_service)).to be false
+ expect(deps.overridden?(:cart_add_item_service)).to be false
end
it 'returns true for overridden dependencies' do
- deps.cart_create_service = MyCustomCreateService
- expect(deps.overridden?(:cart_create_service)).to be true
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.overridden?(:cart_add_item_service)).to be true
end
it 'works with string argument' do
- deps.cart_create_service = MyCustomCreateService
- expect(deps.overridden?('cart_create_service')).to be true
+ deps.cart_add_item_service = MyCustomAddItemService
+ expect(deps.overridden?('cart_add_item_service')).to be true
end
end
describe '#override_info' do
it 'returns nil for non-overridden dependencies' do
- expect(deps.override_info(:cart_create_service)).to be_nil
+ expect(deps.override_info(:cart_add_item_service)).to be_nil
end
it 'returns override info for overridden dependencies' do
- deps.cart_create_service = MyCustomCreateService
- info = deps.override_info(:cart_create_service)
+ deps.cart_add_item_service = MyCustomAddItemService
+ info = deps.override_info(:cart_add_item_service)
- expect(info[:value]).to eq MyCustomCreateService
+ expect(info[:value]).to eq MyCustomAddItemService
expect(info[:source]).to include('app_dependencies_spec.rb')
end
end
@@ -109,31 +109,31 @@ describe Spree::Core::Dependencies, type: :model do
end
it 'marks non-overridden dependencies correctly' do
- cart_create = deps.current_values.find { |v| v[:name] == :cart_create_service }
+ cart_create = deps.current_values.find { |v| v[:name] == :cart_add_item_service }
expect(cart_create[:overridden]).to be false
expect(cart_create[:current]).to eq cart_create[:default]
end
it 'marks overridden dependencies correctly' do
- deps.cart_create_service = MyCustomCreateService
- cart_create = deps.current_values.find { |v| v[:name] == :cart_create_service }
+ deps.cart_add_item_service = MyCustomAddItemService
+ cart_create = deps.current_values.find { |v| v[:name] == :cart_add_item_service }
expect(cart_create[:overridden]).to be true
- expect(cart_create[:current]).to eq MyCustomCreateService
- expect(cart_create[:default]).to eq 'Spree::Cart::Create'
+ expect(cart_create[:current]).to eq MyCustomAddItemService
+ expect(cart_create[:default]).to eq 'Spree::Carts::AddItem'
end
end
describe '#validate!' do
it 'raises Spree::DependencyError for invalid dependencies' do
- deps.cart_create_service = 'NonExistentClass'
+ deps.cart_add_item_service = 'NonExistentClass'
expect { deps.validate! }.to raise_error(Spree::DependencyError)
end
it 'includes dependency names in error message' do
- deps.cart_create_service = 'NonExistentClass'
+ deps.cart_add_item_service = 'NonExistentClass'
deps.cart_add_item_service = 'AnotherNonExistentClass'
- expect { deps.validate! }.to raise_error(Spree::DependencyError, /cart_create_service/)
+ expect { deps.validate! }.to raise_error(Spree::DependencyError, /cart_add_item_service/)
end
end
end
@@ -144,12 +144,12 @@ describe 'Spree module dependency accessors' do
describe 'Spree.<dependency>' do
it 'returns the resolved class' do
- expect(Spree.cart_create_service).to eq Spree::Cart::Create
+ expect(Spree.cart_add_item_service).to eq Spree::Carts::AddItem
end
it 'responds to dependency methods' do
- expect(Spree.respond_to?(:cart_create_service)).to be true
- expect(Spree.respond_to?(:cart_create_service=)).to be true
+ expect(Spree.respond_to?(:cart_add_item_service)).to be true
+ expect(Spree.respond_to?(:cart_add_item_service=)).to be true
end
it 'does not respond to non-dependency methods' do
diff --git a/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rb b/spree/core/spec/models/spree/calculator/shipping/digital_delivery_spec.rb
index c6900f26d5..308b33727c 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
@@ -76,6 +76,6 @@ RSpec.describe Spree::Calculator::Shipping::DigitalDelivery do
end
def add_line_item_to_order(order, variant, quantity)
- Spree::Cart::AddItem.call(order: order, variant: variant, quantity: quantity)
+ Spree::Carts::AddItem.call(order: order, variant: variant, quantity: quantity)
end
end
diff --git a/spree/core/spec/models/spree/cart_spec.rb b/spree/core/spec/models/spree/cart_spec.rb
new file mode 100644
index 0000000000..4a08636f29
--- /dev/null
+++ b/spree/core/spec/models/spree/cart_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Spree::Cart, type: :model do
+ describe 'lifecycle' do
+ it 'generates a token on create' do
+ expect(create(:cart).token).to be_present
+ end
+
+ it 'is completed when completed_at is set' do
+ expect(build(:cart, completed_at: Time.current)).to be_completed
+ expect(build(:cart)).not_to be_completed
+ end
+
+ it 'is completing while completing_at holds the cart' do
+ expect(build(:cart, completing_at: Time.current)).to be_completing
+ expect(build(:cart)).not_to be_completing
+ end
+
+ it 'scopes complete/incomplete on completed_at' do
+ incomplete = create(:cart)
+ complete = create(:cart, completed_at: Time.current)
+
+ expect(described_class.complete).to contain_exactly(complete)
+ expect(described_class.incomplete).to contain_exactly(incomplete)
+ end
+ end
+
+ describe 'line item ownership' do
+ let(:cart) { create(:cart) }
+
+ it 'owns line items and destroys them with the cart' do
+ line_item = create(:line_item, order: nil, cart: cart, currency: cart.currency)
+
+ expect(line_item.owner).to eq(cart)
+ expect { cart.destroy }.to change(Spree::LineItem, :count).by(-1)
+ end
+ end
+
+ describe 'order link' do
+ it 'links to the order completed from it' do
+ cart = create(:cart, completed_at: Time.current)
+ order = create(:order, cart: cart)
+
+ expect(cart.order).to eq(order)
+ end
+ end
+end
diff --git a/spree/core/spec/models/spree/line_item_spec.rb b/spree/core/spec/models/spree/line_item_spec.rb
index 6fefecec60..262f127a0f 100644
--- a/spree/core/spec/models/spree/line_item_spec.rb
+++ b/spree/core/spec/models/spree/line_item_spec.rb
@@ -8,6 +8,33 @@ describe Spree::LineItem, type: :model do
it_behaves_like 'metadata'
it_behaves_like 'lifecycle events'
+ describe '#owner (cart/order split)' do
+ let(:cart) { create(:cart) }
+
+ it 'requires exactly one of cart or order' do
+ li = build(:line_item)
+ expect(li).to be_valid
+
+ li.cart = cart
+ expect(li).not_to be_valid
+
+ li.order = nil
+ li.currency = cart.currency
+ expect(li).to be_valid
+ expect(li.owner).to eq(cart)
+
+ li.cart = nil
+ expect(li).not_to be_valid
+ end
+
+ it 'copies the currency from a cart owner' do
+ li = create(:line_item, order: nil, cart: cart, currency: nil)
+
+ expect(li.currency).to eq(cart.currency)
+ expect(li.owner).to eq(cart)
+ end
+ end
+
describe 'Validations' do
describe 'ensure_proper_currency' do
context 'order is present' do
@@ -191,7 +218,7 @@ describe Spree::LineItem, type: :model do
end
it 'creates a tax adjustment' do
- Spree::Cart::AddItem.call(order: order, variant: variant)
+ Spree::Carts::AddItem.call(order: order, variant: variant)
line_item = order.find_line_item_by_variant(variant)
expect(line_item.adjustments.tax.count).to eq(1)
end
@@ -206,7 +233,7 @@ describe Spree::LineItem, type: :model do
end
it 'does not create a tax adjustment' do
- Spree::Cart::AddItem.call(order: order, variant: variant)
+ Spree::Carts::AddItem.call(order: order, variant: variant)
line_item = order.find_line_item_by_variant(variant)
expect(line_item.adjustments.tax.count).to eq(0)
@@ -336,7 +363,7 @@ describe Spree::LineItem, type: :model do
context 'nothing left on stock' do
before do
variant.stock_items.update_all count_on_hand: 5, backorderable: false
- Spree::Cart::AddItem.call(order: order, variant: variant, quantity: 5)
+ Spree::Carts::AddItem.call(order: order, variant: variant, quantity: 5)
order.create_proposed_shipments
order.finalize!
order.reload
@@ -365,7 +392,7 @@ describe Spree::LineItem, type: :model do
context '2 items left on stock' do
before do
variant.stock_items.update_all count_on_hand: 7, backorderable: false
- Spree::Cart::AddItem.call(order: order, variant: variant, quantity: 5)
+ Spree::Carts::AddItem.call(order: order, variant: variant, quantity: 5)
order.create_proposed_shipments
order.finalize!
order.reload
@@ -701,7 +728,7 @@ describe Spree::LineItem, type: :model do
let!(:volume_price) { create(:price, variant: variant, currency: 'USD', amount: 7.00, price_list: price_list) }
it 'applies volume price on initial creation' do
- result = Spree::Cart::AddItem.call(order: order, variant: variant, quantity: 15)
+ result = Spree::Carts::AddItem.call(order: order, variant: variant, quantity: 15)
expect(result.success?).to be true
new_line_item = order.line_items.find_by(variant: variant)
@@ -710,7 +737,7 @@ describe Spree::LineItem, type: :model do
end
it 'does not apply volume price when quantity is below threshold' do
- result = Spree::Cart::AddItem.call(order: order, variant: variant, quantity: 5)
+ result = Spree::Carts::AddItem.call(order: order, variant: variant, quantity: 5)
expect(result.success?).to be true
new_line_item = order.line_items.find_by(variant: variant)
diff --git a/spree/core/spec/models/spree/order/digital_spec.rb b/spree/core/spec/models/spree/order/digital_spec.rb
index cdd3666dff..6052f98284 100644
--- a/spree/core/spec/models/spree/order/digital_spec.rb
+++ b/spree/core/spec/models/spree/order/digital_spec.rb
@@ -40,7 +40,7 @@ describe Spree::Order, type: :model do
end
end
- context 'Spree::Cart::AddItem.call' do
+ context 'Spree::Carts::AddItem.call' do
it 'adds digital Variants of quantity 1 to an order' do
order = create(:order)
variants = 3.times.map { create(:variant, digitals: [create(:digital)], product: digital_product) }
@@ -122,6 +122,6 @@ describe Spree::Order, type: :model do
end
def add_line_item_to_order(order, variant, quantity)
- Spree::Cart::AddItem.call(order: order, variant: variant, quantity: quantity)
+ Spree::Carts::AddItem.call(order: order, variant: variant, quantity: quantity)
end
end
diff --git a/spree/core/spec/models/spree/order/totals_spec.rb b/spree/core/spec/models/spree/order/totals_spec.rb
index 347b208d5a..93eaaa0645 100644
--- a/spree/core/spec/models/spree/order/totals_spec.rb
+++ b/spree/core/spec/models/spree/order/totals_spec.rb
@@ -11,12 +11,12 @@ module Spree
let(:calculator) { Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
let!(:action) { Promotion::Actions::CreateAdjustment.create(promotion: promotion, calculator: calculator) }
- before { Spree::Cart::AddItem.call(order: order, variant: shirt).value }
+ before { Spree::Carts::AddItem.call(order: order, variant: shirt).value }
context 'item quantity changes' do
it 'recalculates order adjustments' do
expect do
- Spree::Cart::AddItem.call(order: order, variant: shirt, quantity: 3)
+ Spree::Carts::AddItem.call(order: order, variant: shirt, quantity: 3)
end.to change { order.adjustments.eligible.pluck(:amount) }
end
end
diff --git a/spree/core/spec/models/spree/order_contents_spec.rb b/spree/core/spec/models/spree/order_contents_spec.rb
deleted file mode 100644
index 22d29b2ea4..0000000000
--- a/spree/core/spec/models/spree/order_contents_spec.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-require 'spec_helper'
-
-describe Spree::OrderContents, type: :model do
- subject { described_class.new(order) }
-
- let!(:zone) { create(:zone_with_country, default_tax: true) }
- let(:store) { create(:store, checkout_zone: zone) }
- let(:user) { create(:user) }
- let(:order) { create(:order, user: user, store: store) }
- let(:variant) { create(:variant) }
-
- describe '#add' do
- context 'given quantity is not explicitly provided' do
- it 'adds one line item' do
- line_item = subject.add(variant)
- expect(line_item.quantity).to eq(1)
- expect(order.line_items.size).to eq(1)
- end
- end
-
- context 'given a shipment' do
- it 'ensure shipment calls update_amounts instead of order calling ensure_updated_shipments' do
- shipment = create(:shipment)
- expect(subject.order).not_to receive(:ensure_updated_shipments)
- expect(subject.order).to receive(:refresh_shipment_rates).with(Spree::ShippingMethod::DISPLAY_ON_BACK_END)
- expect(shipment).to receive(:update_amounts)
- subject.add(variant, 1, shipment: shipment)
- end
- end
-
- context 'not given a shipment' do
- it 'ensures updated shipments' do
- expect(subject.order).to receive(:ensure_updated_shipments)
- subject.add(variant)
- end
- end
-
- it 'adds line item if one does not exist' do
- line_item = subject.add(variant, 1)
- expect(line_item.quantity).to eq(1)
- expect(order.line_items.size).to eq(1)
- end
-
- it 'updates line item if one exists' do
- subject.add(variant, 1)
- line_item = subject.add(variant, 1)
- expect(line_item.quantity).to eq(2)
- expect(order.line_items.size).to eq(1)
- end
-
- it 'updates order totals' do
- expect(order.item_total.to_f).to eq(0.00)
- expect(order.total.to_f).to eq(0.00)
-
- subject.add(variant, 1)
-
- expect(order.item_total.to_f).to eq(19.99)
- expect(order.total.to_f).to eq(19.99)
- end
-
- context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
- let!(:payment) { create(:store_credit_payment, order: order) }
-
- it { expect { subject.add(variant, 1) }.to change { order.payments.store_credits.count }.by(-1) }
- end
-
- context 'running promotions' do
- let(:promotion) { create(:promotion, kind: :automatic, store: store) }
- let(:calculator) { Spree::Calculator::FlatRate.new(preferred_amount: 10) }
-
- shared_context 'discount changes order total' do
- before { subject.add(variant, 1) }
-
- it { expect(subject.order.total).not_to eq variant.price }
- end
-
- context 'one active order promotion' do
- let!(:action) { Spree::Promotion::Actions::CreateAdjustment.create(promotion: promotion, calculator: calculator) }
-
- it 'creates valid discount on order' do
- subject.add(variant, 1)
- expect(subject.order.adjustments.sum(:amount)).not_to eq 0
- end
-
- include_context 'discount changes order total'
- end
-
- context 'one active line item promotion' do
- let!(:action) { Spree::Promotion::Actions::CreateItemAdjustments.create(promotion: promotion, calculator: calculator) }
-
- it 'creates valid discount on order' do
- subject.add(variant, 1)
- expect(subject.order.line_item_adjustments.to_a.sum(&:amount)).not_to eq 0
- end
-
- include_context 'discount changes order total'
- end
-
- xcontext 'VAT for variant with percent promotion' do
- let!(:category) { Spree::TaxCategory.create name: 'Taxable Foo' }
- let!(:rate) do
- Spree::TaxRate.create(
- amount: 0.25,
- included_in_price: true,
- calculator: Spree::Calculator::DefaultTax.create,
- tax_category: category,
- zone: zone
- )
- end
- let(:product) { create(:product) }
- let(:variant) { create(:variant, price: 1000, product: product) }
- let(:calculator) { Spree::Calculator::PercentOnLineItem.new(preferred_percent: 50) }
- let!(:action) { Spree::Promotion::Actions::CreateItemAdjustments.create(promotion: promotion, calculator: calculator) }
-
- it 'updates included_tax_total' do
- expect(order.included_tax_total.to_f).to eq(0.00)
- subject.add(variant, 1)
- expect(order.included_tax_total.to_f).to eq(100)
- end
-
- it 'updates included_tax_total after adding two line items' do
- subject.add(variant, 1)
- expect(order.included_tax_total.to_f).to eq(100)
- subject.add(variant, 1)
- expect(order.included_tax_total.to_f).to eq(200)
- end
- end
- end
- end
-
- describe '#remove' do
- context 'given an invalid variant' do
- it 'raises an exception' do
- expect do
- subject.remove(variant, 1)
- end.to raise_error(ActiveRecord::RecordNotFound)
- end
- end
-
- context 'given quantity is not explicitly provided' do
- it 'removes one line item' do
- line_item = subject.add(variant, 3)
- subject.remove(variant)
-
- expect(line_item.reload.quantity).to eq(2)
- end
- end
-
- context 'given a shipment' do
- it 'ensure shipment calls update_amounts instead of order calling ensure_updated_shipments' do
- subject.add(variant, 1) # line item
- shipment = create(:shipment)
- expect(subject.order).not_to receive(:ensure_updated_shipments)
- expect(shipment).to receive(:update_amounts)
- subject.remove(variant, 1, shipment: shipment)
- end
- end
-
- context 'not given a shipment' do
- it 'ensures updated shipments' do
- subject.add(variant, 1) # line item
- expect(subject.order).to receive(:ensure_updated_shipments)
- subject.remove(variant)
- end
- end
-
- it 'reduces line_item quantity if quantity is less the line_item quantity' do
- line_item = subject.add(variant, 3)
- subject.remove(variant, 1)
-
- expect(line_item.reload.quantity).to eq(2)
- end
-
- context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
- let(:payment) { create(:store_credit_payment, amount: 10, order: order) }
-
- before do
- subject.add(variant, 1)
- payment
- end
-
- it { expect { subject.remove(variant, 1) }.to change { order.payments.store_credits.count }.by(-1) }
- end
-
- it 'removes line_item if quantity matches line_item quantity' do
- subject.add(variant, 1)
- removed_line_item = subject.remove(variant, 1)
-
- # Should reflect the change already in Order#line_item
- expect(order.line_items).not_to include(removed_line_item)
- end
-
- it 'updates order totals' do
- expect(order.item_total.to_f).to eq(0.00)
- expect(order.total.to_f).to eq(0.00)
-
- subject.add(variant, 2)
-
- expect(order.item_total.to_f).to eq(39.98)
- expect(order.total.to_f).to eq(39.98)
-
- subject.remove(variant, 1)
- expect(order.item_total.to_f).to eq(19.99)
- expect(order.total.to_f).to eq(19.99)
- end
- end
-
- describe '#remove_line_item' do
- context 'given a shipment' do
- it 'ensure shipment calls update_amounts instead of order calling ensure_updated_shipments' do
- line_item = subject.add(variant, 1)
- shipment = create(:shipment)
- expect(subject.order).not_to receive(:ensure_updated_shipments)
- expect(shipment).to receive(:update_amounts)
- subject.remove_line_item(line_item, shipment: shipment)
- end
- end
-
- context 'not given a shipment' do
- it 'ensures updated shipments' do
- line_item = subject.add(variant, 1)
- expect(subject.order).to receive(:ensure_updated_shipments)
- subject.remove_line_item(line_item)
- end
- end
-
- context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
- let(:payment) { create(:store_credit_payment, amount: 10, order: order) }
-
- before do
- @line_item = subject.add(variant, 1)
- payment
- end
-
- it { expect { subject.remove_line_item(@line_item) }.to change { order.payments.store_credits.count }.by(-1) }
- end
-
- it 'removes line_item' do
- line_item = subject.add(variant, 1)
- subject.remove_line_item(line_item)
-
- expect(order.reload.line_items).not_to include(line_item)
- end
-
- it 'updates order totals' do
- expect(order.item_total.to_f).to eq(0.00)
- expect(order.total.to_f).to eq(0.00)
-
- line_item = subject.add(variant, 2)
-
- expect(order.item_total.to_f).to eq(39.98)
- expect(order.total.to_f).to eq(39.98)
-
- subject.remove_line_item(line_item)
- expect(order.item_total.to_f).to eq(0.00)
- expect(order.total.to_f).to eq(0.00)
- end
- end
-
- context 'update cart' do
- let!(:shirt) { subject.add variant, 1 }
-
- let(:params) do
- { line_items_attributes: {
- '0' => { id: shirt.id, quantity: 3 }
- } }
- end
-
- it 'changes item quantity' do
- subject.update_cart params
- expect(shirt.quantity).to eq 3
- end
-
- it 'updates order totals' do
- expect do
- subject.update_cart params
- end.to change { subject.order.total }
- end
-
- context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
- let!(:payment) { create(:store_credit_payment, amount: 10, order: order) }
-
- it { expect { subject.update_cart params }.to change { order.payments.store_credits.count }.by(-1) }
- end
-
- context 'submits item quantity 0' do
- let(:params) do
- { line_items_attributes: {
- '0' => { id: shirt.id, quantity: 0 },
- '1' => { id: '666', quantity: 0 }
- } }
- end
-
- it 'removes item from order' do
- expect do
- subject.update_cart params
- end.to change { subject.order.line_items.count }
- end
-
- it 'doesnt try to update unexistent items' do
- filtered_params = { line_items_attributes: {
- '0' => { id: shirt.id, quantity: 0 }
- } }
- expect(subject.order).to receive(:update).with(filtered_params)
- subject.update_cart params
- end
-
- it 'does not filter if there is only one line item' do
- single_line_item_params = { line_items_attributes: { id: shirt.id, quantity: 0 } }
- expect(subject.order).to receive(:update).with(single_line_item_params)
- subject.update_cart single_line_item_params
- end
- end
-
- it 'ensures updated shipments' do
- expect(subject.order).to receive(:ensure_updated_shipments)
- subject.update_cart params
- end
- end
-
- context 'completed order' do
- let(:order) { create(:order, state: 'complete', completed_at: Time.current) }
-
- before { order.shipments.create! stock_location_id: variant.stock_location_ids.first }
-
- it 'updates order payment state' do
- expect do
- subject.add variant
- end.to change(order, :payment_state)
-
- expect do
- subject.remove variant
- end.to change(order, :payment_state)
- end
- end
-end
diff --git a/spree/core/spec/models/spree/order_inventory_spec.rb b/spree/core/spec/models/spree/order_inventory_spec.rb
index 28906065e1..db6bdbdac4 100644
--- a/spree/core/spec/models/spree/order_inventory_spec.rb
+++ b/spree/core/spec/models/spree/order_inventory_spec.rb
@@ -52,7 +52,7 @@ describe Spree::OrderInventory, type: :model do
expect_any_instance_of(Spree::StockLocation).not_to receive(:unstock)
# The before_save callback in LineItem would verify inventory
- line_item = Spree::Cart::AddItem.call(order: order, variant: variant, options: { shipment: shipment }).value
+ line_item = Spree::Carts::AddItem.call(order: order, variant: variant, options: { shipment: shipment }).value
units = shipment.inventory_units_for(line_item.variant)
expect(units.sum(&:quantity)).to eq 1
@@ -70,7 +70,7 @@ describe Spree::OrderInventory, type: :model do
expect_any_instance_of(Spree::StockLocation).not_to receive(:unstock)
- line_item = Spree::Cart::AddItem.call(order: order, variant: variant).value
+ line_item = Spree::Carts::AddItem.call(order: order, variant: variant).value
subject.verify(shipment)
units = shipment.inventory_units_for(line_item.variant)
diff --git a/spree/core/spec/models/spree/order_merger_spec.rb b/spree/core/spec/models/spree/order_merger_spec.rb
index f3c9209ed5..ee23ba731b 100644
--- a/spree/core/spec/models/spree/order_merger_spec.rb
+++ b/spree/core/spec/models/spree/order_merger_spec.rb
@@ -41,8 +41,8 @@ module Spree
context 'merging together two orders with line items for the same variant' do
before do
- Spree::Cart::AddItem.call order: order_1, variant: variant, quantity: 1
- Spree::Cart::AddItem.call order: order_2, variant: variant, quantity: 1
+ Spree::Carts::AddItem.call order: order_1, variant: variant, quantity: 1
+ Spree::Carts::AddItem.call order: order_2, variant: variant, quantity: 1
end
specify do
@@ -68,8 +68,8 @@ module Spree
context '2 equal line items' do
before do
- @line_item_1 = Spree::Cart::AddItem.call(order: order_1, variant: variant, quantity: 1, options: {foos: {}}).value
- @line_item_2 = Spree::Cart::AddItem.call(order: order_2, variant: variant, quantity: 1, options: {foos: {}}).value
+ @line_item_1 = Spree::Carts::AddItem.call(order: order_1, variant: variant, quantity: 1, options: {foos: {}}).value
+ @line_item_2 = Spree::Carts::AddItem.call(order: order_2, variant: variant, quantity: 1, options: {foos: {}}).value
end
specify do
@@ -87,8 +87,8 @@ module Spree
before do
allow(order_1).to receive(:foos_match).and_return(false)
- Spree::Cart::AddItem.call order: order_1, variant: variant, quantity: 1, options: {foos: {}}
- Spree::Cart::AddItem.call order: order_2, variant: variant, quantity: 1, options: {foos: {}}
+ Spree::Carts::AddItem.call order: order_1, variant: variant, quantity: 1, options: {foos: {}}
+ Spree::Carts::AddItem.call order: order_2, variant: variant, quantity: 1, options: {foos: {}}
end
specify do
@@ -110,8 +110,8 @@ module Spree
let(:variant_2) { create(:variant) }
before do
- Spree::Cart::AddItem.call order: order_1, variant: variant, quantity: 1
- Spree::Cart::AddItem.call order: order_2, variant: variant_2, quantity: 1
+ Spree::Carts::AddItem.call order: order_1, variant: variant, quantity: 1
+ Spree::Carts::AddItem.call order: order_2, variant: variant_2, quantity: 1
end
specify do
@@ -132,8 +132,8 @@ module Spree
let(:variant_2) { create(:variant) }
before do
- Spree::Cart::AddItem.call order: order_1, variant: variant, quantity: 1
- Spree::Cart::AddItem.call order: order_2, variant: variant_2, quantity: 1
+ Spree::Carts::AddItem.call order: order_1, variant: variant, quantity: 1
+ Spree::Carts::AddItem.call order: order_2, variant: variant_2, quantity: 1
end
it 'creates errors with invalid line items' do
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index b2945e46a1..12ca4b0b2c 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -1778,7 +1778,7 @@ describe Spree::Order, type: :model do
end
it 'returns the same promotion code after line item removal' do
- Spree::Cart::RemoveLineItem.call(order: order, line_item: order.line_items.first)
+ Spree::Carts::RemoveLineItem.call(order: order, line_item: order.line_items.first)
expect(order.reload.promo_code).to eq(coupon_code.code)
end
end
diff --git a/spree/core/spec/models/spree/promotion/actions/create_line_items_spec.rb b/spree/core/spec/models/spree/promotion/actions/create_line_items_spec.rb
index 9b097bdfa4..b3857249af 100644
--- a/spree/core/spec/models/spree/promotion/actions/create_line_items_spec.rb
+++ b/spree/core/spec/models/spree/promotion/actions/create_line_items_spec.rb
@@ -40,7 +40,7 @@ describe Spree::Promotion::Actions::CreateLineItems, type: :model do
end
it 'only adds the delta of quantity to an order' do
- Spree::Cart::AddItem.call(order: order, variant: shirt)
+ Spree::Carts::AddItem.call(order: order, variant: shirt)
action.perform(payload)
line_item = order.line_items.find_by(variant_id: shirt.id)
expect(line_item).not_to be_nil
@@ -48,7 +48,7 @@ describe Spree::Promotion::Actions::CreateLineItems, type: :model do
end
it "doesn't add if the quantity is greater" do
- Spree::Cart::AddItem.call(order: order, variant: shirt, quantity: 3)
+ Spree::Carts::AddItem.call(order: order, variant: shirt, quantity: 3)
action.perform(payload)
line_item = order.line_items.find_by(variant_id: shirt.id)
expect(line_item).not_to be_nil
diff --git a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
index 62f9372b9f..5edb3682d8 100644
--- a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
@@ -129,7 +129,7 @@ module Spree
general_promo = create(:promotion, name: 'General Promo', store: order.store)
Promotion::Actions::CreateItemAdjustments.create(promotion: general_promo, calculator: calculator) # general_action
- Spree::Cart::AddItem.call(order: order, variant: create(:variant))
+ Spree::Carts::AddItem.call(order: order, variant: create(:variant))
end
# regression spec for #4515
@@ -235,7 +235,7 @@ module Spree
context 'and the product price is less than promo discount' do
let(:product_list) { create_list(:product, 3, tax_category: tax_category, price: 9.0) }
- before { product_list.each { |item| Spree::Cart::AddItem.call(order: order, variant: item.default_variant) } }
+ before { product_list.each { |item| Spree::Carts::AddItem.call(order: order, variant: item.default_variant) } }
it 'successfully applies the promo' do
# 3 * (9 + 0.9)
@@ -251,7 +251,7 @@ module Spree
context 'and the product price is greater than promo discount' do
let(:product_list) { create_list(:product, 3, tax_category: tax_category, price: 11.0) }
- before { product_list.each { |item| Spree::Cart::AddItem.call(order: order, variant: item.default_variant, quantity: 2) } }
+ before { product_list.each { |item| Spree::Carts::AddItem.call(order: order, variant: item.default_variant, quantity: 2) } }
it 'successfully applies the promo' do
# 3 * (22 + 2.2)
@@ -270,7 +270,7 @@ module Spree
before do
allow(order).to receive(:coupon_code).and_return '20off'
- product_list.each { |item| Spree::Cart::AddItem.call(order: order, variant: item.default_variant, quantity: 2) }
+ product_list.each { |item| Spree::Carts::AddItem.call(order: order, variant: item.default_variant, quantity: 2) }
end
it 'successfully applies the promo' do
diff --git a/spree/core/spec/models/spree/promotion_spec.rb b/spree/core/spec/models/spree/promotion_spec.rb
index 97b31aeedc..6baa6c42ad 100644
--- a/spree/core/spec/models/spree/promotion_spec.rb
+++ b/spree/core/spec/models/spree/promotion_spec.rb
@@ -865,7 +865,7 @@ describe Spree::Promotion, type: :model do
expect(line_item.adjustments.size).to eq(1)
expect(order.adjustment_total).to eq(-5)
- other_line_item = Spree::Cart::AddItem.call(order: order, variant: variant, options: { currency: order.currency }).value
+ other_line_item = Spree::Carts::AddItem.call(order: order, variant: variant, options: { currency: order.currency }).value
expect(other_line_item).not_to eq line_item
expect(other_line_item.adjustments.size).to eq(1)
diff --git a/spree/core/spec/models/spree/shipment_spec.rb b/spree/core/spec/models/spree/shipment_spec.rb
index 4b05723f17..c8131bae53 100644
--- a/spree/core/spec/models/spree/shipment_spec.rb
+++ b/spree/core/spec/models/spree/shipment_spec.rb
@@ -376,7 +376,7 @@ describe Spree::Shipment, type: :model do
context 'manifest' do
let(:order) { Spree::Order.create }
let(:variant) { create(:variant) }
- let!(:line_item) { Spree::Cart::AddItem.call(order: order, variant: variant).value }
+ let!(:line_item) { Spree::Carts::AddItem.call(order: order, variant: variant).value }
let!(:shipment) { order.create_proposed_shipments.first }
it 'returns variant expected' do
@@ -697,10 +697,10 @@ describe Spree::Shipment, type: :model do
let(:other_order) { create(:order) }
before do
- Spree::Cart::AddItem.call(order: order, variant: variant)
+ Spree::Carts::AddItem.call(order: order, variant: variant)
order.create_proposed_shipments
- Spree::Cart::AddItem.call(order: other_order, variant: variant)
+ Spree::Carts::AddItem.call(order: other_order, variant: variant)
other_order.create_proposed_shipments
end
diff --git a/spree/core/spec/models/spree/tax_rate_spec.rb b/spree/core/spec/models/spree/tax_rate_spec.rb
index f8ad769805..2542cad326 100644
--- a/spree/core/spec/models/spree/tax_rate_spec.rb
+++ b/spree/core/spec/models/spree/tax_rate_spec.rb
@@ -242,7 +242,7 @@ describe Spree::TaxRate, type: :model do
context 'a download' do
before do
- Spree::Cart::AddItem.call(order: order, variant: download.default_variant)
+ Spree::Carts::AddItem.call(order: order, variant: download.default_variant)
end
it 'without an address costs 100 euros including tax' do
@@ -284,7 +284,7 @@ describe Spree::TaxRate, type: :model do
context 'a t-shirt' do
it 'to germany costs 100 euros including tax' do
allow(order).to receive(:tax_zone).and_return(germany_zone)
- Spree::Cart::AddItem.call(order: order, variant: tshirt.default_variant)
+ Spree::Carts::AddItem.call(order: order, variant: tshirt.default_variant)
Spree::TaxRate.adjust(order, order.line_items)
order.update_with_updater!
expect(order.display_total).to eq(Spree::Money.new(100))
@@ -293,7 +293,7 @@ describe Spree::TaxRate, type: :model do
it 'to france costs 100 euros including tax' do
allow(order).to receive(:tax_zone).and_return(france_zone)
- Spree::Cart::AddItem.call(order: order, variant: tshirt.default_variant)
+ Spree::Carts::AddItem.call(order: order, variant: tshirt.default_variant)
order.update_line_item_prices!
Spree::TaxRate.adjust(order, order.line_items)
order.update_with_updater!
@@ -304,7 +304,7 @@ describe Spree::TaxRate, type: :model do
it 'to somewhere else costs the net amount' do
allow(order).to receive(:tax_zone).and_return(india_zone)
- Spree::Cart::AddItem.call(order: order, variant: tshirt.default_variant)
+ Spree::Carts::AddItem.call(order: order, variant: tshirt.default_variant)
order.update_line_item_prices!
Spree::TaxRate.adjust(order, order.line_items)
order.update_with_updater!
@@ -391,7 +391,7 @@ describe Spree::TaxRate, type: :model do
end
context 'not taxable line item ' do
- let!(:line_item) { Spree::Cart::AddItem.call(order: @order, variant: @nontaxable.default_variant).value }
+ let!(:line_item) { Spree::Carts::AddItem.call(order: @order, variant: @nontaxable.default_variant).value }
it 'does not create a tax adjustment' do
Spree::TaxRate.adjust(@order, @order.line_items)
@@ -405,7 +405,7 @@ describe Spree::TaxRate, type: :model do
end
context 'taxable line item' do
- let!(:line_item) { Spree::Cart::AddItem.call(order: @order, variant: @taxable.default_variant).value }
+ let!(:line_item) { Spree::Carts::AddItem.call(order: @order, variant: @taxable.default_variant).value }
context 'when price includes tax' do
before do
diff --git a/spree/core/spec/services/spree/cart/change_currency_spec.rb b/spree/core/spec/services/spree/cart/change_currency_spec.rb
deleted file mode 100644
index aef1f55f83..0000000000
--- a/spree/core/spec/services/spree/cart/change_currency_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe Cart::ChangeCurrency do
- subject { described_class.call(order: order, new_currency: new_currency) }
-
- let(:order) { create(:order_with_line_items, store: store, currency: 'USD') }
- let(:store) { @default_store }
-
- before do
- allow(store).to receive(:supported_currencies).and_return('USD,EUR,GBP')
- end
-
- context 'when switching to a supported currency' do
- let(:new_currency) { 'EUR' }
-
- context 'when product has a price in given currency' do
- let!(:price) { create(:price, currency: 'EUR', variant: order.line_items.first.variant)}
-
- it 'changes order and line items currency' do
- expect(subject).to be_success
- order.reload
- expect(order.currency).to eq('EUR')
- expect(order.line_items.first.currency).to eq('EUR')
- end
-
- it 'removes the shipment and restarts the checkout flow' do
- expect(subject).to be_success
- order.reload
- expect(order.shipments).to be_empty
- expect(order.state).to eq('address')
- end
-
- context 'when the order has no shipment' do
- let(:order) { create(:order_with_totals, store: store, currency: 'USD', state: 'delivery') }
-
- it 'does not restart the checkout flow' do
- expect(subject).to be_success
- order.reload
- expect(order.state).to eq('delivery')
- end
- end
- end
- end
-
- context 'when switching to an unsupported currency' do
- let(:new_currency) { 'XOF' }
-
- it 'returns failure' do
- expect(subject).to be_failure
- order.reload
- expect(order.currency).to eq('USD')
- expect(order.line_items.first.currency).to eq('USD')
- end
- end
-
- context 'when there are items that are not available in the new currency' do
- let(:new_currency) { 'EUR' }
-
- it 'removes them from the Cart' do
- expect(order.line_items).not_to be_empty
- expect(subject).to be_success
- expect(Spree::Order.find(order.id).line_items).to be_empty
- end
- end
- end
-end
diff --git a/spree/core/spec/services/spree/cart/add_item_spec.rb b/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
similarity index 99%
rename from spree/core/spec/services/spree/cart/add_item_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
index 55573b1cf7..b9eecd9a89 100644
--- a/spree/core/spec/services/spree/cart/add_item_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_add_item_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::AddItem do
+ describe Carts::AddItem do
subject { described_class }
let(:order) { create :order, total: 100 }
diff --git a/spree/core/spec/services/spree/cart/associate_spec.rb b/spree/core/spec/services/spree/carts/legacy_associate_spec.rb
similarity index 96%
rename from spree/core/spec/services/spree/cart/associate_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_associate_spec.rb
index 56e256efa8..cf1b87536f 100644
--- a/spree/core/spec/services/spree/cart/associate_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_associate_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::Associate do
+ describe Carts::Associate do
subject { described_class.call(guest_order: order, user: user) }
let(:user) { create(:user) }
diff --git a/spree/core/spec/services/spree/cart/destroy_spec.rb b/spree/core/spec/services/spree/carts/legacy_destroy_spec.rb
similarity index 97%
rename from spree/core/spec/services/spree/cart/destroy_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_destroy_spec.rb
index 148b62aa75..2c0fecfb6e 100644
--- a/spree/core/spec/services/spree/cart/destroy_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_destroy_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::Destroy do
+ describe Carts::Destroy do
subject { described_class.call order: order }
context 'when order is given' do
@@ -95,7 +95,7 @@ module Spree
end
context 'when empty service is called first' do
- before { Spree::Cart::Empty.call(order: order) }
+ before { Spree::Carts::Empty.call(order: order) }
it 'destroys the order' do
expect(order.destroyed?).not_to be true
diff --git a/spree/core/spec/services/spree/cart/empty_spec.rb b/spree/core/spec/services/spree/carts/legacy_empty_spec.rb
similarity index 98%
rename from spree/core/spec/services/spree/cart/empty_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_empty_spec.rb
index f73a17aef6..de73ffbd97 100644
--- a/spree/core/spec/services/spree/cart/empty_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_empty_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::Empty do
+ describe Carts::Empty do
subject { described_class.call order: order }
context 'when order is given' do
diff --git a/spree/core/spec/services/spree/cart/remove_item_spec.rb b/spree/core/spec/services/spree/carts/legacy_remove_item_spec.rb
similarity index 98%
rename from spree/core/spec/services/spree/cart/remove_item_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_remove_item_spec.rb
index 3e0fc8678a..4dde65eba2 100644
--- a/spree/core/spec/services/spree/cart/remove_item_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_remove_item_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::RemoveItem do
+ describe Carts::RemoveItem do
subject { described_class }
let(:order) { create :order, line_items: [line_item] }
diff --git a/spree/core/spec/services/spree/cart/remove_line_item_spec.rb b/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
similarity index 99%
rename from spree/core/spec/services/spree/cart/remove_line_item_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
index 86b2c47185..e0e2804192 100644
--- a/spree/core/spec/services/spree/cart/remove_line_item_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_remove_line_item_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::RemoveLineItem do
+ describe Carts::RemoveLineItem do
subject { described_class }
let(:order) { create :order, line_items: [line_item] }
diff --git a/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb b/spree/core/spec/services/spree/carts/legacy_remove_out_of_stock_items_spec.rb
similarity index 98%
rename from spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_remove_out_of_stock_items_spec.rb
index c76395677f..09676f001d 100644
--- a/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_remove_out_of_stock_items_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-RSpec.describe Spree::Cart::RemoveOutOfStockItems do
+RSpec.describe Spree::Carts::RemoveOutOfStockItems do
subject { described_class }
let(:store) { @default_store }
diff --git a/spree/core/spec/services/spree/cart/set_quantity_spec.rb b/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
similarity index 99%
rename from spree/core/spec/services/spree/cart/set_quantity_spec.rb
rename to spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
index a84063773b..9a831d592d 100644
--- a/spree/core/spec/services/spree/cart/set_quantity_spec.rb
+++ b/spree/core/spec/services/spree/carts/legacy_set_quantity_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Cart::SetQuantity do
+ describe Carts::SetQuantity do
subject { described_class }
let(:store) { @default_store }
diff --git a/spree/core/spec/services/spree/carts/upsert_items_spec.rb b/spree/core/spec/services/spree/carts/upsert_items_spec.rb
index 9004925379..b9eb0a5ba6 100644
--- a/spree/core/spec/services/spree/carts/upsert_items_spec.rb
+++ b/spree/core/spec/services/spree/carts/upsert_items_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe Carts::UpsertItems do
let(:store) { create(:store) }
let(:user) { create(:user) }
- let(:cart) { create(:cart, user: user, store: store) }
+ let(:cart) { create(:order, user: user, store: store) }
let(:variant) { create(:variant) }
let(:variant2) { create(:variant) }
@@ -146,7 +146,7 @@ module Spree
end
context 'with variant not available in cart currency' do
- let(:cart) { create(:cart, user: user, store: store, currency: 'GBP') }
+ let(:cart) { create(:order, user: user, store: store, currency: 'GBP') }
let(:items) { [{ variant_id: variant.prefixed_id, quantity: 1 }] }
it 'returns failure with message' do