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.

Changed internal code and specs to use the 6.0 model names (#14797)

Damian Legawiec1019791f1273
diff --git a/docs/developer/multi-tenant/quickstart.mdx b/docs/developer/multi-tenant/quickstart.mdx
index 28c24e47e5..f6fc8f7da5 100644
--- a/docs/developer/multi-tenant/quickstart.mdx
+++ b/docs/developer/multi-tenant/quickstart.mdx
@@ -217,7 +217,7 @@ it in the scope of the tenant instead, so the same email can exist across differ
```ruby server/app/models/spree/user.rb
class Spree::User < Spree.base_class
include Spree::UserAddress
- include Spree::UserMethods
+ include Spree::CustomerMethods
include Spree::UserPaymentSource
include SpreeMultiTenant::CustomerUserConcern # added by the generator
diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb
index 4639638129..f8cacec682 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb
@@ -25,7 +25,7 @@ module Spree
# explicit `cost` persists only with `status: 'shipped'` — pending
# fulfillments are re-priced by the rate engine.
def create
- authorize!(:create, Spree::Shipment)
+ authorize!(:create, Spree::Fulfillment)
with_order_lock do
result = Spree.fulfillment_create_workflow.call(
@@ -123,7 +123,7 @@ module Spree
def delivery_method_for_create
return if create_params[:delivery_method_id].blank?
- Spree::ShippingMethod.accessible_by(current_ability, :show).find_by_prefix_id!(create_params[:delivery_method_id])
+ Spree::DeliveryMethod.accessible_by(current_ability, :show).find_by_prefix_id!(create_params[:delivery_method_id])
end
def items_for_create
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers/addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers/addresses_controller_spec.rb
index 284a49d7bb..ff277bea48 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers/addresses_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers/addresses_controller_spec.rb
@@ -144,7 +144,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::AddressesController, type: :con
end
context 'when the address is referenced by a shipment' do
- let!(:shipment) { create(:shipment, address: address) }
+ let!(:shipment) { create(:fulfillment, address: address) }
it 'soft-deletes the address, keeping the shipment association intact' do
expect {
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/external_references_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/external_references_spec.rb
index ee65f3a8e1..081225179f 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/external_references_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/external_references_spec.rb
@@ -183,7 +183,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, 'upsert by external id',
# on the row. A DAM re-posting an asset it already synced must not have them
# reinterpreted as attributes by the update action.
it 'accepts a replay carrying the create payload\'s fetch keys' do
- media = create(:image, viewable: product)
+ media = create(:media, viewable: product)
media.set_external_id('dam', 'ASSET-1')
expect do
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/media_library_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/media_library_controller_spec.rb
index 4378fb7245..135a73f222 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/media_library_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/media_library_controller_spec.rb
@@ -6,8 +6,8 @@ RSpec.describe Spree::Api::V3::Admin::MediaLibraryController, type: :controller
include_context 'API v3 Admin authenticated'
let!(:product) { create(:product) }
- let!(:placed) { create(:image, viewable: product) }
- let!(:unplaced) { create(:image, viewable: nil) }
+ let!(:placed) { create(:media, viewable: product) }
+ let!(:unplaced) { create(:media, viewable: nil) }
before { request.headers.merge!(headers) }
@@ -71,7 +71,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaLibraryController, type: :controller
context 'with media belonging to another store' do
let(:other_store) { create(:store) }
- let!(:foreign) { create(:image, viewable: create(:product, store: other_store)) }
+ let!(:foreign) { create(:media, viewable: create(:product, store: other_store)) }
it 'lists only this store' do
get :index, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/fulfillments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/fulfillments_controller_spec.rb
index 63ef621855..e5d2240a97 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/fulfillments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/fulfillments_controller_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::FulfillmentsController, type: :con
expect(json_response['tracking']).to eq('INPOST-123')
expect(json_response['items'].sum { |item| item['quantity'] }).to eq(order.line_items.sum(:quantity))
expect(order.reload.shipments.count).to eq(1)
- expect(Spree::Shipment.exists?(shipment.id)).to be(false)
+ expect(Spree::Fulfillment.exists?(shipment.id)).to be(false)
end
it 'creates a fulfillment for explicit items, keeping the source shipment' do
@@ -68,7 +68,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::FulfillmentsController, type: :con
end
it 'attaches the delivery method as the selected rate' do
- delivery_method = create(:shipping_method)
+ delivery_method = create(:delivery_method)
post :create, params: {
order_id: order.prefixed_id,
@@ -222,7 +222,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::FulfillmentsController, type: :con
end
it 'selects a delivery rate by prefixed ID' do
- new_rate = create(:shipping_rate, shipment: shipment, cost: 20, selected: false)
+ new_rate = create(:delivery_rate, shipment: shipment, cost: 20, selected: false)
patch :update, params: {
order_id: order.prefixed_id,
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
index 8109f700a5..86f2497745 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
@@ -418,7 +418,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
let(:state) { country.states.first || create(:state, country: country) }
let!(:zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |sm|
+ create(:delivery_method).tap do |sm|
sm.calculator.preferred_amount = 5
sm.calculator.save
end
@@ -513,7 +513,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
let(:state) { country.states.first || create(:state, country: country) }
let!(:zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |sm|
+ create(:delivery_method).tap do |sm|
sm.calculator.preferred_amount = 5
sm.calculator.save
end
@@ -825,7 +825,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
let(:state) { country.states.first || create(:state, country: country) }
let!(:zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |sm|
+ create(:delivery_method).tap do |sm|
sm.calculator.preferred_amount = 5
sm.calculator.save
end
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/products/media_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/products/media_controller_spec.rb
index 9b8b231298..21eb745072 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/products/media_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/products/media_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
include_context 'API v3 Admin authenticated'
let!(:product) { create(:product) }
- let!(:image) { create(:image, viewable: product) }
+ let!(:image) { create(:media, viewable: product) }
before { request.headers.merge!(headers) }
@@ -112,7 +112,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
end
context 'with variant_ids on a product-level asset' do
- let!(:product_asset) { create(:image, viewable: product) }
+ let!(:product_asset) { create(:media, viewable: product) }
let!(:variant_a) { create(:variant, product: product) }
let!(:variant_b) { create(:variant, product: product) }
@@ -170,7 +170,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
end
context 'with legacy default-variant-pinned assets' do
- let!(:legacy_variant_image) { create(:image, viewable: product.default_variant) }
+ let!(:legacy_variant_image) { create(:media, viewable: product.default_variant) }
it 'still surfaces legacy assets in the listing' do
get :index, params: { product_id: product.prefixed_id }, as: :json
@@ -232,7 +232,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
describe 'PATCH #update' do
let!(:video) do
- create(:external_video_asset, viewable: product,
+ create(:external_video_media, viewable: product,
external_video_url: 'https://vimeo.com/123456789')
end
@@ -282,7 +282,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
end
it 'attaches a poster to an existing video' do
- video = create(:external_video_asset, viewable: product,
+ video = create(:external_video_media, viewable: product,
external_video_url: 'https://vimeo.com/123456789')
patch :update, params: {
@@ -314,7 +314,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
describe 'variant assets' do
let!(:variant) { create(:variant, product: product) }
- let!(:variant_image) { create(:image, viewable: variant) }
+ let!(:variant_image) { create(:media, viewable: variant) }
describe 'GET #index' do
it 'returns media for the variant' do
@@ -490,7 +490,7 @@ RSpec.describe Spree::Api::V3::Admin::MediaController, type: :controller do
context 'with a source from another store' do
let(:other_store) { create(:store) }
- let(:foreign_image) { create(:image, viewable: create(:product, store: other_store)) }
+ let(:foreign_image) { create(:media, viewable: create(:product, store: other_store)) }
it 'returns 404 rather than copying across stores' do
post :create, params: {
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
index 849b872959..0dceed735b 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/fulfillments_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
include_context 'API v3 Store'
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
let!(:order) do
create(:cart_with_line_items, customer: user, store: store).tap do |o|
o.update!(email: user.email, ship_address: create(:address))
@@ -24,13 +24,13 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
describe 'PATCH #update' do
context 'when selecting a different delivery rate' do
- let(:cheaper_shipping_method) { create(:shipping_method, name: 'Cheap Shipping') }
- let(:expensive_shipping_method) { create(:shipping_method, name: 'Express Shipping') }
+ let(:cheaper_shipping_method) { create(:delivery_method, name: 'Cheap Shipping') }
+ let(:expensive_shipping_method) { create(:delivery_method, name: 'Express Shipping') }
before do
fulfillment.delivery_rates.delete_all
- create(:shipping_rate, shipment: fulfillment, shipping_method: cheaper_shipping_method, cost: 5, selected: true)
- create(:shipping_rate, shipment: fulfillment, shipping_method: expensive_shipping_method, cost: 25, selected: false)
+ create(:delivery_rate, shipment: fulfillment, shipping_method: cheaper_shipping_method, cost: 5, selected: true)
+ create(:delivery_rate, shipment: fulfillment, shipping_method: expensive_shipping_method, cost: 25, selected: false)
fulfillment.reload
order.set_fulfillments_cost
end
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
index 6440bd9de2..af14d0274f 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb
@@ -540,7 +540,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
let(:country) { Spree::Country.by_iso('US') }
let!(:us_state) { Spree::State.resolve(country.iso, 'NY') }
let!(:zone) { create(:zone) }
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
@@ -626,7 +626,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
let(:country) { Spree::Country.by_iso('US') }
let!(:us_state) { Spree::State.resolve(country.iso, 'NY') }
let!(:zone) { create(:zone) }
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
@@ -1099,7 +1099,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
- create(:shipping_method) if Spree::DeliveryMethod.none?
+ create(:delivery_method) if Spree::DeliveryMethod.none?
end
it 'completes the checkout' do
@@ -1181,7 +1181,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'completes via spree token' do
- create(:shipping_method) if Spree::DeliveryMethod.none?
+ create(:delivery_method) if Spree::DeliveryMethod.none?
request.headers['Authorization'] = nil
request.headers['x-spree-token'] = guest_order.token
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts_split_checkout_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts_split_checkout_spec.rb
index 6470278054..db13ecbbf0 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts_split_checkout_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts_split_checkout_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, 'split checkout', type: :
before do
request.headers['X-Spree-Api-Key'] = api_key.token
request.headers['Authorization'] = "Bearer #{jwt_token}"
- create(:shipping_method) if Spree::DeliveryMethod.none?
+ create(:delivery_method) if Spree::DeliveryMethod.none?
end
# A basket of the operator's own goods plus one seller's — the mixed case.
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/addresses_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/addresses_controller_spec.rb
index a0c91c4e8b..2a49d22a7b 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/addresses_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/addresses_controller_spec.rb
@@ -306,7 +306,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
end
context 'when the address is referenced by a shipment' do
- let!(:shipment) { create(:shipment, address: address) }
+ let!(:shipment) { create(:fulfillment, address: address) }
it 'soft-deletes the address, keeping the shipment association intact' do
expect {
diff --git a/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
index adcbfb2e2c..12c5e76284 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe Spree::Api::V3::Store::DeliveryMethodsController, type: :controll
include_context 'API v3 Store'
- let!(:shipping_method) { create(:shipping_method, name: 'Standard', storefront_visible: true) }
+ let!(:shipping_method) { create(:delivery_method, name: 'Standard', storefront_visible: true) }
let!(:pickup_method) { create(:pickup_delivery_method, name: 'Store pickup', storefront_visible: true) }
- let!(:hidden_method) { create(:shipping_method, name: 'Internal', storefront_visible: false) }
+ let!(:hidden_method) { create(:delivery_method, name: 'Internal', storefront_visible: false) }
before { request.headers['X-Spree-Api-Key'] = api_key.token }
diff --git a/spree/api/spec/integration/spree/api/v3/admin/delivery_settings_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/delivery_settings_spec.rb
index 6151f1f241..d9e7c29a2e 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/delivery_settings_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/delivery_settings_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Admin Delivery Settings API', type: :request, swagger_doc: 'api-
parameter name: :Authorization, in: :header, type: :string, required: true
response '200', 'delivery methods found' do
- before { create(:shipping_method, name: 'UPS Ground') }
+ before { create(:delivery_method, name: 'UPS Ground') }
run_test! do |response|
data = JSON.parse(response.body)
diff --git a/spree/api/spec/integration/spree/api/v3/admin/markets_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/markets_spec.rb
index 7f239c9416..80ee06fbc6 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/markets_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/markets_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe 'Admin Markets API', type: :request, swagger_doc: 'api-reference/
# other countries this spec assigns directly through the API.
before do
# Delivery methods are worldwide by default; one method covers all countries.
- create(:shipping_method) unless Spree::DeliveryMethod.where(delivery_zone_id: nil).exists?
+ create(:delivery_method) unless Spree::DeliveryMethod.where(delivery_zone_id: nil).exists?
end
path '/api/v3/admin/markets' do
diff --git a/spree/api/spec/integration/spree/api/v3/admin/media_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/media_spec.rb
index ae7053c422..331dc30228 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/media_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/media_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Admin Media Library API', type: :request, swagger_doc: 'api-refe
include_context 'API v3 Admin'
let!(:product) { create(:product, store: store) }
- let!(:media) { create(:image, viewable: product, alt: 'Front view') }
+ let!(:media) { create(:media, viewable: product, alt: 'Front view') }
let(:Authorization) { "Bearer #{admin_jwt_token}" }
path '/api/v3/admin/media' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb b/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
index f16fdddd85..299b43f46c 100644
--- a/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/carts_spec.rb
@@ -351,7 +351,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
response '200', 'cart completed' do
let(:completable_order) do
- create(:shipping_method)
+ create(:delivery_method)
order = create(:cart_with_line_items, store: store, customer: user)
order.update!(email: user.email, ship_address: create(:address), bill_address: create(:address))
order.rebuild_fulfillments!
diff --git a/spree/api/spec/integration/spree/api/v3/store/delivery_methods_spec.rb b/spree/api/spec/integration/spree/api/v3/store/delivery_methods_spec.rb
index a0a4044b60..3b6f8071fa 100644
--- a/spree/api/spec/integration/spree/api/v3/store/delivery_methods_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/delivery_methods_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Store Delivery Methods API', type: :request, swagger_doc: 'api-r
response '200', 'delivery methods found' do
before do
- create(:shipping_method, name: 'Standard')
+ create(:delivery_method, name: 'Standard')
create(:pickup_delivery_method, name: 'Store pickup')
end
diff --git a/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb b/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
index d50de94583..e93c945016 100644
--- a/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/fulfillments_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Fulfillments API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
let!(:order) do
create(:cart_with_line_items, store: store, customer: user).tap do |o|
o.update!(email: user.email, ship_address: create(:address))
diff --git a/spree/api/spec/serializers/spree/api/v3/delivery_rate_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/delivery_rate_serializer_spec.rb
index 4c783f49ca..9be936ec34 100644
--- a/spree/api/spec/serializers/spree/api/v3/delivery_rate_serializer_spec.rb
+++ b/spree/api/spec/serializers/spree/api/v3/delivery_rate_serializer_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Spree::Api::V3::DeliveryRateSerializer do
let(:store) { @default_store }
let(:base_params) { { store: store, currency: store.default_currency } }
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
let(:shipping_rate) { shipment.shipping_rates.first }
subject { described_class.new(shipping_rate, params: base_params).to_h }
diff --git a/spree/api/spec/serializers/spree/api/v3/freight_spec.rb b/spree/api/spec/serializers/spree/api/v3/freight_spec.rb
index c1428cbaf4..b4438b8094 100644
--- a/spree/api/spec/serializers/spree/api/v3/freight_spec.rb
+++ b/spree/api/spec/serializers/spree/api/v3/freight_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'freight serialization' do
def select_freight_rate(cart, **line)
snapshot = Spree::FreightSummary.new(lines: [Spree::FreightSummary::Line.new(**line)]).as_json
- fulfillment = create(:shipment, cart: cart, order: nil)
+ fulfillment = create(:fulfillment, cart: cart, order: nil)
create(:delivery_rate, fulfillment: fulfillment, selected: true, unpriced: true, cost: 0,
metadata: { 'freight_summary' => snapshot })
end
@@ -77,7 +77,7 @@ RSpec.describe 'freight serialization' do
# The rate says quoted-after-review; the fulfillment's own shipping line
# must not undercut it with $0.00.
it 'carries the unpriced flag and label through the fulfillment' do
- fulfillment = create(:shipment)
+ fulfillment = create(:fulfillment)
create(:delivery_rate, fulfillment: fulfillment, cost: 0, unpriced: true, selected: true)
fulfillment.reload.update_amounts
@@ -91,7 +91,7 @@ RSpec.describe 'freight serialization' do
# one saying "quoted after review" while the other says $0.00 is the
# free-shipping lie in a different field.
it 'says the same on every money display, and is not free' do
- fulfillment = create(:shipment)
+ fulfillment = create(:fulfillment)
create(:delivery_rate, fulfillment: fulfillment, cost: 0, unpriced: true, selected: true)
fulfillment.reload.update_amounts
@@ -102,7 +102,7 @@ RSpec.describe 'freight serialization' do
end
it 'stays money for a priced fulfillment' do
- fulfillment = create(:shipment)
+ fulfillment = create(:fulfillment)
create(:delivery_rate, fulfillment: fulfillment, cost: 12, selected: true)
fulfillment.reload.update_amounts
@@ -114,7 +114,7 @@ RSpec.describe 'freight serialization' do
end
describe Spree::Api::V3::DeliveryRateSerializer do
- let(:fulfillment) { create(:shipment) }
+ let(:fulfillment) { create(:fulfillment) }
it 'says a freight rate is unpriced rather than free' do
rate = create(:delivery_rate, fulfillment: fulfillment, cost: 0, unpriced: true)
diff --git a/spree/api/spec/serializers/spree/api/v3/line_item_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/line_item_serializer_spec.rb
index 8f8e972a7f..abe11941c6 100644
--- a/spree/api/spec/serializers/spree/api/v3/line_item_serializer_spec.rb
+++ b/spree/api/spec/serializers/spree/api/v3/line_item_serializer_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe Spree::Api::V3::LineItemSerializer do
describe 'thumbnail_url' do
context 'when variant has an image' do
- let(:image) { create(:image) }
+ let(:image) { create(:media) }
let(:variant) { create(:variant, product: product, images: [image]) }
before do
@@ -69,7 +69,7 @@ RSpec.describe Spree::Api::V3::LineItemSerializer do
end
context 'when variant has no image but product has an image' do
- let(:image) { create(:image) }
+ let(:image) { create(:media) }
let(:variant) { product.default_variant }
before do
diff --git a/spree/api/spec/serializers/spree/api/v3/media_event_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/media_event_serializer_spec.rb
index 6847e1d42d..750306ebf5 100644
--- a/spree/api/spec/serializers/spree/api/v3/media_event_serializer_spec.rb
+++ b/spree/api/spec/serializers/spree/api/v3/media_event_serializer_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec.describe Spree::Api::V3::MediaEventSerializer do
let(:store) { @default_store }
let(:product) { create(:product) }
- let(:asset) { create(:asset, viewable: product.default_variant) }
+ let(:asset) { create(:media, viewable: product.default_variant) }
let(:base_params) { { store: store, currency: 'USD' } }
subject { described_class.new(asset, params: base_params).to_h }
diff --git a/spree/api/spec/serializers/spree/api/v3/price_gating_spec.rb b/spree/api/spec/serializers/spree/api/v3/price_gating_spec.rb
index 38a6ceba4e..fce7f5f658 100644
--- a/spree/api/spec/serializers/spree/api/v3/price_gating_spec.rb
+++ b/spree/api/spec/serializers/spree/api/v3/price_gating_spec.rb
@@ -142,7 +142,7 @@ RSpec.describe 'v3 Store serializer price gating' do
end
describe Spree::Api::V3::FulfillmentSerializer do
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
it 'nulls every money field for gated guests' do
hash = serialize(described_class, shipment, hide: true)
diff --git a/spree/core/README.md b/spree/core/README.md
index d611357a2e..eda72b4db3 100644
--- a/spree/core/README.md
+++ b/spree/core/README.md
@@ -28,8 +28,8 @@ All models are namespaced under `Spree::` and include:
- `Spree::Product` / `Spree::Variant` - Product catalog
- `Spree::Order` / `Spree::LineItem` - Order management
- `Spree::Payment` / `Spree::PaymentMethod` - Payment processing
-- `Spree::Shipment` / `Spree::ShippingMethod` - Shipping and fulfillment
-- `Spree::Taxon` / `Spree::Taxonomy` - Product categorization
+- `Spree::Fulfillment` / `Spree::DeliveryMethod` - Shipping and fulfillment
+- `Spree::Category` / `Spree::Collection` - Product categorization
- `Spree::Store` - Multi-store support
- `Spree::Promotion` - Promotions and discounts
- `Spree::GiftCard` - Gift card functionality
diff --git a/spree/core/app/models/spree/order_routing/strategy/base.rb b/spree/core/app/models/spree/order_routing/strategy/base.rb
index 73589cecf9..094b47d775 100644
--- a/spree/core/app/models/spree/order_routing/strategy/base.rb
+++ b/spree/core/app/models/spree/order_routing/strategy/base.rb
@@ -29,7 +29,7 @@ module Spree
raise NotImplementedError, "#{self.class} must implement #for_allocation"
end
- # @param fulfillment [Spree::Shipment]
+ # @param fulfillment [Spree::Fulfillment]
def for_sale(fulfillment:)
raise NotImplementedError, "#{self.class} must implement #for_sale"
end
diff --git a/spree/core/app/models/spree/order_routing/strategy/rules.rb b/spree/core/app/models/spree/order_routing/strategy/rules.rb
index fc0ea073b7..b17d7139c6 100644
--- a/spree/core/app/models/spree/order_routing/strategy/rules.rb
+++ b/spree/core/app/models/spree/order_routing/strategy/rules.rb
@@ -23,7 +23,7 @@ module Spree
estimate_rates(packages)
end
- # Stock decrement / restock today happens via Spree::Shipment's state
+ # Stock decrement / restock today happens via Spree::Fulfillment's state
# machine (after_ship / after_cancel). The strategy methods below are
# part of the contract for the future reservation + typed-movement
# phase — see 6.0-stock-reservations.md and 6.0-typed-stock-movements.md.
diff --git a/spree/core/app/models/spree/stock/inventory_unit_builder.rb b/spree/core/app/models/spree/stock/inventory_unit_builder.rb
index d81d034f75..6675fafb18 100644
--- a/spree/core/app/models/spree/stock/inventory_unit_builder.rb
+++ b/spree/core/app/models/spree/stock/inventory_unit_builder.rb
@@ -14,7 +14,7 @@ module Spree
@order.line_items.map do |line_item|
# They go through multiple splits, avoid loading the
# association to order until needed.
- Spree::InventoryUnit.new(
+ Spree::FulfillmentItem.new(
pending: true,
line_item_id: line_item.id,
variant_id: line_item.variant_id,
diff --git a/spree/core/app/models/spree/stock/packer.rb b/spree/core/app/models/spree/stock/packer.rb
index 55d1d86a43..6726f68f2a 100644
--- a/spree/core/app/models/spree/stock/packer.rb
+++ b/spree/core/app/models/spree/stock/packer.rb
@@ -35,8 +35,8 @@ module Spree
next unless stock_location.stocks? variant
on_hand, backordered = stock_location.fill_status(variant, unit.quantity)
- package.add(InventoryUnit.split(unit, backordered), :backordered) if backordered.positive?
- package.add(InventoryUnit.split(unit, on_hand), :on_hand) if on_hand.positive?
+ package.add(FulfillmentItem.split(unit, backordered), :backordered) if backordered.positive?
+ package.add(FulfillmentItem.split(unit, on_hand), :on_hand) if on_hand.positive?
else
package.add unit
end
diff --git a/spree/core/app/models/spree/stock/splitter/weight.rb b/spree/core/app/models/spree/stock/splitter/weight.rb
index 7fdc051606..bf50b77e7d 100644
--- a/spree/core/app/models/spree/stock/splitter/weight.rb
+++ b/spree/core/app/models/spree/stock/splitter/weight.rb
@@ -73,7 +73,7 @@ module Spree
per_content_max_quantity = 1 if per_content_max_quantity.zero?
content_items = [content_item]
while content_item.quantity > per_content_max_quantity
- split_inventory = InventoryUnit.split(content_item.inventory_unit, per_content_max_quantity)
+ split_inventory = FulfillmentItem.split(content_item.inventory_unit, per_content_max_quantity)
content_items << ContentItem.new(split_inventory, content_item.state)
end
content_items
diff --git a/spree/core/app/models/spree/stock_level.rb b/spree/core/app/models/spree/stock_level.rb
index 3916f08f5c..8fff29fc13 100644
--- a/spree/core/app/models/spree/stock_level.rb
+++ b/spree/core/app/models/spree/stock_level.rb
@@ -100,7 +100,7 @@ module Spree
}
def backordered_inventory_units
- Spree::InventoryUnit.backordered_for_stock_level(self)
+ Spree::FulfillmentItem.backordered_for_stock_level(self)
end
# @api private
diff --git a/spree/core/app/services/spree/payments/create.rb b/spree/core/app/services/spree/payments/create.rb
index 479c0541fb..484e208ad9 100644
--- a/spree/core/app/services/spree/payments/create.rb
+++ b/spree/core/app/services/spree/payments/create.rb
@@ -2,7 +2,7 @@ module Spree
module Payments
# @deprecated Unused since 6.0 and removed in 7.0. Nothing in Spree
# calls this: the storefront creates payments through the Store API
- # controller, store credit through Spree::Checkout::AddStoreCredit,
+ # controller, store credit through Spree::StoreCredits::Apply,
# gift cards through Spree::GiftCards::Apply, and a partial capture's
# remainder through Spree::Payment#split_uncaptured_amount.
#
diff --git a/spree/core/app/workflows/spree/fulfillments/create.rb b/spree/core/app/workflows/spree/fulfillments/create.rb
index 935e5f7f57..6e123506b6 100644
--- a/spree/core/app/workflows/spree/fulfillments/create.rb
+++ b/spree/core/app/workflows/spree/fulfillments/create.rb
@@ -1,6 +1,6 @@
module Spree
module Fulfillments
- # Manually creates a fulfillment (Spree::Shipment) on a completed order,
+ # Manually creates a fulfillment (Spree::Fulfillment) on a completed order,
# bypassing order routing. Moves the requested quantities of each line
# item's not-yet-shipped inventory units out of their current shipments
# into the new fulfillment, mirroring externally-managed fulfillment
@@ -37,7 +37,7 @@ module Spree
# @param items [Array<Hash>, nil] `[{ line_item: Spree::LineItem, quantity: Integer }]`;
# nil fulfills every not-yet-shipped unit on the order
# @param tracking [String, nil] carrier tracking number
- # @param delivery_method [Spree::ShippingMethod, nil] carrier; stored as the selected rate.
+ # @param delivery_method [Spree::DeliveryMethod, nil] carrier; stored as the selected rate.
# Defaults to the delivery method of the drained source fulfillment(s)
# @param cost [String, Numeric, nil] explicit shipping cost (e.g. the 3PL's price).
# Defaults to the summed cost of the drained source fulfillment(s), keeping the
@@ -212,7 +212,7 @@ module Spree
# carries each moved unit's allocation across with it so the promise
# follows the fulfillment that will ship it.
#
- # @return [Array<Spree::Shipment>] the shipments units were taken from
+ # @return [Array<Spree::Fulfillment>] the shipments units were taken from
def move_units(order, fulfillment, requested, units_by_line_item)
source_shipments = []
stock_moves = Hash.new(0)
@@ -283,7 +283,7 @@ module Spree
# deleted along with the shipment. The delivery method lookup costs
# queries, so it is skipped when the caller provided its own.
#
- # @return [Hash] `{ cost: BigDecimal, delivery_method: Spree::ShippingMethod or nil }`
+ # @return [Hash] `{ cost: BigDecimal, delivery_method: Spree::DeliveryMethod or nil }`
def destroy_drained_shipments(source_shipments, capture_delivery_method:)
inherited = { cost: 0, delivery_method: nil }
diff --git a/spree/core/lib/spree/testing_support/factories/cart_factory.rb b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
index 58f3f94c37..aa3be81ee2 100644
--- a/spree/core/lib/spree/testing_support/factories/cart_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/cart_factory.rb
@@ -31,7 +31,7 @@ FactoryBot.define do
country = Spree::Country.by_iso('US')
if Spree::DeliveryMethod.none?
- create(:shipping_method).tap do |delivery_method|
+ create(:delivery_method).tap do |delivery_method|
delivery_method.calculator.preferred_amount = evaluator.shipping_cost
delivery_method.calculator.preferred_currency = cart.store.default_currency
delivery_method.calculator.save!
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 d6da11cabf..1d9d04c50a 100644
--- a/spree/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/order_factory.rb
@@ -78,7 +78,7 @@ FactoryBot.define do
end
stock_location = order.line_items&.first&.variant&.stock_levels&.first&.stock_location || create(:stock_location)
- create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
+ create(:fulfillment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
order.fulfillments.reload
order.recalculate_totals!
diff --git a/spree/core/lib/spree/testing_support/factories/stock_factory.rb b/spree/core/lib/spree/testing_support/factories/stock_factory.rb
index 88fb509167..ae3e89227f 100644
--- a/spree/core/lib/spree/testing_support/factories/stock_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/stock_factory.rb
@@ -20,7 +20,7 @@ FactoryBot.define do
after(:build) do |package, evaluator|
evaluator.variants_contents.each do |variant, count|
- package.add_multiple build_list(:inventory_unit, count, variant: variant)
+ package.add_multiple build_list(:fulfillment_item, count, variant: variant)
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/variant_factory.rb b/spree/core/lib/spree/testing_support/factories/variant_factory.rb
index 4f4ebea42d..a07e9846a2 100644
--- a/spree/core/lib/spree/testing_support/factories/variant_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/variant_factory.rb
@@ -45,7 +45,7 @@ FactoryBot.define do
product { |p| p.association(:product) }
factory :with_image_variant do
- images { create_list(:image, 1) }
+ images { create_list(:media, 1) }
end
trait :with_no_price do
diff --git a/spree/core/lib/spree/testing_support/lifecycle_events.rb b/spree/core/lib/spree/testing_support/lifecycle_events.rb
index 650204296b..5b756a1621 100644
--- a/spree/core/lib/spree/testing_support/lifecycle_events.rb
+++ b/spree/core/lib/spree/testing_support/lifecycle_events.rb
@@ -21,7 +21,7 @@ shared_examples_for 'lifecycle events' do |factory: nil, event_prefix: nil|
expect(record).to receive(:publish_event).with("#{lifecycle_event_prefix}.updated")
allow(record).to receive(:publish_event).with(anything)
- # update_attribute, not update!: Spree::Shipment#update! shadows the
+ # update_attribute, not update!: Spree::Fulfillment#update! shadows the
# Active Record method with the legacy state-recalculation API.
Timecop.travel(1.minute.from_now) do
record.update_attribute(:updated_at, Time.current)
diff --git a/spree/core/lib/spree/testing_support/order_walkthrough.rb b/spree/core/lib/spree/testing_support/order_walkthrough.rb
index dde4e980e5..66aae16180 100644
--- a/spree/core/lib/spree/testing_support/order_walkthrough.rb
+++ b/spree/core/lib/spree/testing_support/order_walkthrough.rb
@@ -21,7 +21,7 @@ class OrderWalkthrough
# A delivery method must exist for rates to be displayed on checkout page
unless Spree::DeliveryMethod.exists?
- FactoryBot.create(:shipping_method).tap do |delivery_method|
+ FactoryBot.create(:delivery_method).tap do |delivery_method|
delivery_method.calculator.preferred_amount = 10
delivery_method.calculator.preferred_currency = store.default_currency
delivery_method.calculator.save
diff --git a/spree/core/lib/tasks/categories_and_collections.rake b/spree/core/lib/tasks/categories_and_collections.rake
index 81a7c3fa98..bc4be49f0f 100644
--- a/spree/core/lib/tasks/categories_and_collections.rake
+++ b/spree/core/lib/tasks/categories_and_collections.rake
@@ -80,7 +80,7 @@ namespace :spree do
# otherwise purge/destroy: ActionText description, images, custom fields, slugs.
move_polymorphic.call(ActionText::RichText, :record_type, :record_id, category, collection)
move_polymorphic.call(ActiveStorage::Attachment, :record_type, :record_id, category, collection, name: %w[image square_image])
- move_polymorphic.call(Spree::Metafield, :resource_type, :resource_id, category, collection)
+ move_polymorphic.call(Spree::CustomField, :resource_type, :resource_id, category, collection)
move_polymorphic.call(FriendlyId::Slug, :sluggable_type, :sluggable_id, category, collection)
# Rules -> collection_rules (remap the STI type; insert_all bypasses the
@@ -169,8 +169,8 @@ namespace :spree do
# category rows that still hold the pre-6.0 names.
puts 'Backfilling renamed class-name strings...'
[
- [Spree::Metafield, :resource_type, 'Spree::Taxon', 'Spree::Category'],
- [Spree::MetafieldDefinition, :resource_type, 'Spree::Taxon', 'Spree::Category'],
+ [Spree::CustomField, :resource_type, 'Spree::Taxon', 'Spree::Category'],
+ [Spree::CustomFieldDefinition, :resource_type, 'Spree::Taxon', 'Spree::Category'],
[ActiveStorage::Attachment, :record_type, 'Spree::Taxon', 'Spree::Category'],
# description is an ActionText field (translates :description, backend: :action_text);
# surviving categories keep their rich-text description without this.
diff --git a/spree/core/lib/tasks/media.rake b/spree/core/lib/tasks/media.rake
index 008dc7e048..6daec95e87 100644
--- a/spree/core/lib/tasks/media.rake
+++ b/spree/core/lib/tasks/media.rake
@@ -31,9 +31,9 @@ namespace :spree do
# Subquery (not pluck) so the product set doesn't materialize in Ruby —
# important for catalogs with millions of products.
variant_product_ids = Spree::Variant
- .joins("INNER JOIN #{Spree::Asset.table_name} ON " \
- "#{Spree::Asset.table_name}.viewable_id = #{Spree::Variant.table_name}.id " \
- "AND #{Spree::Asset.table_name}.viewable_type = 'Spree::Variant'")
+ .joins("INNER JOIN #{Spree::Media.table_name} ON " \
+ "#{Spree::Media.table_name}.viewable_id = #{Spree::Variant.table_name}.id " \
+ "AND #{Spree::Media.table_name}.viewable_type = 'Spree::Variant'")
.select(:product_id)
relation = Spree::Product.where(id: variant_product_ids)
diff --git a/spree/core/spec/helpers/images_helper_spec.rb b/spree/core/spec/helpers/images_helper_spec.rb
index d4e2fb6300..67ea5c2721 100644
--- a/spree/core/spec/helpers/images_helper_spec.rb
+++ b/spree/core/spec/helpers/images_helper_spec.rb
@@ -4,7 +4,7 @@ describe Spree::ImagesHelper, type: :helper do
let(:store) { @default_store }
let(:product) { create(:product) }
let(:image) do
- product_image = create(:image, viewable: product)
+ product_image = create(:media, viewable: product)
product_image.attachment.attach(
io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')),
filename: 'thinking-cat.jpg',
diff --git a/spree/core/spec/jobs/spree/images/migrate_product_media_job_spec.rb b/spree/core/spec/jobs/spree/images/migrate_product_media_job_spec.rb
index b03afde88b..ea2d0d7e48 100644
--- a/spree/core/spec/jobs/spree/images/migrate_product_media_job_spec.rb
+++ b/spree/core/spec/jobs/spree/images/migrate_product_media_job_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Spree::Images::MigrateProductMediaJob, type: :job do
describe '#perform' do
context 'with master-pinned assets' do
let!(:product) { create(:product) }
- let!(:asset) { create(:image, viewable: product.default_variant) }
+ let!(:asset) { create(:media, viewable: product.default_variant) }
it 'moves master-pinned assets to the product' do
expect { subject }
@@ -33,7 +33,7 @@ RSpec.describe Spree::Images::MigrateProductMediaJob, type: :job do
context 'with non-master variant-pinned assets' do
let!(:product) { create(:product) }
let!(:variant) { create(:variant, product: product) }
- let!(:asset) { create(:image, viewable: variant) }
+ let!(:asset) { create(:media, viewable: variant) }
it 'moves the asset to the product and creates a VariantMedia row' do
expect { subject }
@@ -46,7 +46,7 @@ RSpec.describe Spree::Images::MigrateProductMediaJob, type: :job do
it 'links each variant-pinned asset to its original variant' do
other_variant = create(:variant, product: product)
- other_asset = create(:image, viewable: other_variant)
+ other_asset = create(:media, viewable: other_variant)
subject
@@ -71,8 +71,8 @@ RSpec.describe Spree::Images::MigrateProductMediaJob, type: :job do
context 'with mixed master + non-master assets' do
let!(:product) { create(:product) }
let!(:variant) { create(:variant, product: product) }
- let!(:master_asset) { create(:image, viewable: product.default_variant) }
- let!(:variant_asset) { create(:image, viewable: variant) }
+ let!(:master_asset) { create(:media, viewable: product.default_variant) }
+ let!(:variant_asset) { create(:media, viewable: variant) }
it 'moves both, but only creates a join row for the non-master one' do
expect { subject }
@@ -88,7 +88,7 @@ RSpec.describe Spree::Images::MigrateProductMediaJob, type: :job do
context 'idempotency' do
let!(:product) { create(:product) }
let!(:variant) { create(:variant, product: product) }
- let!(:asset) { create(:image, viewable: variant) }
+ let!(:asset) { create(:media, viewable: variant) }
it 're-running the job is a no-op once everything is migrated' do
described_class.perform_now(product.id)
diff --git a/spree/core/spec/jobs/spree/images/save_from_url_job_spec.rb b/spree/core/spec/jobs/spree/images/save_from_url_job_spec.rb
index 8bb4949119..3d5cc9aff1 100644
--- a/spree/core/spec/jobs/spree/images/save_from_url_job_spec.rb
+++ b/spree/core/spec/jobs/spree/images/save_from_url_job_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
end
context "when image already exists with the given external_url" do
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
before do
image.external_url = external_url.strip
@@ -108,7 +108,7 @@ RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
image.save!
end
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
it "does not download the image" do
expect(SsrfFilter).not_to receive(:get)
diff --git a/spree/core/spec/lib/calculated_adjustments_spec.rb b/spree/core/spec/lib/calculated_adjustments_spec.rb
index 2cbc8e2b2d..9062211828 100644
--- a/spree/core/spec/lib/calculated_adjustments_spec.rb
+++ b/spree/core/spec/lib/calculated_adjustments_spec.rb
@@ -2,6 +2,6 @@ require 'spec_helper'
describe Spree::CalculatedAdjustments do
it 'adds has_one :calculator relationship' do
- assert Spree::ShippingMethod.reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
+ assert Spree::DeliveryMethod.reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
end
end
diff --git a/spree/core/spec/lib/tasks/backfill_media_store_ids_spec.rb b/spree/core/spec/lib/tasks/backfill_media_store_ids_spec.rb
index 670d5a08b8..95ff934fc5 100644
--- a/spree/core/spec/lib/tasks/backfill_media_store_ids_spec.rb
+++ b/spree/core/spec/lib/tasks/backfill_media_store_ids_spec.rb
@@ -22,7 +22,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
it 'takes a product-owned row from its product' do
other_store = create(:store)
- media = create(:image, viewable: create(:product, store: other_store))
+ media = create(:media, viewable: create(:product, store: other_store))
unown!(media)
subject.invoke
@@ -33,7 +33,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
it 'takes a variant-owned row from the variant product' do
other_store = create(:store)
variant = create(:variant, product: create(:product, store: other_store))
- media = create(:asset, viewable: variant)
+ media = create(:media, viewable: variant)
unown!(media)
subject.invoke
@@ -44,7 +44,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
# An unowned row is invisible to every library query, so it has to land
# somewhere rather than stay unreachable.
it 'gives a row with no viewable to the default store' do
- media = create(:image, viewable: nil)
+ media = create(:media, viewable: nil)
unown!(media)
subject.invoke
@@ -53,7 +53,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
end
it 'gives a row whose viewable is gone to the default store' do
- media = create(:image, viewable: create(:product))
+ media = create(:media, viewable: create(:product))
unown!(media)
Spree::Media.unscoped.where(id: media.id).update_all(viewable_id: 0)
@@ -64,7 +64,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
it 'leaves a row that already has a store alone' do
other_store = create(:store)
- media = create(:image, viewable: nil)
+ media = create(:media, viewable: nil)
Spree::Media.unscoped.where(id: media.id).update_all(store_id: other_store.id)
subject.invoke
@@ -73,7 +73,7 @@ describe 'spree:upgrade:backfill_media_store_ids' do
end
it 'can be run twice' do
- media = create(:image, viewable: create(:product))
+ media = create(:media, viewable: create(:product))
unown!(media)
subject.invoke
diff --git a/spree/core/spec/lib/tasks/media_class_rename_spec.rb b/spree/core/spec/lib/tasks/media_class_rename_spec.rb
index 0b9b733a17..5c55ef532c 100644
--- a/spree/core/spec/lib/tasks/media_class_rename_spec.rb
+++ b/spree/core/spec/lib/tasks/media_class_rename_spec.rb
@@ -13,7 +13,7 @@ describe 'spree:migrate_media_class_names' do
before { subject.reenable }
- let!(:media) { create(:image) }
+ let!(:media) { create(:media) }
# Simulates a pre-6.0 install: the rows still name the class by its old name.
def name_rows_legacy!(legacy_name)
diff --git a/spree/core/spec/lib/tasks/media_spec.rb b/spree/core/spec/lib/tasks/media_spec.rb
index 8a9b8b8e5c..4a1e5f63c9 100644
--- a/spree/core/spec/lib/tasks/media_spec.rb
+++ b/spree/core/spec/lib/tasks/media_spec.rb
@@ -21,8 +21,8 @@ describe 'spree:media:migrate_master_images_to_product_media' do
let!(:product_with_variant_image) { create(:product) }
let!(:variant) { create(:variant, product: product_with_variant_image) }
let!(:clean_product) { create(:product) }
- let!(:master_image) { create(:image, viewable: product_with_master_image.default_variant) }
- let!(:variant_image) { create(:image, viewable: variant) }
+ let!(:master_image) { create(:media, viewable: product_with_master_image.default_variant) }
+ let!(:variant_image) { create(:media, viewable: variant) }
it 'enqueues a job for each product with variant-pinned assets' do
expect { subject.invoke }.to have_enqueued_job(Spree::Images::MigrateProductMediaJob)
@@ -50,7 +50,7 @@ describe 'spree:media:migrate_master_images_to_product_media' do
context 'when run twice' do
let!(:product) { create(:product) }
let!(:variant) { create(:variant, product: product) }
- let!(:asset) { create(:image, viewable: variant) }
+ let!(:asset) { create(:media, viewable: variant) }
it 'still enqueues for products that have not been processed yet' do
# First invocation enqueues but doesn't run inline; the asset is still
diff --git a/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb b/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb
index ad51eab0b5..bbd87cdb86 100644
--- a/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb
+++ b/spree/core/spec/lib/tasks/six_zero_data_migrations_spec.rb
@@ -93,7 +93,7 @@ describe '6.0 data migration tasks' do
end
it 'marks digital-delivery methods and converts display_on' do
- digital_method = create(:shipping_method)
+ digital_method = create(:delivery_method)
digital_method.calculator.destroy!
Spree::Calculator::Shipping::DigitalDelivery.create!(calculable: digital_method)
# A 5.x row as it arrives post-migration: storefront_visible at the
@@ -110,7 +110,7 @@ describe '6.0 data migration tasks' do
# The conversion is one-shot: it clears display_on as it goes, so a later
# re-run cannot undo a visibility change an admin made in the meantime.
it 'does not revert a later admin visibility change on re-run' do
- method = create(:shipping_method)
+ method = create(:delivery_method)
method.update_columns(storefront_visible: true, display_on: 'back_end')
run_task('spree:migrate_shipping_to_delivery')
@@ -133,10 +133,10 @@ describe '6.0 data migration tasks' do
describe 'spree:backfill_delivery_and_stock_store_ids' do
it 'assigns the default store to unbound rows and skips bound ones' do
- bound = create(:shipping_method)
+ bound = create(:delivery_method)
other_store = create(:store)
bound.update_columns(store_id: other_store.id)
- legacy_method = create(:shipping_method)
+ legacy_method = create(:delivery_method)
legacy_method.update_columns(store_id: nil)
legacy_location = create(:stock_location)
legacy_location.update_columns(store_id: nil)
@@ -164,7 +164,7 @@ describe '6.0 data migration tasks' do
it 'folds a non-narrowing category into the store default profile' do
category = legacy_category!('Default Category')
- method = create(:shipping_method, store: store)
+ method = create(:delivery_method, store: store)
method_categories.create!(shipping_method_id: method.id, shipping_category_id: category.id)
Spree::DeliveryMethod.unscoped.where(store: store).find_each do |delivery_method|
method_categories.find_or_create_by!(shipping_method_id: delivery_method.id, shipping_category_id: category.id)
@@ -180,8 +180,8 @@ describe '6.0 data migration tasks' do
it 'keeps a narrowing category as a profile and moves its solely-linked method in' do
category = legacy_category!('Oversized')
- oversized_method = create(:shipping_method, store: store, name: 'Freight')
- create(:shipping_method, store: store, name: 'Regular')
+ oversized_method = create(:delivery_method, store: store, name: 'Freight')
+ create(:delivery_method, store: store, name: 'Regular')
method_categories.create!(shipping_method_id: oversized_method.id, shipping_category_id: category.id)
product = create(:product, store: store)
product.update_columns(delivery_profile_id: category.id)
@@ -198,7 +198,7 @@ describe '6.0 data migration tasks' do
it 'detects a digital-only category as a Digital profile' do
category = legacy_category!('Digital Goods')
digital_method = create(:digital_delivery_method, store: store)
- create(:shipping_method, store: store)
+ create(:delivery_method, store: store)
method_categories.create!(shipping_method_id: digital_method.id, shipping_category_id: category.id)
product = create(:product, store: store)
product.update_columns(delivery_profile_id: category.id)
@@ -212,8 +212,8 @@ describe '6.0 data migration tasks' do
it 'is idempotent' do
category = legacy_category!('Oversized')
- method = create(:shipping_method, store: store, name: 'Freight')
- create(:shipping_method, store: store, name: 'Regular')
+ method = create(:delivery_method, store: store, name: 'Freight')
+ create(:delivery_method, store: store, name: 'Regular')
method_categories.create!(shipping_method_id: method.id, shipping_category_id: category.id)
product = create(:product, store: store)
product.update_columns(delivery_profile_id: category.id)
@@ -403,7 +403,7 @@ describe '6.0 data migration tasks' do
legacy_zone_member(zone, country)
end
end
- let!(:delivery_method) { create(:shipping_method) }
+ let!(:delivery_method) { create(:delivery_method) }
before do
delivery_method.update_columns(delivery_zone_id: zone.id)
@@ -583,7 +583,7 @@ describe '6.0 data migration tasks' do
stranger = create(:order, store: store)
cart = create(:cart, store: store)
create(:line_item, cart: cart, order: nil)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
fulfillment.fulfillment_items.update_all(order_id: stranger.id)
run_task('spree:repair_cart_fulfillment_item_orders')
diff --git a/spree/core/spec/models/spree/calculator/price_sack_spec.rb b/spree/core/spec/models/spree/calculator/price_sack_spec.rb
index 01b23b28aa..78d6f064d4 100644
--- a/spree/core/spec/models/spree/calculator/price_sack_spec.rb
+++ b/spree/core/spec/models/spree/calculator/price_sack_spec.rb
@@ -9,7 +9,7 @@ describe Spree::Calculator::PriceSack, type: :model do
calculator
end
let(:order) { create(:order) }
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
before { allow(shipment).to receive_messages amount: 10 }
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 0f4bee3c3c..b4542a5977 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
@@ -24,7 +24,7 @@ RSpec.describe Spree::Calculator::Shipping::DigitalDelivery do
end
describe '#available?' do
- let(:digital_shipping_method) { create(:digital_shipping_method) }
+ let(:digital_shipping_method) { create(:digital_delivery_method) }
let(:digital_product) { create(:digital_product) }
let(:digital_order) do
diff --git a/spree/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb b/spree/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
index e17d0ab653..dc6537465b 100644
--- a/spree/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
+++ b/spree/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
@@ -8,8 +8,8 @@ module Spree
let(:variant1) { create(:variant, price: 10.11) }
let(:variant2) { create(:variant, price: 20.2222) }
- let(:inventory_unit1) { build(:inventory_unit, quantity: 2, variant: variant1, line_item: line_item1) }
- let(:inventory_unit2) { build(:inventory_unit, quantity: 1, variant: variant2, line_item: line_item2) }
+ let(:inventory_unit1) { build(:fulfillment_item, quantity: 2, variant: variant1, line_item: line_item1) }
+ let(:inventory_unit2) { build(:fulfillment_item, quantity: 1, variant: variant2, line_item: line_item2) }
let(:inventory_units) { [inventory_unit1, inventory_unit2] }
let(:line_item1) { build(:line_item, variant: variant1, price: 10.11) }
diff --git a/spree/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb b/spree/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
index f988bde073..c7aff78567 100644
--- a/spree/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
+++ b/spree/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
@@ -36,8 +36,8 @@ RSpec.describe Spree::Calculator::Shipping::FlatRate, type: :model do
let(:line_item1) { build(:line_item, variant: variant1, price: 10) }
let(:line_item2) { build(:line_item, variant: variant2, price: 15) }
- let(:inventory_unit1) { build(:inventory_unit, quantity: 2, variant: variant1, line_item: line_item1) }
- let(:inventory_unit2) { build(:inventory_unit, quantity: 1, variant: variant2, line_item: line_item2) }
+ let(:inventory_unit1) { build(:fulfillment_item, quantity: 2, variant: variant1, line_item: line_item1) }
+ let(:inventory_unit2) { build(:fulfillment_item, quantity: 1, variant: variant2, line_item: line_item2) }
let(:inventory_units) { [inventory_unit1, inventory_unit2] }
let(:package) { build(:stock_package, contents: inventory_units.map { |iu| ::Spree::Stock::ContentItem.new(iu) }) }
diff --git a/spree/core/spec/models/spree/calculator/shipping/price_sack_spec.rb b/spree/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
index 6d245d9ede..5451ae7f2c 100644
--- a/spree/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
+++ b/spree/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
@@ -17,12 +17,12 @@ module Spree
let(:inventory_unit1) { }
let(:normal_package) do
- iu = build(:inventory_unit, quantity: 2, variant: variant, line_item: line_item)
+ iu = build(:fulfillment_item, quantity: 2, variant: variant, line_item: line_item)
build(:stock_package, contents: [::Spree::Stock::ContentItem.new(iu)])
end
let(:discount_package) do
- iu = build(:inventory_unit, quantity: 4, variant: variant, line_item: line_item)
+ iu = build(:fulfillment_item, quantity: 4, variant: variant, line_item: line_item)
build(:stock_package, contents: [::Spree::Stock::ContentItem.new(iu)])
end
diff --git a/spree/core/spec/models/spree/calculator_spec.rb b/spree/core/spec/models/spree/calculator_spec.rb
index 6967115637..e280bf8460 100644
--- a/spree/core/spec/models/spree/calculator_spec.rb
+++ b/spree/core/spec/models/spree/calculator_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::Calculator, type: :model do
let(:order) { build(:order) }
let(:line_item) { build(:line_item, order: order) }
- let(:shipment) { build(:shipment, order: order) }
+ let(:shipment) { build(:fulfillment, order: order) }
context 'with computable' do
context 'and compute methods stubbed out' do
@@ -21,7 +21,7 @@ describe Spree::Calculator, type: :model do
end
end
- context 'with a Spree::Shipment' do
+ context 'with a Spree::Fulfillment' do
it 'calls compute_shipment' do
expect(subject).to receive(:compute_shipment).with(shipment)
subject.compute(shipment)
@@ -50,7 +50,7 @@ describe Spree::Calculator, type: :model do
end
end
- context 'with a Spree::Shipment' do
+ context 'with a Spree::Fulfillment' do
it 'raises NotImplementedError' do
expect { subject.compute(shipment) }.to raise_error NotImplementedError, /Please implement \'compute_shipment\(shipment\)\' in your calculator/
end
diff --git a/spree/core/spec/models/spree/cart_spec.rb b/spree/core/spec/models/spree/cart_spec.rb
index e145fd24d2..de39fbdbc2 100644
--- a/spree/core/spec/models/spree/cart_spec.rb
+++ b/spree/core/spec/models/spree/cart_spec.rb
@@ -432,7 +432,7 @@ describe Spree::Cart, type: :model do
let(:state) { country.states.first || create(:state, country: country) }
let!(:zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |method|
+ create(:delivery_method).tap do |method|
method.calculator.preferred_amount = 5
method.calculator.save
end
@@ -441,7 +441,7 @@ describe Spree::Cart, type: :model do
let(:ship_address) { create(:address, country: country, state: state) }
let(:cart) { create(:cart_with_line_items, store: store, ship_address: ship_address, email: '[email protected]') }
let(:express) do
- create(:shipping_method, name: 'Express').tap do |method|
+ create(:delivery_method, name: 'Express').tap do |method|
method.calculator.preferred_amount = 15
method.calculator.save
end
diff --git a/spree/core/spec/models/spree/classification_spec.rb b/spree/core/spec/models/spree/classification_spec.rb
index 9fd368f230..a9aca6faaf 100644
--- a/spree/core/spec/models/spree/classification_spec.rb
+++ b/spree/core/spec/models/spree/classification_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe Classification, type: :model do
+ describe ProductCategory, type: :model do
let(:store) { @default_store }
# Regression test for #3494
@@ -97,7 +97,7 @@ module Spree
# The direct category-side classification_count was dropped in 6.0; the category
# now tracks membership via the descendant-inclusive products_count, kept in
- # sync by the Classification create/destroy callbacks (a leaf category's
+ # sync by the ProductCategory create/destroy callbacks (a leaf category's
# products_count equals its direct count).
describe 'products_count on category' do
it 'increments when a classification is created' do
diff --git a/spree/core/spec/models/spree/concerns/user_methods_spec.rb b/spree/core/spec/models/spree/concerns/user_methods_spec.rb
index 42896f7ed3..10a0b3b311 100644
--- a/spree/core/spec/models/spree/concerns/user_methods_spec.rb
+++ b/spree/core/spec/models/spree/concerns/user_methods_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::UserMethods do
+describe Spree::CustomerMethods do
let(:test_user) { create :user }
let!(:another_user) { create(:user) }
let(:current_store) { @default_store }
diff --git a/spree/core/spec/models/spree/delivery_method_rule_spec.rb b/spree/core/spec/models/spree/delivery_method_rule_spec.rb
index 74b2b16fc4..b2b032a95c 100644
--- a/spree/core/spec/models/spree/delivery_method_rule_spec.rb
+++ b/spree/core/spec/models/spree/delivery_method_rule_spec.rb
@@ -74,7 +74,7 @@ describe Spree::DeliveryMethodRule, type: :model do
cart = create(:cart, store: store, channel: channel)
line_item = create(:line_item, cart: cart, order: nil)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
expect(rule.eligible?(fulfillment.to_package)).to be(true)
end
@@ -174,7 +174,7 @@ describe Spree::DeliveryMethodRule, type: :model do
create(:company_membership, company: company, customer: customer)
cart = create(:cart, store: store, user: customer, company: company)
create(:line_item, cart: cart, order: nil)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
fulfillment.to_package
end
diff --git a/spree/core/spec/models/spree/delivery_method_spec.rb b/spree/core/spec/models/spree/delivery_method_spec.rb
index 7c378f5fc6..a9c3cd65bb 100644
--- a/spree/core/spec/models/spree/delivery_method_spec.rb
+++ b/spree/core/spec/models/spree/delivery_method_spec.rb
@@ -156,7 +156,7 @@ describe Spree::DeliveryMethod, type: :model do
context '#shipments' do
let!(:delivery_method) { create(:delivery_method) }
let!(:shipment) do
- shipment = create(:shipment)
+ shipment = create(:fulfillment)
shipment.shipping_rates.create!(delivery_method: delivery_method)
shipment
end
diff --git a/spree/core/spec/models/spree/delivery_rate_spec.rb b/spree/core/spec/models/spree/delivery_rate_spec.rb
index 01464db265..65abd498b5 100644
--- a/spree/core/spec/models/spree/delivery_rate_spec.rb
+++ b/spree/core/spec/models/spree/delivery_rate_spec.rb
@@ -15,7 +15,7 @@ describe Spree::DeliveryRate, type: :model do
expect(rate.name).to eq(delivery_method.name)
end
end
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
let(:delivery_method) { create(:delivery_method) }
let(:shipping_rate) do
Spree::DeliveryRate.new shipment: shipment,
@@ -102,7 +102,7 @@ describe Spree::DeliveryRate, type: :model do
end
context 'when the currency is JPY' do
- let(:shipping_rate) { Spree::ShippingRate.new(cost: 205) }
+ let(:shipping_rate) { Spree::DeliveryRate.new(cost: 205) }
before { allow(shipping_rate).to receive_messages(currency: 'JPY') }
@@ -231,18 +231,18 @@ describe Spree::DeliveryRate, type: :model do
end
it 'returns 0 if cost is lesser than the discount amount' do
- allow_any_instance_of(Spree::ShippingRate).to receive_messages(discount_amount: -20.0)
+ allow_any_instance_of(Spree::DeliveryRate).to receive_messages(discount_amount: -20.0)
expect(shipping_rate.final_price).to eq(0.0)
end
it 'returns cost minus discount amount' do
- allow_any_instance_of(Spree::ShippingRate).to receive_messages(discount_amount: -5.0)
+ allow_any_instance_of(Spree::DeliveryRate).to receive_messages(discount_amount: -5.0)
expect(shipping_rate.final_price).to eq(5.0)
end
it 'does not return 0 when shipment is free because of selected shipping rate' do
shipment.shipping_rates.update_all(selected: false)
- create(:shipping_rate, shipment: shipment, cost: 0, selected: true)
+ create(:delivery_rate, shipment: shipment, cost: 0, selected: true)
shipment.reload.update_amounts
expect(shipment.free?).to eq(true)
@@ -270,13 +270,13 @@ describe Spree::DeliveryRate, type: :model do
subject { shipping_rate.free? }
context 'when the shipping rate cost is 0' do
- let(:shipping_rate) { create(:shipping_rate, cost: 0) }
+ let(:shipping_rate) { create(:delivery_rate, cost: 0) }
it { is_expected.to be(true) }
end
context 'when the shipping rate cost is not 0' do
- let(:shipping_rate) { create(:shipping_rate, cost: 10) }
+ let(:shipping_rate) { create(:delivery_rate, cost: 10) }
let(:shipment) { shipping_rate.shipment }
let(:order) { shipment.order }
diff --git a/spree/core/spec/models/spree/freight_summary_spec.rb b/spree/core/spec/models/spree/freight_summary_spec.rb
index 4c93ff4e5f..fbb4dbcba0 100644
--- a/spree/core/spec/models/spree/freight_summary_spec.rb
+++ b/spree/core/spec/models/spree/freight_summary_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Spree::FreightSummary do
def summary_for(pairs)
contents = pairs.map do |variant, quantity|
- Spree::Stock::ContentItem.new(build(:inventory_unit, variant: variant, quantity: quantity))
+ Spree::Stock::ContentItem.new(build(:fulfillment_item, variant: variant, quantity: quantity))
end
described_class.build(contents)
diff --git a/spree/core/spec/models/spree/fulfillment/custom_events_spec.rb b/spree/core/spec/models/spree/fulfillment/custom_events_spec.rb
index 08887d5530..6ede827187 100644
--- a/spree/core/spec/models/spree/fulfillment/custom_events_spec.rb
+++ b/spree/core/spec/models/spree/fulfillment/custom_events_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Spree::Fulfillment::CustomEvents do
end
it 'does not publish order.fulfilled when other fulfillments are open' do
- create(:shipment, order: order, state: 'unfulfilled')
+ create(:fulfillment, order: order, state: 'unfulfilled')
order.reload
Spree.fulfillment_fulfill_workflow.call(fulfillment: fulfillment)
diff --git a/spree/core/spec/models/spree/fulfilment_changer_spec.rb b/spree/core/spec/models/spree/fulfilment_changer_spec.rb
index a6edab9f9c..a79fe40c73 100644
--- a/spree/core/spec/models/spree/fulfilment_changer_spec.rb
+++ b/spree/core/spec/models/spree/fulfilment_changer_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::FulfilmentChanger do
+describe Spree::FulfillmentChanger do
subject { shipment_splitter.run! }
let(:variant) { create(:variant) }
@@ -386,7 +386,7 @@ describe Spree::FulfilmentChanger do
end
it 'removes the current shipment' do
- expect { subject }.to change { Spree::Shipment.count }.by(-1)
+ expect { subject }.to change { Spree::Fulfillment.count }.by(-1)
end
end
@@ -397,13 +397,13 @@ describe Spree::FulfilmentChanger do
let(:desired_shipment) { order.shipments.build(stock_location: current_shipment.stock_location) }
it 'adds the desired inventory units to the desired shipment' do
- expect { subject }.to change { Spree::Shipment.count }.by(1)
+ expect { subject }.to change { Spree::Fulfillment.count }.by(1)
end
it 'updates desired shipment cost after selecting the shipping rate' do
- Spree::ShippingMethod.delete_all
+ Spree::DeliveryMethod.delete_all
calculator = Spree::Calculator::Shipping::FlatRate.create!(preferred_amount: 10)
- shipping_method_that_should_be_selected = create(:shipping_method, calculator: calculator)
+ shipping_method_that_should_be_selected = create(:delivery_method, calculator: calculator)
subject
diff --git a/spree/core/spec/models/spree/has_library_media_spec.rb b/spree/core/spec/models/spree/has_library_media_spec.rb
index 279eb72f4d..01847fadd4 100644
--- a/spree/core/spec/models/spree/has_library_media_spec.rb
+++ b/spree/core/spec/models/spree/has_library_media_spec.rb
@@ -67,7 +67,7 @@ RSpec.shared_examples 'library media slots' do
# A picked library file arrives as an existing blob; placing it must not
# duplicate the file in storage.
it 'shares the blob when a library file is picked into a slot' do
- library_file = create(:image, viewable: nil)
+ library_file = create(:media, viewable: nil)
expect {
record.image.attach(library_file.attachment.blob)
diff --git a/spree/core/spec/models/spree/inventory_unit_spec.rb b/spree/core/spec/models/spree/inventory_unit_spec.rb
index 9925b195c4..ec0fa899b1 100644
--- a/spree/core/spec/models/spree/inventory_unit_spec.rb
+++ b/spree/core/spec/models/spree/inventory_unit_spec.rb
@@ -1,33 +1,33 @@
require 'spec_helper'
-describe Spree::InventoryUnit, type: :model do
+describe Spree::FulfillmentItem, type: :model do
let(:stock_location) { create(:stock_location_with_items) }
let(:stock_level) { stock_location.stock_levels.order(:id).first }
describe 'scopes' do
- let!(:inventory_unit_1) { create(:inventory_unit, state: 'on_hand') }
- let!(:inventory_unit_2) { create(:inventory_unit, state: 'backordered') }
- let!(:inventory_unit_3) { create(:inventory_unit, state: 'shipped') }
- let!(:inventory_unit_4) { create(:inventory_unit, state: 'returned') }
+ let!(:inventory_unit_1) { create(:fulfillment_item, state: 'on_hand') }
+ let!(:inventory_unit_2) { create(:fulfillment_item, state: 'backordered') }
+ let!(:inventory_unit_3) { create(:fulfillment_item, state: 'shipped') }
+ let!(:inventory_unit_4) { create(:fulfillment_item, state: 'returned') }
describe '.backordered' do
- it { expect(Spree::InventoryUnit.backordered).to eq([inventory_unit_2]) }
+ it { expect(Spree::FulfillmentItem.backordered).to eq([inventory_unit_2]) }
end
describe '.on_hand' do
- it { expect(Spree::InventoryUnit.on_hand).to eq([inventory_unit_1]) }
+ it { expect(Spree::FulfillmentItem.on_hand).to eq([inventory_unit_1]) }
end
describe '.on_hand_or_backordered' do
- it { expect(Spree::InventoryUnit.on_hand_or_backordered).to match_array([inventory_unit_1, inventory_unit_2]) }
+ it { expect(Spree::FulfillmentItem.on_hand_or_backordered).to match_array([inventory_unit_1, inventory_unit_2]) }
end
describe '.shipped' do
- it { expect(Spree::InventoryUnit.shipped).to eq([inventory_unit_3]) }
+ it { expect(Spree::FulfillmentItem.shipped).to eq([inventory_unit_3]) }
end
describe '.returned' do
- it { expect(Spree::InventoryUnit.returned).to eq([inventory_unit_4]) }
+ it { expect(Spree::FulfillmentItem.returned).to eq([inventory_unit_4]) }
end
end
@@ -35,7 +35,7 @@ describe Spree::InventoryUnit, type: :model do
let(:order) do
order = create(:order, state: 'complete', ship_address: create(:ship_address))
order.completed_at = Time.current
- create(:shipment, order: order, stock_location: stock_location)
+ create(:fulfillment, order: order, stock_location: stock_location)
order.shipments.reload
create(:line_item, order: order, variant: stock_level.variant)
order.line_items.reload
@@ -64,12 +64,12 @@ describe Spree::InventoryUnit, type: :model do
# Regression for #3066
it 'returns modifiable objects' do
- units = Spree::InventoryUnit.backordered_for_stock_level(stock_level)
+ units = Spree::FulfillmentItem.backordered_for_stock_level(stock_level)
expect { units.first.save! }.not_to raise_error
end
it "finds inventory units from its stock location when the unit's variant matches the stock item's variant" do
- expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).to match_array([unit])
+ expect(Spree::FulfillmentItem.backordered_for_stock_level(stock_level)).to match_array([unit])
end
it "does not find inventory units that aren't backordered" do
@@ -79,7 +79,7 @@ describe Spree::InventoryUnit, type: :model do
on_hand_unit.line_item = order.line_items.first
on_hand_unit.save!
- expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).not_to include(on_hand_unit)
+ expect(Spree::FulfillmentItem.backordered_for_stock_level(stock_level)).not_to include(on_hand_unit)
end
it "does not find inventory units that don't match the stock item's variant" do
@@ -89,7 +89,7 @@ describe Spree::InventoryUnit, type: :model do
other_variant_unit.line_item = order.line_items.first
other_variant_unit.save!
- expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).not_to include(other_variant_unit)
+ expect(Spree::FulfillmentItem.backordered_for_stock_level(stock_level)).not_to include(other_variant_unit)
end
it 'does not change shipping cost when fulfilling the order' do
@@ -109,9 +109,9 @@ describe Spree::InventoryUnit, type: :model do
end
let(:other_shipment) do
- shipment = Spree::Shipment.new
+ shipment = Spree::Fulfillment.new
shipment.stock_location = stock_location
- shipment.shipping_methods << create(:shipping_method)
+ shipment.shipping_methods << create(:delivery_method)
shipment.order = other_order
# We don't care about this in this test
allow(shipment).to receive(:ensure_correct_adjustment)
@@ -128,7 +128,7 @@ describe Spree::InventoryUnit, type: :model do
end
it 'does not find inventory units belonging to incomplete orders' do
- expect(Spree::InventoryUnit.backordered_for_stock_level(stock_level)).not_to include(other_unit)
+ expect(Spree::FulfillmentItem.backordered_for_stock_level(stock_level)).not_to include(other_unit)
end
end
end
@@ -136,11 +136,11 @@ describe Spree::InventoryUnit, type: :model do
describe '#finalize_units!' do
let!(:stock_location) { create(:stock_location) }
let(:variant) { create(:variant) }
- let (:shipment) { create(:shipment) }
+ let (:shipment) { create(:fulfillment) }
let(:inventory_units) do
[
- create(:inventory_unit, variant: variant),
- create(:inventory_unit, variant: variant)
+ create(:fulfillment_item, variant: variant),
+ create(:fulfillment_item, variant: variant)
]
end
@@ -156,7 +156,7 @@ describe Spree::InventoryUnit, type: :model do
describe '#additional_tax_total' do
subject do
- build(:inventory_unit, line_item: line_item)
+ build(:fulfillment_item, line_item: line_item)
end
let(:quantity) { 2 }
@@ -173,7 +173,7 @@ describe Spree::InventoryUnit, type: :model do
describe '#included_tax_total' do
subject do
- build(:inventory_unit, line_item: line_item)
+ build(:fulfillment_item, line_item: line_item)
end
let(:quantity) { 2 }
@@ -190,7 +190,7 @@ describe Spree::InventoryUnit, type: :model do
describe '#additional_tax_total' do
subject do
- build(:inventory_unit, line_item: line_item)
+ build(:fulfillment_item, line_item: line_item)
end
let(:quantity) { 2 }
@@ -207,7 +207,7 @@ describe Spree::InventoryUnit, type: :model do
describe '#included_tax_total' do
subject do
- build(:inventory_unit, line_item: line_item)
+ build(:fulfillment_item, line_item: line_item)
end
let(:quantity) { 2 }
@@ -223,7 +223,7 @@ describe Spree::InventoryUnit, type: :model do
end
describe '#charged_amount' do
- subject { build(:inventory_unit, line_item: line_item, quantity: 1) }
+ subject { build(:fulfillment_item, line_item: line_item, quantity: 1) }
let(:quantity) { 2 }
let(:line_item_pre_tax_amount) { 10.00 }
diff --git a/spree/core/spec/models/spree/line_item_spec.rb b/spree/core/spec/models/spree/line_item_spec.rb
index ba82095a7d..24d15dfaaa 100644
--- a/spree/core/spec/models/spree/line_item_spec.rb
+++ b/spree/core/spec/models/spree/line_item_spec.rb
@@ -258,7 +258,7 @@ describe Spree::LineItem, type: :model do
context 'target_fulfillment is provided' do
it 'verifies inventory' do
- line_item.target_fulfillment = Spree::Shipment.new
+ line_item.target_fulfillment = Spree::Fulfillment.new
expect_any_instance_of(Spree::OrderInventory).to receive(:verify)
line_item.save
end
@@ -591,8 +591,8 @@ describe Spree::LineItem, type: :model do
describe '#shipments' do
let(:line_item) { create(:line_item) }
- let(:inventory_unit) { create(:inventory_unit, line_item: line_item) }
- let!(:shipment) { create(:shipment, inventory_units: [inventory_unit]) }
+ let(:inventory_unit) { create(:fulfillment_item, line_item: line_item) }
+ let!(:shipment) { create(:fulfillment, inventory_units: [inventory_unit]) }
it 'returns the shipments for the line item' do
expect(line_item.shipments).to eq([shipment])
@@ -601,8 +601,8 @@ describe Spree::LineItem, type: :model do
describe '#delivery_cost' do
let(:line_item) { create(:line_item) }
- let(:inventory_unit) { create(:inventory_unit, line_item: line_item) }
- let(:shipment) { create(:shipment, inventory_units: [inventory_unit], cost: 10) }
+ let(:inventory_unit) { create(:fulfillment_item, line_item: line_item) }
+ let(:shipment) { create(:fulfillment, inventory_units: [inventory_unit], cost: 10) }
it 'returns the shipping cost for the line item' do
shipment
@@ -633,7 +633,7 @@ describe Spree::LineItem, type: :model do
let(:line_item) { create(:line_item, quantity: 2) }
it 'counts that fulfillment once, not once per unit' do
- second_unit = create(:inventory_unit, line_item: line_item, variant: inventory_unit.variant)
+ second_unit = create(:fulfillment_item, line_item: line_item, variant: inventory_unit.variant)
shipment.fulfillment_items << second_unit
expect(line_item.reload.delivery_cost).to eq(10)
@@ -648,8 +648,8 @@ describe Spree::LineItem, type: :model do
it 'still charges the active fulfillment' do
shipment.update_columns(cost: 10, status: 'canceled')
- active = create(:shipment, cost: 10, order: shipment.order, stock_location: shipment.stock_location)
- active.fulfillment_items << create(:inventory_unit, line_item: line_item, variant: inventory_unit.variant)
+ active = create(:fulfillment, cost: 10, order: shipment.order, stock_location: shipment.stock_location)
+ active.fulfillment_items << create(:fulfillment_item, line_item: line_item, variant: inventory_unit.variant)
line_item.reload
expect(line_item.fulfillments.first).to eq(shipment)
diff --git a/spree/core/spec/models/spree/market_country_spec.rb b/spree/core/spec/models/spree/market_country_spec.rb
index 9199499f2f..cdeafcdd8e 100644
--- a/spree/core/spec/models/spree/market_country_spec.rb
+++ b/spree/core/spec/models/spree/market_country_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Spree::MarketCountry, type: :model do
before do
zone.members.create!(member_type: 'country', country_code: country.iso)
- create(:shipping_method, delivery_zone: zone)
+ create(:delivery_method, delivery_zone: zone)
end
it 'is valid' do
@@ -65,7 +65,7 @@ RSpec.describe Spree::MarketCountry, type: :model do
before do
zone.members.create!(member_type: 'state', country_code: state.country_code, state_code: state.abbr)
- create(:shipping_method, delivery_zone: zone)
+ create(:delivery_method, delivery_zone: zone)
end
it 'is valid' do
diff --git a/spree/core/spec/models/spree/media_counters_spec.rb b/spree/core/spec/models/spree/media_counters_spec.rb
index dc27398d2c..bca630b398 100644
--- a/spree/core/spec/models/spree/media_counters_spec.rb
+++ b/spree/core/spec/models/spree/media_counters_spec.rb
@@ -28,8 +28,8 @@ describe Spree::Media, type: :model do
end
context 'cache expiration' do
- let!(:image) { create(:image, position: 1, viewable: viewable) }
- let!(:image_2) { create(:image, position: 2, viewable: viewable) }
+ let!(:image) { create(:media, position: 1, viewable: viewable) }
+ let!(:image_2) { create(:media, position: 2, viewable: viewable) }
describe 'update position' do
let(:product) { create(:product) }
@@ -60,18 +60,18 @@ describe Spree::Media, type: :model do
let(:variant) { create(:variant) }
it 'increments media_count when image is created' do
- expect { create(:image, viewable: variant) }.to change { variant.reload.media_count }.by(1)
+ expect { create(:media, viewable: variant) }.to change { variant.reload.media_count }.by(1)
end
it 'decrements media_count when image is destroyed' do
- image = create(:image, viewable: variant)
+ image = create(:media, viewable: variant)
expect { image.destroy }.to change { variant.reload.media_count }.by(-1)
end
it 'tracks multiple images correctly' do
expect(variant.media_count).to eq(0)
- create(:image, viewable: variant)
- create(:image, viewable: variant)
+ create(:media, viewable: variant)
+ create(:media, viewable: variant)
expect(variant.reload.media_count).to eq(2)
end
end
@@ -81,23 +81,23 @@ describe Spree::Media, type: :model do
let(:variant) { create(:variant, product: product) }
it 'increments media_count when image is created on the default variant' do
- expect { create(:image, viewable: product.default_variant) }.to change { product.reload.media_count }.by(1)
+ expect { create(:media, viewable: product.default_variant) }.to change { product.reload.media_count }.by(1)
end
it 'increments media_count when image is created on variant' do
- expect { create(:image, viewable: variant) }.to change { product.reload.media_count }.by(1)
+ expect { create(:media, viewable: variant) }.to change { product.reload.media_count }.by(1)
end
it 'decrements media_count when image is destroyed' do
- image = create(:image, viewable: variant)
+ image = create(:media, viewable: variant)
expect { image.destroy }.to change { product.reload.media_count }.by(-1)
end
it 'tracks media across all variants correctly' do
expect(product.media_count).to eq(0)
- create(:image, viewable: product.default_variant)
- create(:image, viewable: variant)
- create(:image, viewable: variant)
+ create(:media, viewable: product.default_variant)
+ create(:media, viewable: variant)
+ create(:media, viewable: variant)
expect(product.reload.media_count).to eq(3)
end
end
@@ -106,8 +106,8 @@ describe Spree::Media, type: :model do
let(:product) { create(:product) }
it 'skips a leading video that has no still' do
- video = create(:video_asset, viewable: product, position: 1)
- image = create(:image, viewable: product, position: 2)
+ video = create(:video_media, viewable: product, position: 1)
+ image = create(:media, viewable: product, position: 2)
product.update_thumbnail!
@@ -116,7 +116,7 @@ describe Spree::Media, type: :model do
end
it 'leaves no thumbnail when every row is a video without a still' do
- create(:video_asset, viewable: product, position: 1)
+ create(:video_media, viewable: product, position: 1)
product.update_thumbnail!
@@ -126,7 +126,7 @@ describe Spree::Media, type: :model do
it 'leaves a variant without a thumbnail on the same terms' do
variant = create(:variant, product: product)
- create(:video_asset, viewable: variant, position: 1)
+ create(:video_media, viewable: variant, position: 1)
variant.update_thumbnail!
@@ -134,8 +134,8 @@ describe Spree::Media, type: :model do
end
it 'uses a leading video once it has a still' do
- video = create(:external_video_asset, viewable: product, position: 1)
- create(:image, viewable: product, position: 2)
+ video = create(:external_video_media, viewable: product, position: 1)
+ create(:media, viewable: product, position: 2)
product.update_thumbnail!
@@ -149,7 +149,7 @@ describe Spree::Media, type: :model do
let(:other_product) { create(:product) }
it 'clears the old owner thumbnail, which still pointed at the moved row' do
- media = create(:image, viewable: product)
+ media = create(:media, viewable: product)
expect(product.reload.primary_media_id).to eq(media.id)
media.update!(viewable: other_product)
@@ -160,7 +160,7 @@ describe Spree::Media, type: :model do
it 'treats a type-only change as a move' do
variant = create(:variant, product: product)
- media = create(:image, viewable: variant)
+ media = create(:media, viewable: variant)
# Same numeric id on both sides, so only viewable_type changes. Watching
# viewable_id alone would sit this move out and leave both owners wrong.
@@ -173,7 +173,7 @@ describe Spree::Media, type: :model do
end
it 'moves the count from the old owner to the new one' do
- media = create(:image, viewable: product)
+ media = create(:media, viewable: product)
expect(product.reload.media_count).to eq(1)
media.update!(viewable: other_product)
@@ -189,19 +189,19 @@ describe Spree::Media, type: :model do
it 'sets variant primary_media_id when first image is created' do
expect(variant.primary_media_id).to be_nil
- image = create(:image, viewable: variant)
+ image = create(:media, viewable: variant)
expect(variant.reload.primary_media_id).to eq(image.id)
end
it 'sets product primary_media_id when first image is created' do
expect(product.primary_media_id).to be_nil
- image = create(:image, viewable: variant)
+ image = create(:media, viewable: variant)
expect(product.reload.primary_media_id).to eq(image.id)
end
it 'updates primary_media_id when first image is destroyed' do
- image1 = create(:image, viewable: variant, position: 1)
- image2 = create(:image, viewable: variant, position: 2)
+ image1 = create(:media, viewable: variant, position: 1)
+ image2 = create(:media, viewable: variant, position: 2)
expect(variant.reload.primary_media_id).to eq(image1.id)
image1.destroy
@@ -209,7 +209,7 @@ describe Spree::Media, type: :model do
end
it 'sets primary_media_id to nil when last image is destroyed' do
- image = create(:image, viewable: variant)
+ image = create(:media, viewable: variant)
expect(variant.reload.primary_media_id).to eq(image.id)
image.destroy
@@ -217,8 +217,8 @@ describe Spree::Media, type: :model do
end
it 'updates primary_media_id when image position changes' do
- image1 = create(:image, viewable: variant, position: 1)
- image2 = create(:image, viewable: variant, position: 2)
+ image1 = create(:media, viewable: variant, position: 1)
+ image2 = create(:media, viewable: variant, position: 2)
expect(variant.reload.primary_media_id).to eq(image1.id)
image2.update!(position: 0)
diff --git a/spree/core/spec/models/spree/media_spec.rb b/spree/core/spec/models/spree/media_spec.rb
index 8b1d036e58..18f3605cfb 100644
--- a/spree/core/spec/models/spree/media_spec.rb
+++ b/spree/core/spec/models/spree/media_spec.rb
@@ -43,14 +43,14 @@ describe Spree::Media, type: :model do
describe 'store' do
it 'follows the product it is placed on' do
product = create(:product)
- media = create(:image, viewable: product)
+ media = create(:media, viewable: product)
expect(media.store).to eq(product.store)
end
it 'follows the variant product for a variant-pinned row' do
variant = create(:variant)
- media = create(:asset, viewable: variant)
+ media = create(:media, viewable: variant)
expect(media.store).to eq(variant.product.store)
end
@@ -58,14 +58,14 @@ describe Spree::Media, type: :model do
# A library upload has no viewable to follow, so it belongs to the store
# whose dashboard uploaded it.
it 'falls back to the current store when unplaced' do
- media = create(:image, viewable: nil)
+ media = create(:media, viewable: nil)
expect(media.viewable).to be_nil
expect(media.store).to eq(Spree::Store.default)
end
it 'is required' do
- media = build(:image, viewable: nil)
+ media = build(:media, viewable: nil)
media.store = nil
allow(Spree::Current).to receive(:store).and_return(nil)
@@ -76,7 +76,7 @@ describe Spree::Media, type: :model do
describe 'viewable types' do
def media_on(type)
- build(:image, viewable: nil).tap do |media|
+ build(:media, viewable: nil).tap do |media|
media.viewable_type = type
media.viewable_id = 1
end
@@ -108,7 +108,7 @@ describe Spree::Media, type: :model do
# Between db:migrate and spree:upgrade:backfill_media_store_ids every
# existing row carries nil. Editing one must not fail validation.
it 'adopts a store on its next save' do
- media = create(:image, viewable: create(:product))
+ media = create(:media, viewable: create(:product))
described_class.unscoped.where(id: media.id).update_all(store_id: nil)
legacy = described_class.find(media.id)
@@ -119,7 +119,7 @@ describe Spree::Media, type: :model do
end
it 'still refuses moving a row between stores' do
- media = create(:image, viewable: create(:product))
+ media = create(:media, viewable: create(:product))
media.store = create(:store)
expect(media.save).to be(false)
@@ -128,8 +128,8 @@ describe Spree::Media, type: :model do
end
describe 'library scopes' do
- let!(:placed) { create(:image, viewable: create(:product)) }
- let!(:unplaced) { create(:image, viewable: nil) }
+ let!(:placed) { create(:media, viewable: create(:product)) }
+ let!(:unplaced) { create(:media, viewable: nil) }
it 'separates placed rows from library uploads' do
expect(described_class.attached).to include(placed)
@@ -140,7 +140,7 @@ describe Spree::Media, type: :model do
end
describe '.distinct_by_file' do
- let(:source) { create(:image, viewable: create(:product)) }
+ let(:source) { create(:media, viewable: create(:product)) }
it 'keeps one row per shared file' do
copy = source.duplicate_for(create(:product))
@@ -152,7 +152,7 @@ describe Spree::Media, type: :model do
end
it 'keeps rows whose files differ' do
- other = create(:image, viewable: create(:product))
+ other = create(:media, viewable: create(:product))
result = described_class.distinct_by_file.where(id: [source.id, other.id])
@@ -178,7 +178,7 @@ describe Spree::Media, type: :model do
end
describe '#duplicate_for' do
- let(:source) { create(:image, viewable: create(:product), alt: 'Front view') }
+ let(:source) { create(:media, viewable: create(:product), alt: 'Front view') }
let(:target) { create(:product) }
# The whole point of the design: placing a file elsewhere costs a row, not
@@ -263,19 +263,19 @@ describe Spree::Media, type: :model do
describe '#product' do
it 'returns the product when viewable is a Variant' do
variant = create(:variant)
- asset = create(:asset, viewable: variant)
+ asset = create(:media, viewable: variant)
expect(asset.product).to eq(variant.product)
end
it 'returns the product when viewable is a Product' do
product = create(:product)
- asset = create(:image, viewable: product)
+ asset = create(:media, viewable: product)
expect(asset.product).to eq(product)
end
end
describe '#focal_point' do
- let(:asset) { build(:asset, focal_point_x: 0.5, focal_point_y: 0.3) }
+ let(:asset) { build(:media, focal_point_x: 0.5, focal_point_y: 0.3) }
it 'returns hash with x and y' do
expect(asset.focal_point).to eq({ x: 0.5, y: 0.3 })
@@ -288,7 +288,7 @@ describe Spree::Media, type: :model do
end
describe '#focal_point=' do
- let(:asset) { build(:asset) }
+ let(:asset) { build(:media) }
it 'sets x and y from hash' do
asset.focal_point = { x: 0.25, y: 0.75 }
@@ -307,14 +307,14 @@ describe Spree::Media, type: :model do
describe 'media_type' do
it 'accepts valid media types' do
%w[image video external_video].each do |type|
- asset = build(:asset, media_type: type)
+ asset = build(:media, media_type: type)
asset.valid?
expect(asset.errors[:media_type]).to be_empty
end
end
it 'rejects invalid media types' do
- asset = build(:asset, media_type: 'audio')
+ asset = build(:media, media_type: 'audio')
expect(asset).not_to be_valid
expect(asset.errors[:media_type]).to be_present
end
@@ -330,19 +330,19 @@ describe Spree::Media, type: :model do
end
it 'answers a predicate per media type' do
- expect(build(:asset)).to be_image
- expect(build(:video_asset)).to be_video
- expect(build(:external_video_asset)).to be_external_video
+ expect(build(:media)).to be_image
+ expect(build(:video_media)).to be_video
+ expect(build(:external_video_media)).to be_external_video
end
end
describe 'video' do
it 'accepts an uploaded video file' do
- expect(build(:video_asset)).to be_valid
+ expect(build(:video_media)).to be_valid
end
it 'requires a file, not a URL' do
- asset = build(:asset, media_type: 'video')
+ asset = build(:media, media_type: 'video')
asset.attachment.detach
expect(asset).not_to be_valid
@@ -350,7 +350,7 @@ describe Spree::Media, type: :model do
end
it 'rejects a file type browsers cannot play' do
- asset = build(:asset, media_type: 'video')
+ asset = build(:media, media_type: 'video')
asset.attachment.attach(
io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'text-file.txt'),
filename: 'text-file.txt',
@@ -362,57 +362,57 @@ describe Spree::Media, type: :model do
end
it 'reports as playable' do
- expect(build(:video_asset).playable_video?).to be(true)
- expect(build(:external_video_asset).playable_video?).to be(true)
- expect(build(:asset).playable_video?).to be(false)
+ expect(build(:video_media).playable_video?).to be(true)
+ expect(build(:external_video_media).playable_video?).to be(true)
+ expect(build(:media).playable_video?).to be(false)
end
end
describe 'external video' do
it 'accepts a YouTube link' do
- expect(build(:external_video_asset)).to be_valid
+ expect(build(:external_video_media)).to be_valid
end
it 'accepts a Vimeo link' do
- expect(build(:external_video_asset, external_video_url: 'https://vimeo.com/123456789')).to be_valid
+ expect(build(:external_video_media, external_video_url: 'https://vimeo.com/123456789')).to be_valid
end
it 'requires a URL' do
- asset = build(:external_video_asset, external_video_url: nil)
+ asset = build(:external_video_media, external_video_url: nil)
expect(asset).not_to be_valid
expect(asset.errors[:external_video_url]).to be_present
end
it 'rejects a link Spree cannot embed' do
- asset = build(:external_video_asset, external_video_url: 'https://example.com/clip.mp4')
+ asset = build(:external_video_media, external_video_url: 'https://example.com/clip.mp4')
expect(asset).not_to be_valid
expect(asset.errors[:external_video_url]).to include('must be a YouTube or Vimeo link')
end
it 'needs no attachment' do
- asset = build(:external_video_asset)
+ asset = build(:external_video_media)
expect(asset.attachment).not_to be_attached
expect(asset).to be_valid
end
it 'exposes the parsed video' do
- asset = build(:external_video_asset)
+ asset = build(:external_video_media)
expect(asset.external_video.provider).to eq('youtube')
expect(asset.external_video.embed_url).to eq('https://www.youtube.com/embed/dQw4w9WgXcQ')
end
it 'strips whitespace around the URL' do
- asset = build(:external_video_asset, external_video_url: ' https://vimeo.com/123456789 ')
+ asset = build(:external_video_media, external_video_url: ' https://vimeo.com/123456789 ')
expect(asset.external_video_url).to eq('https://vimeo.com/123456789')
end
it 're-parses after the URL changes' do
- asset = build(:external_video_asset)
+ asset = build(:external_video_media)
expect(asset.external_video.provider).to eq('youtube')
asset.external_video_url = 'https://vimeo.com/123456789'
@@ -424,7 +424,7 @@ describe Spree::Media, type: :model do
io: File.open(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'),
filename: 'poster.jpg', content_type: 'image/jpeg'
)
- asset = build(:external_video_asset, external_video_url: 'https://example.com/nope')
+ asset = build(:external_video_media, external_video_url: 'https://example.com/nope')
asset.poster_signed_id = poster.signed_id
# The record is invalid, so nothing should reach storage.
@@ -437,7 +437,7 @@ describe Spree::Media, type: :model do
io: File.open(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'),
filename: 'poster.jpg', content_type: 'image/jpeg'
)
- asset = create(:external_video_asset)
+ asset = create(:external_video_media)
asset.update!(poster_signed_id: poster.signed_id)
expect(asset.reload.poster).to be_attached
@@ -447,7 +447,7 @@ describe Spree::Media, type: :model do
end
it 'rejects a signed id it cannot resolve' do
- asset = build(:external_video_asset, poster_signed_id: 'not-a-real-signed-id')
+ asset = build(:external_video_media, poster_signed_id: 'not-a-real-signed-id')
# A tampered id raises inside attach, which would be a 500 after the row
# was already written — it has to fail as a validation instead.
@@ -456,7 +456,7 @@ describe Spree::Media, type: :model do
end
it 'rejects a poster that is not a web image' do
- asset = build(:external_video_asset)
+ asset = build(:external_video_media)
asset.poster.attach(
io: File.open(Spree::Core::Engine.root + 'spec/fixtures' + 'text-file.txt'),
filename: 'notes.txt', content_type: 'text/plain'
@@ -467,7 +467,7 @@ describe Spree::Media, type: :model do
end
it 'falls back to the provider thumbnail when no poster was uploaded' do
- video = build(:external_video_asset)
+ video = build(:external_video_media)
expect(video.still_image).to be_nil
expect(video.provider_still_url).to eq('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg')
@@ -478,12 +478,12 @@ describe Spree::Media, type: :model do
let(:product) { create(:product) }
it 'increments media_count on product when image is created' do
- expect { create(:image, viewable: product) }
+ expect { create(:media, viewable: product) }
.to change { product.reload.media_count }.by(1)
end
it 'decrements media_count on product when image is destroyed' do
- image = create(:image, viewable: product)
+ image = create(:media, viewable: product)
expect { image.destroy }.to change { product.reload.media_count }.by(-1)
end
end
@@ -492,12 +492,12 @@ describe Spree::Media, type: :model do
let(:product) { create(:product) }
it 'sets product primary_media_id when image is created' do
- image = create(:image, viewable: product)
+ image = create(:media, viewable: product)
expect(product.reload.primary_media_id).to eq(image.id)
end
it 'clears product primary_media_id when image is destroyed' do
- image = create(:image, viewable: product)
+ image = create(:media, viewable: product)
image.destroy
expect(product.reload.primary_media_id).to be_nil
end
@@ -509,14 +509,14 @@ describe Spree::Media, type: :model do
describe 'orphan asset (viewable_type set, viewable_id nil)' do
it 'creates and destroys without raising' do
asset = nil
- expect { asset = create(:image, viewable_type: 'Spree::Product', viewable_id: nil) }.not_to raise_error
+ expect { asset = create(:media, viewable_type: 'Spree::Product', viewable_id: nil) }.not_to raise_error
expect(asset.viewable).to be_nil
expect { asset.destroy! }.not_to raise_error
end
end
describe 'delegated methods' do
- let(:asset) { create(:image) }
+ let(:asset) { create(:media) }
let(:attachment) { asset.attachment }
before do
@@ -557,8 +557,8 @@ describe Spree::Media, type: :model do
describe '.with_session_uploaded_assets_uuid' do
subject { described_class.with_session_uploaded_assets_uuid(uuid) }
- let!(:assets) { create_list(:asset, 2, session_id: uuid) }
- let!(:other_assets) { create_list(:asset, 2, session_id: SecureRandom.uuid) }
+ let!(:assets) { create_list(:media, 2, session_id: uuid) }
+ let!(:other_assets) { create_list(:media, 2, session_id: SecureRandom.uuid) }
let(:uuid) { SecureRandom.uuid }
@@ -574,7 +574,7 @@ describe Spree::Media, type: :model do
describe '.with_external_url' do
it 'returns assets with the given external URL' do
- asset = create(:asset)
+ asset = create(:media)
asset.set_custom_field('external.url', 'https://example.com/Example-Image-001.png')
expect(described_class.with_external_url('https://example.com/Example-Image-001.png')).to include(asset)
end
@@ -586,13 +586,13 @@ describe Spree::Media, type: :model do
describe '#external_url' do
it 'returns the external URL' do
- asset = create(:asset)
+ asset = create(:media)
asset.set_custom_field('external.url', 'https://example.com/Example-Image-001.png')
expect(asset.external_url).to eq('https://example.com/Example-Image-001.png')
end
it 'returns nil if the external URL is blank' do
- asset = create(:asset)
+ asset = create(:media)
expect(asset.external_url).to be_nil
end
@@ -611,7 +611,7 @@ describe Spree::Media, type: :model do
describe '#external_url=' do
it 'sets the external URL' do
- asset = create(:asset)
+ asset = create(:media)
asset.external_url = 'https://example.com/Example-Image-001.png'
expect(asset.external_url).to eq('https://example.com/Example-Image-001.png')
end
diff --git a/spree/core/spec/models/spree/order/adjustments_spec.rb b/spree/core/spec/models/spree/order/adjustments_spec.rb
index 8c43afa7e0..58ef3510a3 100644
--- a/spree/core/spec/models/spree/order/adjustments_spec.rb
+++ b/spree/core/spec/models/spree/order/adjustments_spec.rb
@@ -5,7 +5,7 @@ describe Spree::Order do
let!(:persisted_order) { create(:order) }
let!(:line_item) { create(:line_item) }
let!(:shipping_method) do
- sm = create(:shipping_method)
+ sm = create(:delivery_method)
sm.calculator.preferred_amount = 10
sm.save
sm
@@ -42,7 +42,7 @@ describe Spree::Order do
)
}
let!(:shipping_method) do
- sm = create(:shipping_method, tax_category: tax_category)
+ sm = create(:delivery_method, tax_category: tax_category)
sm.calculator.preferred_amount = 10
sm.save
sm
diff --git a/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb b/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb
index 7fad84c809..d66538a9e3 100644
--- a/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb
+++ b/spree/core/spec/models/spree/order/digital_auto_fulfillment_spec.rb
@@ -9,7 +9,7 @@ describe 'Digital auto-fulfillment on order completion', type: :model do
before do
# Route the fulfillment through a digital delivery method so the provider
# strategy resolves to Digital.
- digital_method = create(:digital_shipping_method)
+ digital_method = create(:digital_delivery_method)
order.fulfillments.each do |fulfillment|
rate = fulfillment.delivery_rates.create!(delivery_method: digital_method, cost: 0, selected: false)
fulfillment.delivery_rates.where.not(id: rate.id).update_all(selected: false)
diff --git a/spree/core/spec/models/spree/order/shipments_spec.rb b/spree/core/spec/models/spree/order/shipments_spec.rb
index 64cd611a57..6c2c07d44c 100644
--- a/spree/core/spec/models/spree/order/shipments_spec.rb
+++ b/spree/core/spec/models/spree/order/shipments_spec.rb
@@ -4,7 +4,7 @@ describe Spree::Order, type: :model do
let(:order) { create(:order_with_totals) }
context 'ensure shipments will be updated' do
- before { Spree::Shipment.create!(order: order, stock_location: create(:stock_location)) }
+ before { Spree::Fulfillment.create!(order: order, stock_location: create(:stock_location)) }
context "except when order is completed, that's OrderInventory job" do
it "doesn't touch anything" do
diff --git a/spree/core/spec/models/spree/order_inventory_spec.rb b/spree/core/spec/models/spree/order_inventory_spec.rb
index 509050cc7f..b646ca568d 100644
--- a/spree/core/spec/models/spree/order_inventory_spec.rb
+++ b/spree/core/spec/models/spree/order_inventory_spec.rb
@@ -179,8 +179,8 @@ describe Spree::OrderInventory, type: :model do
let!(:variant) { subject.variant }
let!(:inventory_units_for_item) do
[
- create(:inventory_unit, variant_id: variant.id, quantity: 1, state: 'shipped'),
- create(:inventory_unit, variant_id: variant.id, quantity: 1, state: 'on_hand')
+ create(:fulfillment_item, variant_id: variant.id, quantity: 1, state: 'shipped'),
+ create(:fulfillment_item, variant_id: variant.id, quantity: 1, state: 'on_hand')
]
end
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index 8708e0b449..ba99df44ae 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -199,8 +199,8 @@ describe Spree::Order, type: :model do
order.update_columns(status: 'placed', completed_at: Time.current)
order.fulfillments.delete_all
- create(:shipment, order: order, state: 'canceled')
- create(:shipment, order: order, state: 'unfulfilled')
+ create(:fulfillment, order: order, state: 'canceled')
+ create(:fulfillment, order: order, state: 'unfulfilled')
end
it 'returns true' do
@@ -222,7 +222,7 @@ describe Spree::Order, type: :model do
let(:payment_method) { double }
it 'marks the payments as void' do
- allow_any_instance_of(Spree::Shipment).to receive(:refresh_rates).and_return(true)
+ allow_any_instance_of(Spree::Fulfillment).to receive(:refresh_rates).and_return(true)
order.cancel
order.reload
@@ -829,7 +829,7 @@ describe Spree::Order, type: :model do
context 'when order has shipments and is not completed' do
let(:express) do
- create(:shipping_method, name: 'Express').tap do |method|
+ create(:delivery_method, name: 'Express').tap do |method|
method.calculator.preferred_amount = 15
method.calculator.save
end
@@ -1041,7 +1041,7 @@ describe Spree::Order, type: :model do
before do
line_item = create(:line_item, order: order, price: 10, quantity: 2)
- shipment = create(:shipment, order: order, cost: 5)
+ shipment = create(:fulfillment, order: order, cost: 5)
line_item.update(pre_tax_amount: 8.0)
shipment.update(pre_tax_amount: 4.0)
@@ -1084,7 +1084,7 @@ describe Spree::Order, type: :model do
describe '#rebuild_fulfillments!' do
context 'has unassociated inventory units' do
- let!(:inventory_unit) { create(:inventory_unit, order: subject) }
+ let!(:inventory_unit) { create(:fulfillment_item, order: subject) }
before do
inventory_unit.update_column(:shipment_id, nil)
@@ -1137,7 +1137,7 @@ describe Spree::Order, type: :model do
it 'assigns the routing strategy returned packages, mapped to shipments' do
package = instance_double(Spree::Stock::Package)
- shipment = build(:shipment)
+ shipment = build(:fulfillment)
allow(package).to receive(:to_fulfillment).and_return(shipment)
strategy = instance_double(Spree::OrderRouting::Strategy::Rules)
@@ -1266,7 +1266,7 @@ describe Spree::Order, type: :model do
describe '#fully_discounted?' do
let(:line_item) { Spree::LineItem.new(price: 10, quantity: 1) }
- let(:shipment) { Spree::Shipment.new(cost: 10) }
+ let(:shipment) { Spree::Fulfillment.new(cost: 10) }
let(:payment) { Spree::Payment.new(amount: 10) }
before do
@@ -1391,7 +1391,7 @@ describe Spree::Order, type: :model do
before { allow(order).to receive(:tax_provider).and_return(provider) }
context 'when order has shipments' do
- let!(:shipment) { create(:shipment, order: order) }
+ let!(:shipment) { create(:fulfillment, order: order) }
it 'estimates tax over the fulfillments' do
expect(provider).to receive(:estimate).with(order, [shipment], hash_including(:tax_date))
@@ -1930,9 +1930,9 @@ describe Spree::Order, type: :model do
let!(:shipments) do
create_list(
- :shipment, 2,
+ :fulfillment, 2,
order: order,
- shipping_methods: [create(:shipping_method)],
+ shipping_methods: [create(:delivery_method)],
stock_location: build(:stock_location)
)
end
@@ -2186,7 +2186,7 @@ describe Spree::Order, type: :model do
end
context 'when order has shipments with shipping rates' do
- let!(:shipping_rate) { create(:shipping_rate, shipment: shipment) }
+ let!(:shipping_rate) { create(:delivery_rate, shipment: shipment) }
it 'returns an empty array' do
expect(subject).to eq([])
@@ -2236,7 +2236,7 @@ describe Spree::Order, type: :model do
end
context 'when order has shipments with shipping rates' do
- let!(:shipping_rate) { create(:shipping_rate, shipment: shipment) }
+ let!(:shipping_rate) { create(:delivery_rate, shipment: shipment) }
it 'returns nil and does not add an error to the order' do
expect(subject).to be_nil
diff --git a/spree/core/spec/models/spree/order_updater_spec.rb b/spree/core/spec/models/spree/order_updater_spec.rb
index e883cc6aa9..f5d194e641 100644
--- a/spree/core/spec/models/spree/order_updater_spec.rb
+++ b/spree/core/spec/models/spree/order_updater_spec.rb
@@ -24,7 +24,7 @@ module Spree
end
it 'update shipment total' do
- create(:shipment, order: order, cost: 10)
+ create(:fulfillment, order: order, cost: 10)
order.reload
updater.update_shipment_total
expect(order.shipment_total).to eq(10)
@@ -275,7 +275,7 @@ module Spree
shared_context 'with original shipping method gone backend only' do
before do
order.fulfillments.first.delivery_method.update(storefront_visible: false)
- create(:shipping_method) # create a storefront-visible shipping method
+ create(:delivery_method) # create a storefront-visible shipping method
end
end
@@ -291,7 +291,7 @@ module Spree
end
describe '#update_shipments' do
- let(:shipment) { create(:shipment, order: order) }
+ let(:shipment) { create(:fulfillment, order: order) }
let(:shipments) { [shipment] }
it 'updates each shipment' do
@@ -331,7 +331,7 @@ module Spree
end
context 'incomplete order' do
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
let(:shipments) { [shipment] }
it 'doesnt update payment state' do
diff --git a/spree/core/spec/models/spree/product_spec.rb b/spree/core/spec/models/spree/product_spec.rb
index 8b868bcb82..d33d4f7838 100644
--- a/spree/core/spec/models/spree/product_spec.rb
+++ b/spree/core/spec/models/spree/product_spec.rb
@@ -838,7 +838,7 @@ describe Spree::Product, type: :model do
let(:product) { create(:product) }
context 'when default variant has images' do
- let!(:image) { create(:image, viewable: product.default_variant) }
+ let!(:image) { create(:media, viewable: product.default_variant) }
it 'returns the default variant image' do
expect(product.reload.primary_media).to eq(image)
@@ -846,7 +846,7 @@ describe Spree::Product, type: :model do
context 'with variants that also have images' do
let!(:variant) { create(:variant, product: product) }
- let!(:variant_image) { create(:image, viewable: variant) }
+ let!(:variant_image) { create(:media, viewable: variant) }
it 'returns the default variant image (default variant takes priority)' do
expect(product.reload.primary_media).to eq(image)
@@ -856,7 +856,7 @@ describe Spree::Product, type: :model do
context 'when default variant has no images but variant does' do
let!(:variant) { create(:variant, product: product) }
- let!(:variant_image) { create(:image, viewable: variant) }
+ let!(:variant_image) { create(:media, viewable: variant) }
it 'returns the variant image' do
expect(product.reload.primary_media).to eq(variant_image)
@@ -874,18 +874,18 @@ describe Spree::Product, type: :model do
let(:product) { create(:product) }
it 'returns product-level assets' do
- image = create(:image, viewable: product)
+ image = create(:media, viewable: product)
expect(product.media).to include(image)
end
it 'does not include variant images' do
- variant_image = create(:image, viewable: product.default_variant)
+ variant_image = create(:media, viewable: product.default_variant)
expect(product.media).not_to include(variant_image)
end
it 'is ordered by position' do
- img2 = create(:image, viewable: product, position: 2)
- img1 = create(:image, viewable: product, position: 1)
+ img2 = create(:media, viewable: product, position: 2)
+ img1 = create(:media, viewable: product, position: 1)
expect(product.media.to_a).to eq([img1, img2])
end
end
@@ -894,13 +894,13 @@ describe Spree::Product, type: :model do
let(:product) { create(:product) }
it 'returns product media when present' do
- product_image = create(:image, viewable: product)
- create(:image, viewable: product.default_variant)
+ product_image = create(:media, viewable: product)
+ create(:media, viewable: product.default_variant)
expect(product.reload.gallery_media).to include(product_image)
end
it 'falls back to variant_images when no product media' do
- variant_image = create(:image, viewable: product.default_variant)
+ variant_image = create(:media, viewable: product.default_variant)
expect(product.reload.gallery_media).to include(variant_image)
end
end
@@ -909,12 +909,12 @@ describe Spree::Product, type: :model do
let(:product) { create(:product) }
it 'uses product media first' do
- product_image = create(:image, viewable: product)
+ product_image = create(:media, viewable: product)
expect(product.reload.primary_media_id).to eq(product_image.id)
end
it 'falls back to variant images when no product media' do
- variant_image = create(:image, viewable: product.default_variant)
+ variant_image = create(:media, viewable: product.default_variant)
product.update_thumbnail!
expect(product.reload.primary_media_id).to eq(variant_image.id)
end
@@ -930,7 +930,7 @@ describe Spree::Product, type: :model do
end
context 'when default variant has images' do
- let!(:image) { create(:image, viewable: product.default_variant) }
+ let!(:image) { create(:media, viewable: product.default_variant) }
it 'returns true' do
expect(product.reload.has_variant_images?).to be true
@@ -939,7 +939,7 @@ describe Spree::Product, type: :model do
context 'when a variant has images' do
let!(:variant) { create(:variant, product: product) }
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
it 'returns true' do
expect(product.reload.has_variant_images?).to be true
@@ -947,7 +947,7 @@ describe Spree::Product, type: :model do
end
context 'when variant_images are preloaded' do
- let!(:image) { create(:image, viewable: product.default_variant) }
+ let!(:image) { create(:media, viewable: product.default_variant) }
it 'uses loaded association' do
loaded_product = Spree::Product.includes(:variant_images).find(product.id)
@@ -978,7 +978,7 @@ describe Spree::Product, type: :model do
context 'when any variant has images' do
let!(:variant) { create(:variant, product: product) }
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
it 'returns true' do
expect(product.reload.has_images?).to be true
@@ -996,7 +996,7 @@ describe Spree::Product, type: :model do
end
context 'when default variant has media' do
- let!(:images) { create_list(:image, 2, viewable: product.default_variant) }
+ let!(:images) { create_list(:media, 2, viewable: product.default_variant) }
it 'returns total media count' do
expect(product.reload.media_count).to eq(2)
@@ -1004,7 +1004,7 @@ describe Spree::Product, type: :model do
context 'when variant also has media' do
let!(:variant) { create(:variant, product: product) }
- let!(:variant_images) { create_list(:image, 3, viewable: variant) }
+ let!(:variant_images) { create_list(:media, 3, viewable: variant) }
it 'returns total across all variants' do
expect(product.reload.media_count).to eq(5)
@@ -1014,7 +1014,7 @@ describe Spree::Product, type: :model do
context 'when only variant has media' do
let!(:variant) { create(:variant, product: product) }
- let!(:variant_images) { create_list(:image, 3, viewable: variant) }
+ let!(:variant_images) { create_list(:media, 3, viewable: variant) }
it 'returns the variant media count' do
expect(product.reload.media_count).to eq(3)
@@ -1032,7 +1032,7 @@ describe Spree::Product, type: :model do
end
context 'when the default variant has images' do
- let!(:image) { create(:image, viewable: product.default_variant) }
+ let!(:image) { create(:media, viewable: product.default_variant) }
it 'returns the default variant' do
expect(product.reload.variant_for_images).to eq(product.default_variant)
@@ -1041,7 +1041,7 @@ describe Spree::Product, type: :model do
context 'when only a non-default variant has images' do
let!(:variant2) { create(:variant, product: product) }
- let!(:image) { create(:image, viewable: variant2) }
+ let!(:image) { create(:media, viewable: variant2) }
it 'returns the variant with images' do
product.reload
@@ -1061,7 +1061,7 @@ describe Spree::Product, type: :model do
end
context 'when variant has only one image' do
- let!(:image) { create(:image, viewable: product.default_variant) }
+ let!(:image) { create(:media, viewable: product.default_variant) }
it 'returns nil' do
expect(product.reload.secondary_image).to be_nil
@@ -1069,8 +1069,8 @@ describe Spree::Product, type: :model do
end
context 'when variant has multiple images' do
- let!(:image1) { create(:image, viewable: product.default_variant, position: 1) }
- let!(:image2) { create(:image, viewable: product.default_variant, position: 2) }
+ let!(:image1) { create(:media, viewable: product.default_variant, position: 1) }
+ let!(:image2) { create(:media, viewable: product.default_variant, position: 2) }
it 'returns the second image' do
expect(product.reload.secondary_image).to eq(image2)
@@ -1079,8 +1079,8 @@ describe Spree::Product, type: :model do
context 'when images are on a option variant' do
let!(:variant) { create(:variant, product: product) }
- let!(:image1) { create(:image, viewable: variant, position: 1) }
- let!(:image2) { create(:image, viewable: variant, position: 2) }
+ let!(:image1) { create(:media, viewable: variant, position: 1) }
+ let!(:image2) { create(:media, viewable: variant, position: 2) }
it 'returns the second image from that variant' do
product.reload
@@ -1092,7 +1092,7 @@ describe Spree::Product, type: :model do
describe 'image methods with eager loading' do
let(:product) { create(:product) }
let!(:variant) { create(:variant, product: product) }
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
let(:storefront_includes) do
[
@@ -2294,7 +2294,7 @@ describe Spree::Product, type: :model do
context 'with media model instances' do
it 'passes through to ActiveRecord setter' do
- image = build(:image)
+ image = build(:media)
image.attachment.attach(io: File.open(fixture_path), filename: 'cat.jpg', content_type: 'image/jpeg')
product.media = [image]
diff --git a/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb b/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
index 6291bb9ad1..a24ab8d1a6 100644
--- a/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
@@ -6,7 +6,7 @@ module Spree
subject { Spree::PromotionHandler::FreeShipping.new(order) }
let(:order) { create(:order) }
- let(:shipment) { create(:shipment, order: order) }
+ let(:shipment) { create(:fulfillment, order: order) }
let(:calculator) { Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
diff --git a/spree/core/spec/models/spree/purchase/freight_spec.rb b/spree/core/spec/models/spree/purchase/freight_spec.rb
index bbaa98a36a..0d4790cf40 100644
--- a/spree/core/spec/models/spree/purchase/freight_spec.rb
+++ b/spree/core/spec/models/spree/purchase/freight_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Spree::Purchase::Freight do
end
def select_freight_rate(cart, snapshot)
- fulfillment = create(:shipment, cart: cart, order: nil)
+ fulfillment = create(:fulfillment, cart: cart, order: nil)
create(:delivery_rate, fulfillment: fulfillment, selected: true, unpriced: true, cost: 0,
metadata: { 'freight_summary' => snapshot })
end
@@ -69,7 +69,7 @@ RSpec.describe Spree::Purchase::Freight do
before { create(:line_item, order: order, variant: variant, quantity: 24) }
it 'reads what the freight rate froze rather than the live catalog' do
- fulfillment = create(:shipment, order: order)
+ fulfillment = create(:fulfillment, order: order)
snapshot = Spree::FreightSummary.new(
lines: [Spree::FreightSummary::Line.new(units: 24, cartons: 2, pallets: 1, complete: true)]
).as_json
@@ -85,7 +85,7 @@ RSpec.describe Spree::Purchase::Freight do
# Two freight shipments are still one load to the forwarder.
it 'sums the frozen summaries across every fulfillment' do
2.times do
- fulfillment = create(:shipment, order: order)
+ fulfillment = create(:fulfillment, order: order)
snapshot = Spree::FreightSummary.new(
lines: [Spree::FreightSummary::Line.new(units: 12, cartons: 1, pallets: 1,
volume: BigDecimal('0.03'), complete: true)]
@@ -104,7 +104,7 @@ RSpec.describe Spree::Purchase::Freight do
# part rounded its cartons up, so adding them would invent a pallet.
it 're-rounds a variant split across consignments rather than adding' do
[3, 9].each do |units|
- fulfillment = create(:shipment, order: order)
+ fulfillment = create(:fulfillment, order: order)
snapshot = Spree::FreightSummary.new(
lines: [Spree::FreightSummary::Line.new(variant_id: 'variant_abc', units: units,
units_per_carton: 12, cartons_per_pallet: 40,
@@ -124,7 +124,7 @@ RSpec.describe Spree::Purchase::Freight do
# The sale already happened. Re-deriving it would mean a carton size
# corrected next month silently rewrites what shipped last month.
it 'reports nothing rather than re-deriving when no rate froze a summary' do
- create(:shipment, order: order)
+ create(:fulfillment, order: order)
expect(order.reload.freight_summary).to be_nil
end
diff --git a/spree/core/spec/models/spree/purchase_order_spec.rb b/spree/core/spec/models/spree/purchase_order_spec.rb
index 39e1a8ea30..5d09578f9a 100644
--- a/spree/core/spec/models/spree/purchase_order_spec.rb
+++ b/spree/core/spec/models/spree/purchase_order_spec.rb
@@ -70,11 +70,11 @@ module Spree
# A line shows the variant's own image, and the product's when the
# variant has none — the fallback an order's line item already uses.
it 'shows the variant image, or the product image when there is none' do
- product_image = create(:image, viewable: item.variant.product)
+ product_image = create(:media, viewable: item.variant.product)
expect(item.reload.thumbnail).to eq(product_image)
- variant_image = create(:image, viewable: item.variant)
+ variant_image = create(:media, viewable: item.variant)
expect(item.reload.thumbnail).to eq(variant_image)
end
diff --git a/spree/core/spec/models/spree/shipment_spec.rb b/spree/core/spec/models/spree/shipment_spec.rb
index f07ab88b5b..3395b38f48 100644
--- a/spree/core/spec/models/spree/shipment_spec.rb
+++ b/spree/core/spec/models/spree/shipment_spec.rb
@@ -1,18 +1,18 @@
require 'spec_helper'
-describe Spree::Shipment, type: :model do
+describe Spree::Fulfillment, type: :model do
it_behaves_like 'lifecycle events'
- let(:inventory_units) { create_list(:inventory_unit, 2) }
+ let(:inventory_units) { create_list(:fulfillment_item, 2) }
let(:variant) { line_item.variant }
let!(:line_item) { create(:line_item) }
let(:shipment) do
- create(:shipment, number: 'H21265865494', cost: 1, state: 'unfulfilled', stock_location: create(:stock_location)).tap do |shipment|
+ create(:fulfillment, number: 'H21265865494', cost: 1, state: 'unfulfilled', stock_location: create(:stock_location)).tap do |shipment|
allow(shipment).to receive_messages order: order
allow(shipment).to receive_messages(delivery_method: shipping_method, shipping_method: shipping_method)
end
end
- let(:shipping_method) { create(:shipping_method, name: 'UPS') }
+ let(:shipping_method) { create(:delivery_method, name: 'UPS') }
let!(:order) { create(:order, number: 'S12345', store: store) }
let(:store) { @default_store }
@@ -65,7 +65,7 @@ describe Spree::Shipment, type: :model do
end
context 'when the shipment is not tracked' do
- let(:shipment) { build(:shipment, number: nil, tracking: nil) }
+ let(:shipment) { build(:fulfillment, number: nil, tracking: nil) }
it 'returns false' do
expect(shipment.tracked?).to eq(false)
@@ -76,7 +76,7 @@ describe Spree::Shipment, type: :model do
describe '#partial?' do
subject { shipment.partial? }
- let(:shipment) { create(:shipment, order: order) }
+ let(:shipment) { create(:fulfillment, order: order) }
let!(:line_item) { create(:line_item, quantity: 5, order: order) }
let(:order) { create(:order) }
@@ -96,7 +96,7 @@ describe Spree::Shipment, type: :model do
# Regression test for #4063
context 'number generation' do
- let(:shipment) { create(:shipment, stock_location: create(:stock_location)) }
+ let(:shipment) { create(:fulfillment, stock_location: create(:stock_location)) }
before do
allow(order).to receive :recalculate_totals!
@@ -114,7 +114,7 @@ describe Spree::Shipment, type: :model do
describe 'status' do
it 'starts unfulfilled' do
- expect(create(:shipment).status).to eq('unfulfilled')
+ expect(create(:fulfillment).status).to eq('unfulfilled')
end
it 'rejects a status outside the vocabulary' do
@@ -257,7 +257,7 @@ describe Spree::Shipment, type: :model do
end
it 'equals line items final amount with tax' do
- shipment = create(:shipment, order: create(:order_with_line_item_quantity, line_items_quantity: 2))
+ shipment = create(:fulfillment, order: create(:order_with_line_item_quantity, line_items_quantity: 2))
shipment.order.line_items.first.update_columns(adjustment_total: 2.0, additional_tax_total: 2.0)
# update_columns writes behind the loaded associations, so the manifest
# has to re-read the line items to see the tax.
@@ -272,7 +272,7 @@ describe Spree::Shipment, type: :model do
variant2 = create(:variant)
create(:line_item, order: order, variant: variant1, quantity: 3)
create(:line_item, order: order, variant: variant2, quantity: 2)
- shipment = create(:shipment, order: order)
+ shipment = create(:fulfillment, order: order)
expect(shipment.item_quantity).to eq(5)
end
@@ -282,7 +282,7 @@ describe Spree::Shipment, type: :model do
variant2 = create(:variant)
create(:line_item, order: order, variant: variant1, quantity: 1)
create(:line_item, order: order, variant: variant2, quantity: 1)
- shipment = create(:shipment, order: order)
+ shipment = create(:fulfillment, order: order)
expect(shipment.item_quantity).to eq(2)
end
@@ -294,12 +294,12 @@ describe Spree::Shipment, type: :model do
line_item2 = create(:line_item, order: order, variant: variant2, quantity: 4)
# First shipment for line_item1
- shipment1 = create(:shipment, order: order)
+ shipment1 = create(:fulfillment, order: order)
shipment1.inventory_units.delete_all
shipment1.set_up_inventory('on_hand', variant1, order, line_item1, 2)
# Second shipment for line_item2
- shipment2 = create(:shipment, order: order)
+ shipment2 = create(:fulfillment, order: order)
shipment2.inventory_units.delete_all
shipment2.set_up_inventory('on_hand', variant2, order, line_item2, 4)
@@ -308,7 +308,7 @@ describe Spree::Shipment, type: :model do
end
it 'returns 0 if there are no items in the shipment' do
- shipment = create(:shipment)
+ shipment = create(:fulfillment)
expect(shipment.item_quantity).to eq(0)
end
end
@@ -318,7 +318,7 @@ describe Spree::Shipment, type: :model do
order = create(:order)
variant = create(:variant, weight: 10)
line_item = create(:line_item, order: order, variant: variant, quantity: 2)
- shipment = create(:shipment, order: order)
+ shipment = create(:fulfillment, order: order)
expect(shipment.item_weight).to eq(20.0)
end
end
@@ -328,20 +328,20 @@ describe Spree::Shipment, type: :model do
order = create(:order)
variant = create(:variant, weight: 10, weight_unit: 'kg')
line_item = create(:line_item, order: order, variant: variant, quantity: 2)
- shipment = create(:shipment, order: order)
+ shipment = create(:fulfillment, order: order)
expect(shipment.weight_unit).to eq('kg')
end
end
it '#discounted_cost' do
- shipment = create(:shipment)
+ shipment = create(:fulfillment)
shipment.cost = 10
shipment.promo_total = -1
expect(shipment.discounted_cost).to eq(9)
end
describe '#taxable_basis' do
- let(:shipment) { create(:shipment).tap { |s| s.cost = 10 } }
+ let(:shipment) { create(:fulfillment).tap { |s| s.cost = 10 } }
it 'is the discounted cost' do
shipment.promo_total = -1
@@ -355,21 +355,21 @@ describe Spree::Shipment, type: :model do
end
it '#tax_total with included taxes' do
- shipment = Spree::Shipment.new
+ shipment = Spree::Fulfillment.new
expect(shipment.tax_total).to eq(0)
shipment.included_tax_total = 10
expect(shipment.tax_total).to eq(10)
end
it '#tax_total with additional taxes' do
- shipment = Spree::Shipment.new
+ shipment = Spree::Fulfillment.new
expect(shipment.tax_total).to eq(0)
shipment.additional_tax_total = 10
expect(shipment.tax_total).to eq(10)
end
it '#final_price' do
- shipment = Spree::Shipment.new
+ shipment = Spree::Fulfillment.new
shipment.cost = 10
shipment.adjustment_total = -2
shipment.included_tax_total = 1
@@ -378,7 +378,7 @@ describe Spree::Shipment, type: :model do
describe '#free?' do
let!(:order) { create(:order) }
- let!(:shipment) { create(:shipment, cost: 10, order: order) }
+ let!(:shipment) { create(:fulfillment, cost: 10, order: order) }
let(:free_shipping_promotion) { create(:free_shipping_promotion, code: 'freeship', kind: :coupon_code) }
it 'returns true if final_price is equal to 0' do
@@ -396,7 +396,7 @@ describe Spree::Shipment, type: :model do
describe '#with_free_shipping_promotion?' do
let!(:order) { create(:order) }
- let!(:shipment) { create(:shipment, cost: 10, order: order) }
+ let!(:shipment) { create(:fulfillment, cost: 10, order: order) }
let(:free_shipping_promotion) { create(:free_shipping_promotion, code: 'freeship', kind: :coupon_code) }
it 'returns true when Free Shipping promotion is applied' do
@@ -414,7 +414,7 @@ describe Spree::Shipment, type: :model do
describe '#store' do
let(:store) { @default_store }
let!(:order) { create(:order, store: store) }
- let!(:shipment) { create(:shipment, cost: 10, order: order) }
+ let!(:shipment) { create(:fulfillment, cost: 10, order: order) }
it 'return order store' do
expect(shipment.store).to eq(store)
@@ -423,7 +423,7 @@ describe Spree::Shipment, type: :model do
describe '#currency' do
let!(:order) { create(:order, currency: 'EUR') }
- let!(:shipment) { create(:shipment, cost: 10, order: order) }
+ let!(:shipment) { create(:fulfillment, cost: 10, order: order) }
it 'return order currency' do
expect(shipment.currency).to eq('EUR')
@@ -478,7 +478,7 @@ describe Spree::Shipment, type: :model do
end
describe '#can_get_rates?' do
- let(:digital_shipping_method) { create(:digital_shipping_method) }
+ let(:digital_shipping_method) { create(:digital_delivery_method) }
let(:digital_product) { create(:digital_product) }
let(:digital_line_item) { create(:line_item, variant: create(:variant, product: digital_product)) }
@@ -519,13 +519,13 @@ describe Spree::Shipment, type: :model do
end
context 'shipping_rates' do
- let(:shipment) { create(:shipment) }
- let(:shipping_method1) { create(:shipping_method) }
- let(:shipping_method2) { create(:shipping_method) }
+ let(:shipment) { create(:fulfillment) }
+ let(:shipping_method1) { create(:delivery_method) }
+ let(:shipping_method2) { create(:delivery_method) }
let(:shipping_rates) do
[
- Spree::ShippingRate.new(shipping_method: shipping_method1, cost: 10.00, selected: true),
- Spree::ShippingRate.new(shipping_method: shipping_method2, cost: 20.00)
+ Spree::DeliveryRate.new(shipping_method: shipping_method1, cost: 10.00, selected: true),
+ Spree::DeliveryRate.new(shipping_method: shipping_method2, cost: 20.00)
]
end
@@ -536,7 +536,7 @@ describe Spree::Shipment, type: :model do
end
context 'carry_over_selection' do
- let(:digital_method) { create(:shipping_method) }
+ let(:digital_method) { create(:delivery_method) }
def proposal(*rates)
Spree::Fulfillment.new(delivery_rates: rates.map { |method, cost, selected| Spree::DeliveryRate.new(delivery_method: method, cost: cost, selected: selected) })
@@ -593,7 +593,7 @@ describe Spree::Shipment, type: :model do
# change, eligibility rule, zone edit). The fulfillment must fall back to
# the estimator's own pick rather than end up with nothing selected.
it 'falls back to the estimator default when the original method is no longer quoted' do
- dropped_method = create(:shipping_method)
+ dropped_method = create(:delivery_method)
expect(Spree::Stock::Estimator).to receive(:new).with(shipment.order).and_return(mock_estimator)
allow(shipment).to receive_messages(delivery_method: dropped_method)
@@ -641,8 +641,8 @@ describe Spree::Shipment, type: :model do
context 'to_package' do
let(:inventory_units) do
- [build(:inventory_unit, line_item: line_item, variant: variant, state: 'on_hand'),
- build(:inventory_unit, line_item: line_item, variant: variant, state: 'backordered')]
+ [build(:fulfillment_item, line_item: line_item, variant: variant, state: 'on_hand'),
+ build(:fulfillment_item, line_item: line_item, variant: variant, state: 'backordered')]
end
before do
@@ -684,7 +684,7 @@ describe Spree::Shipment, type: :model do
before { stub_store_preferences(track_inventory_levels: true) }
it 'validates with inventory' do
- shipment.inventory_units = [create(:inventory_unit)]
+ shipment.inventory_units = [create(:fulfillment_item)]
expect(shipment.valid?).to be true
end
end
@@ -699,7 +699,7 @@ describe Spree::Shipment, type: :model do
end
describe '#cancel' do
- let(:inventory_unit) { create(:inventory_unit, state: 'on_hand', line_item: line_item, variant: variant, quantity: 1) }
+ let(:inventory_unit) { create(:fulfillment_item, state: 'on_hand', line_item: line_item, variant: variant, quantity: 1) }
# Restocking is no longer a transition callback — it belongs to
# Spree::Fulfillments::Cancel, so the event only moves the status.
@@ -763,7 +763,7 @@ describe Spree::Shipment, type: :model do
describe '#ship' do
context 'when the shipment is canceled' do
- let(:shipment_with_inventory_units) { create(:shipment, order: create(:order_with_line_items), state: 'canceled') }
+ let(:shipment_with_inventory_units) { create(:fulfillment, order: create(:order_with_line_items), state: 'canceled') }
let(:subject) { shipment_with_inventory_units.update!(status: 'fulfilled') }
before do
@@ -803,7 +803,7 @@ describe Spree::Shipment, type: :model do
context 'updates cost when selected shipping rate is present' do
- let(:shipment) { create(:shipment) }
+ let(:shipment) { create(:fulfillment) }
before { allow(shipment).to receive_message_chain :selected_delivery_rate, cost: 5 }
@@ -826,10 +826,10 @@ describe Spree::Shipment, type: :model do
)
end
- let(:shipment) { Spree::Shipment.create order_id: order.id, stock_location: create(:stock_location) }
+ let(:shipment) { Spree::Fulfillment.create order_id: order.id, stock_location: create(:stock_location) }
let(:shipping_rate) do
- Spree::ShippingRate.create shipment_id: shipment.id, cost: 10,
+ Spree::DeliveryRate.create shipment_id: shipment.id, cost: 10,
delivery_method: create(:delivery_method)
end
@@ -851,13 +851,13 @@ describe Spree::Shipment, type: :model do
describe '#selected_shipping_rate_id=' do
let(:order) { create(:order_with_line_items, line_items_count: 1) }
let(:shipment) { order.fulfillments.first }
- let(:shipping_method_1) { create(:shipping_method) }
- let(:shipping_method_2) { create(:shipping_method) }
+ let(:shipping_method_1) { create(:delivery_method) }
+ let(:shipping_method_2) { create(:delivery_method) }
before do
shipment.shipping_rates.delete_all
- create(:shipping_rate, shipment: shipment, shipping_method: shipping_method_1, cost: 10, selected: true)
- create(:shipping_rate, shipment: shipment, shipping_method: shipping_method_2, cost: 20, selected: false)
+ create(:delivery_rate, shipment: shipment, shipping_method: shipping_method_1, cost: 10, selected: true)
+ create(:delivery_rate, shipment: shipment, shipping_method: shipping_method_2, cost: 20, selected: false)
shipment.reload
order.set_fulfillments_cost
end
@@ -883,18 +883,18 @@ describe Spree::Shipment, type: :model do
describe '#cost=' do
it 'parses well-formed decimal strings' do
- shipment = build(:shipment, order: nil, stock_location: nil, cost: '7.42')
+ shipment = build(:fulfillment, order: nil, stock_location: nil, cost: '7.42')
expect(shipment.cost).to eq(BigDecimal('7.42'))
end
it 'raises on malformed strings instead of truncating them' do
- expect { build(:shipment, order: nil, stock_location: nil, cost: '12 boxes') }.
+ expect { build(:fulfillment, order: nil, stock_location: nil, cost: '12 boxes') }.
to raise_error(ArgumentError)
end
it 'casts blank strings to the zero default' do
- shipment = build(:shipment, order: nil, stock_location: nil, cost: '')
+ shipment = build(:fulfillment, order: nil, stock_location: nil, cost: '')
shipment.valid?
expect(shipment.cost).to eq(0)
@@ -905,7 +905,7 @@ describe Spree::Shipment, type: :model do
let(:order) { create(:order_with_line_items, line_items_count: 1) }
let(:fulfillment) { order.fulfillments.first }
let(:reduced_rate_category) { create(:tax_category, name: "Reduced #{Time.current.to_f}") }
- let(:delivery_method) { create(:shipping_method, tax_category: reduced_rate_category) }
+ let(:delivery_method) { create(:delivery_method, tax_category: reduced_rate_category) }
def select_rate(method)
fulfillment.delivery_rates.destroy_all
@@ -932,7 +932,7 @@ describe Spree::Shipment, type: :model do
end
it 'is nil when the delivery method carries no classification' do
- select_rate(create(:shipping_method, tax_category: nil))
+ select_rate(create(:delivery_method, tax_category: nil))
expect(fulfillment.tax_category).to be_nil
expect(fulfillment.tax_category_id).to be_nil
@@ -942,7 +942,7 @@ describe Spree::Shipment, type: :model do
describe '#selected_delivery_rate_id / #selected_delivery_rate_id=' do
let(:order) { create(:order_with_line_items, line_items_count: 1) }
let(:shipment) { order.fulfillments.first }
- let(:rate) { create(:shipping_rate, shipment: shipment, cost: 20, selected: false) }
+ let(:rate) { create(:delivery_rate, shipment: shipment, cost: 20, selected: false) }
it 'selects a rate by its prefixed ID and reads back the prefixed ID' do
shipment.selected_delivery_rate_id = rate.prefixed_id
@@ -958,7 +958,7 @@ describe Spree::Shipment, type: :model do
end
it "raises for a rate that doesn't belong to the shipment" do
- foreign_rate = create(:shipping_rate)
+ foreign_rate = create(:delivery_rate)
expect { shipment.selected_delivery_rate_id = foreign_rate.prefixed_id }.
to raise_error(ActiveRecord::RecordNotFound)
@@ -1001,7 +1001,7 @@ describe Spree::Shipment, type: :model do
context 'nil costs' do
it 'sets cost to 0' do
- shipment = Spree::Shipment.new
+ shipment = Spree::Fulfillment.new
shipment.valid?
expect(shipment.cost).to eq 0
end
@@ -1114,8 +1114,8 @@ describe Spree::Shipment, type: :model do
describe '.unfulfilled' do
subject { described_class.unfulfilled }
- let!(:unfulfilled_shipments) { create_list(:shipment, 2, status: 'unfulfilled') }
- let!(:fulfilled_shipments) { create_list(:shipment, 2, status: 'fulfilled') }
+ let!(:unfulfilled_shipments) { create_list(:fulfillment, 2, status: 'unfulfilled') }
+ let!(:fulfilled_shipments) { create_list(:fulfillment, 2, status: 'fulfilled') }
it 'returns shipments nobody has handed over yet' do
expect(subject).to include(*unfulfilled_shipments)
diff --git a/spree/core/spec/models/spree/shipping_calculator_spec.rb b/spree/core/spec/models/spree/shipping_calculator_spec.rb
index 95cec450ef..c21c5edc68 100644
--- a/spree/core/spec/models/spree/shipping_calculator_spec.rb
+++ b/spree/core/spec/models/spree/shipping_calculator_spec.rb
@@ -6,10 +6,10 @@ module Spree
let(:variant1) { create(:variant, price: 10) }
let(:variant2) { create(:variant, price: 20) }
- let(:shipment) { build(:shipment) }
+ let(:shipment) { build(:fulfillment) }
- let(:inventory_unit1) { build(:inventory_unit, quantity: 2, variant: variant1, line_item: line_item1) }
- let(:inventory_unit2) { build(:inventory_unit, quantity: 1, variant: variant2, line_item: line_item2) }
+ let(:inventory_unit1) { build(:fulfillment_item, quantity: 2, variant: variant1, line_item: line_item1) }
+ let(:inventory_unit2) { build(:fulfillment_item, quantity: 1, variant: variant2, line_item: line_item2) }
let(:inventory_units) { [inventory_unit1, inventory_unit2] }
let(:line_item1) { build(:line_item, variant: variant1, price: 10) }
diff --git a/spree/core/spec/models/spree/stock/content_item_spec.rb b/spree/core/spec/models/spree/stock/content_item_spec.rb
index 598bfcc782..e0d1572ab1 100644
--- a/spree/core/spec/models/spree/stock/content_item_spec.rb
+++ b/spree/core/spec/models/spree/stock/content_item_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::Stock::ContentItem, type: :model do
subject { described_class.new(inventory_unit) }
- let(:inventory_unit) { create(:inventory_unit, variant: variant) }
+ let(:inventory_unit) { create(:fulfillment_item, variant: variant) }
let(:variant) { create(:variant, weight: 25.0) }
context '#volume' do
diff --git a/spree/core/spec/models/spree/stock/coordinator_spec.rb b/spree/core/spec/models/spree/stock/coordinator_spec.rb
index 43e8978bba..c558649875 100644
--- a/spree/core/spec/models/spree/stock/coordinator_spec.rb
+++ b/spree/core/spec/models/spree/stock/coordinator_spec.rb
@@ -158,7 +158,7 @@ module Spree
it 'turns packages into shipments' do
shipments = subject.shipments
expect(shipments.count).to eq packages.count
- expect(shipments).to all(be_a(Shipment))
+ expect(shipments).to all(be_a(Fulfillment))
end
it "puts the order's ship address on the shipments" do
diff --git a/spree/core/spec/models/spree/stock/differentiator_spec.rb b/spree/core/spec/models/spree/stock/differentiator_spec.rb
index 32295113fd..2acab212c1 100644
--- a/spree/core/spec/models/spree/stock/differentiator_spec.rb
+++ b/spree/core/spec/models/spree/stock/differentiator_spec.rb
@@ -13,8 +13,8 @@ module Spree
let(:stock_location) { create(:stock_location) }
- let(:inventory_unit1) { create(:inventory_unit, variant: variant1, line_item: line_item1) }
- let(:inventory_unit2) { create(:inventory_unit, variant: variant2, line_item: line_item2) }
+ let(:inventory_unit1) { create(:fulfillment_item, variant: variant1, line_item: line_item1) }
+ let(:inventory_unit2) { create(:fulfillment_item, variant: variant2, line_item: line_item2) }
let(:order) { create(:order, line_items: [line_item1, line_item2]) }
diff --git a/spree/core/spec/models/spree/stock/estimator_spec.rb b/spree/core/spec/models/spree/stock/estimator_spec.rb
index 14bccee445..514b73e025 100644
--- a/spree/core/spec/models/spree/stock/estimator_spec.rb
+++ b/spree/core/spec/models/spree/stock/estimator_spec.rb
@@ -5,7 +5,7 @@ module Spree
describe Estimator, type: :model do
subject { Estimator.new(order) }
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
let(:package) { build(:stock_package, contents: inventory_units.map { |_i| ContentItem.new(inventory_unit) }) }
let(:ship_address) { create(:ship_address) }
let(:order) { build(:order_with_line_items, ship_address: ship_address) }
@@ -88,11 +88,11 @@ module Spree
context '#shipping rates' do
before do
- allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(true)
- allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :compute).and_return(4.00)
- allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :preferences).and_return(currency: currency)
- allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :supports_currency?) { |quoted| currency.blank? || quoted == currency }
- allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :marked_for_destruction?)
+ allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :available?).and_return(true)
+ allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :compute).and_return(4.00)
+ allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :preferences).and_return(currency: currency)
+ allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :supports_currency?) { |quoted| currency.blank? || quoted == currency }
+ allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :marked_for_destruction?)
allow(package).to receive_messages(eligible_delivery_methods: [shipping_method])
end
@@ -154,7 +154,7 @@ module Spree
end
context 'when the calculator is not available for that order' do
- before { allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(false) }
+ before { allow_any_instance_of(DeliveryMethod).to receive_message_chain(:calculator, :available?).and_return(false) }
it_behaves_like "shipping rate doesn't match"
end
@@ -182,7 +182,7 @@ module Spree
end
it 'sorts shipping rates by cost' do
- shipping_methods = Array.new(3) { create(:shipping_method) }
+ shipping_methods = Array.new(3) { create(:delivery_method) }
allow(shipping_methods[0]).to receive_message_chain(:calculator, :compute).and_return(5.00)
allow(shipping_methods[1]).to receive_message_chain(:calculator, :compute).and_return(3.00)
allow(shipping_methods[2]).to receive_message_chain(:calculator, :compute).and_return(4.00)
@@ -193,7 +193,7 @@ module Spree
end
context 'general shipping methods' do
- let(:shipping_methods) { Array.new(2) { create(:shipping_method) } }
+ let(:shipping_methods) { Array.new(2) { create(:delivery_method) } }
it 'selects the most affordable shipping rate' do
allow(shipping_methods[0]).to receive_message_chain(:calculator, :compute).and_return(5.00)
@@ -215,8 +215,8 @@ module Spree
end
context 'involves backend only shipping methods' do
- let(:backend_method) { create(:shipping_method, storefront_visible: false) }
- let(:generic_method) { create(:shipping_method) }
+ let(:backend_method) { create(:delivery_method, storefront_visible: false) }
+ let(:generic_method) { create(:delivery_method) }
before do
allow(backend_method).to receive_message_chain(:calculator, :compute).and_return(0.00)
@@ -238,7 +238,7 @@ module Spree
let!(:tax_rate) { create(:tax_rate, country_code: order.tax_address.country&.iso) }
before do
- Spree::ShippingMethod.all.each do |sm|
+ Spree::DeliveryMethod.all.each do |sm|
sm.tax_category_id = tax_rate.tax_category_id
sm.save
end
@@ -253,7 +253,7 @@ module Spree
context 'VAT price calculation' do
let(:tax_category) { create :tax_category }
- let!(:shipping_method) { create(:shipping_method, tax_category: tax_category) }
+ let!(:shipping_method) { create(:delivery_method, tax_category: tax_category) }
# Shipping is priced including the home country's VAT.
let(:home_country) { order.tax_address.country }
@@ -528,7 +528,7 @@ module Spree
# rates are persisted and read back through the association, which
# is what the storefront actually receives.
it 'keeps the unpriced rate last when the rates are read back' do
- fulfillment = create(:shipment)
+ fulfillment = create(:fulfillment)
subject.delivery_rates(package).each do |rate|
rate.update!(fulfillment: fulfillment)
end
diff --git a/spree/core/spec/models/spree/stock/package_spec.rb b/spree/core/spec/models/spree/stock/package_spec.rb
index e92584c26d..069c6af0c8 100644
--- a/spree/core/spec/models/spree/stock/package_spec.rb
+++ b/spree/core/spec/models/spree/stock/package_spec.rb
@@ -10,7 +10,7 @@ module Spree
let(:order) { create(:order) }
def build_inventory_unit
- build(:inventory_unit, variant: variant, order: order)
+ build(:fulfillment_item, variant: variant, order: order)
end
# The regression this guards: during checkout a fulfillment belongs to a
@@ -21,7 +21,7 @@ module Spree
describe '#owner' do
it 'prefers the owner the fulfillment supplied' do
cart = create(:cart, store: @default_store, ship_address: create(:address))
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
package = fulfillment.to_package
@@ -31,7 +31,7 @@ module Spree
it 'never returns a stranger order reachable through a unit' do
stranger = create(:order)
cart = create(:cart, store: @default_store)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
fulfillment.fulfillment_items.update_all(order_id: stranger.id)
expect(fulfillment.to_package.owner).to eq(cart)
@@ -44,7 +44,7 @@ module Spree
create(:package_type, store: @default_store, default: true, weight: 2.5, weight_unit: 'lb')
cart = create(:cart, store: @default_store)
create(:line_item, cart: cart, order: nil, variant: variant)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
expect(fulfillment.to_package.weight).to eq(27.5)
end
@@ -236,8 +236,8 @@ module Spree
it 'returns the methods of the items resolved profile' do
variant1 = create(:product).default_variant
variant2 = create(:product).default_variant
- contents = [ContentItem.new(build(:inventory_unit, variant_id: variant1.id)),
- ContentItem.new(build(:inventory_unit, variant_id: variant2.id))]
+ contents = [ContentItem.new(build(:fulfillment_item, variant_id: variant1.id)),
+ ContentItem.new(build(:fulfillment_item, variant_id: variant2.id))]
package = Package.new(stock_location, contents)
expect(package.eligible_delivery_methods).to eq([shipping_dm])
@@ -245,7 +245,7 @@ module Spree
it 'returns the digital profile methods for a digital package' do
digital = create(:digital_product).default_variant
- contents = [ContentItem.new(build(:inventory_unit, variant_id: digital.id))]
+ contents = [ContentItem.new(build(:fulfillment_item, variant_id: digital.id))]
package = Package.new(stock_location, contents)
expect(package.eligible_delivery_methods).to eq([digital_dm])
@@ -336,7 +336,7 @@ module Spree
# error, which is why freight math never multiplies columns directly.
it 'reports the packed volume in cubic meters' do
variant = build(:variant, width: 10, height: 20, depth: 30, dimensions_unit: 'cm')
- contents = [ContentItem.new(build(:inventory_unit, variant: variant, quantity: 2))]
+ contents = [ContentItem.new(build(:fulfillment_item, variant: variant, quantity: 2))]
package = Package.new(stock_location, contents)
expect(package.volume).to eq(BigDecimal('0.012'))
@@ -346,8 +346,8 @@ module Spree
metric = build(:variant, width: 10, height: 20, depth: 30, dimensions_unit: 'cm')
imperial = build(:variant, width: 10, height: 20, depth: 30, dimensions_unit: 'in')
- metric_package = Package.new(stock_location, [ContentItem.new(build(:inventory_unit, variant: metric))])
- imperial_package = Package.new(stock_location, [ContentItem.new(build(:inventory_unit, variant: imperial))])
+ metric_package = Package.new(stock_location, [ContentItem.new(build(:fulfillment_item, variant: metric))])
+ imperial_package = Package.new(stock_location, [ContentItem.new(build(:fulfillment_item, variant: imperial))])
expect(imperial_package.volume).to be > metric_package.volume
end
@@ -355,10 +355,10 @@ module Spree
context '#dimension' do
it 'calculates the sum of the dimension of all the items' do
- contents = [ContentItem.new(build(:inventory_unit, variant: build(:variant))),
- ContentItem.new(build(:inventory_unit, variant: build(:variant))),
- ContentItem.new(build(:inventory_unit, variant: build(:variant))),
- ContentItem.new(build(:inventory_unit, variant: build(:variant)))]
+ contents = [ContentItem.new(build(:fulfillment_item, variant: build(:variant))),
+ ContentItem.new(build(:fulfillment_item, variant: build(:variant))),
+ ContentItem.new(build(:fulfillment_item, variant: build(:variant))),
+ ContentItem.new(build(:fulfillment_item, variant: build(:variant)))]
package = Package.new(stock_location, contents)
expect(package.dimension).to eq contents.sum(&:dimension)
end
diff --git a/spree/core/spec/models/spree/stock/packer_spec.rb b/spree/core/spec/models/spree/stock/packer_spec.rb
index ed1990b96b..fb804baf3d 100644
--- a/spree/core/spec/models/spree/stock/packer_spec.rb
+++ b/spree/core/spec/models/spree/stock/packer_spec.rb
@@ -5,7 +5,7 @@ module Spree
describe Packer, type: :model do
subject { Packer.new(stock_location, inventory_units) }
- let(:inventory_units) { [InventoryUnit.new(variant: create(:variant))] }
+ let(:inventory_units) { [FulfillmentItem.new(variant: create(:variant))] }
let(:stock_location) { create(:stock_location) }
context 'packages' do
@@ -23,7 +23,7 @@ module Spree
end
context 'default_package' do
- let!(:inventory_units) { Array.new(2) { InventoryUnit.new variant: create(:variant) } }
+ let!(:inventory_units) { Array.new(2) { FulfillmentItem.new variant: create(:variant) } }
it 'contains all the items' do
inventory_units.each do |inventory_unit|
@@ -48,7 +48,7 @@ module Spree
context "location doesn't have order items in stock" do
let(:stock_location) { create(:stock_location, propagate_all_variants: false) }
- let(:inventory_units) { [InventoryUnit.new(variant: create(:variant))] }
+ let(:inventory_units) { [FulfillmentItem.new(variant: create(:variant))] }
let(:packer) { Packer.new(stock_location, inventory_units) }
it 'builds an empty package' do
@@ -57,7 +57,7 @@ module Spree
end
context "doesn't track inventory levels" do
- let(:inventory_units) { Array.new(2) { InventoryUnit.new(variant: create(:variant)) } }
+ let(:inventory_units) { Array.new(2) { FulfillmentItem.new(variant: create(:variant)) } }
before { stub_store_preferences(track_inventory_levels: false) }
diff --git a/spree/core/spec/models/spree/stock/prioritizer_spec.rb b/spree/core/spec/models/spree/stock/prioritizer_spec.rb
index 5662680ab3..cf7c3e4a21 100644
--- a/spree/core/spec/models/spree/stock/prioritizer_spec.rb
+++ b/spree/core/spec/models/spree/stock/prioritizer_spec.rb
@@ -12,7 +12,7 @@ module Spree
end
def build_inventory_unit
- build(:inventory_unit, variant: variant).tap do |unit|
+ build(:fulfillment_item, variant: variant).tap do |unit|
inventory_units << unit
end
end
diff --git a/spree/core/spec/models/spree/stock/splitter/backordered_spec.rb b/spree/core/spec/models/spree/stock/splitter/backordered_spec.rb
index a50e36477e..a780300276 100644
--- a/spree/core/spec/models/spree/stock/splitter/backordered_spec.rb
+++ b/spree/core/spec/models/spree/stock/splitter/backordered_spec.rb
@@ -12,8 +12,8 @@ module Spree
let(:package) { Package.new(packer.stock_location) }
before do
- package.add_multiple(build_stubbed_list(:inventory_unit, 4, :without_assoc))
- package.add_multiple(build_stubbed_list(:inventory_unit, 5, :without_assoc), :backordered)
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 4, :without_assoc))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 5, :without_assoc), :backordered)
end
it 'splits packages by status' do
diff --git a/spree/core/spec/models/spree/stock/splitter/delivery_profile_spec.rb b/spree/core/spec/models/spree/stock/splitter/delivery_profile_spec.rb
index 028cf5e890..5a9ccfbbc5 100644
--- a/spree/core/spec/models/spree/stock/splitter/delivery_profile_spec.rb
+++ b/spree/core/spec/models/spree/stock/splitter/delivery_profile_spec.rb
@@ -18,8 +18,8 @@ module Spree
a = create(:variant, product: product)
b = create(:variant, product: product, delivery_profile: oversized)
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: a))
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: b))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: a))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: b))
expect(result.size).to eq(2)
expect(result.map(&:delivery_profile)).to contain_exactly(standard, oversized)
@@ -30,8 +30,8 @@ module Spree
a = create(:variant, product: product)
b = create(:variant, product: product)
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: a))
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: b))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: a))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: b))
expect(result.size).to eq(1)
end
@@ -47,8 +47,8 @@ module Spree
mine = create(:variant, product: product, seller: seller, delivery_profile: standard)
theirs = create(:variant, product: product, seller: other_seller, delivery_profile: oversized)
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: mine))
- package.add_multiple(build_list(:inventory_unit, 1, :without_assoc, variant: theirs))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: mine))
+ package.add_multiple(build_list(:fulfillment_item, 1, :without_assoc, variant: theirs))
expect(result.size).to eq(2)
expect(result.map(&:delivery_profile)).to contain_exactly(standard, oversized)
diff --git a/spree/core/spec/models/spree/stock/splitter/weight_spec.rb b/spree/core/spec/models/spree/stock/splitter/weight_spec.rb
index 579b995c3e..4443ec6a56 100644
--- a/spree/core/spec/models/spree/stock/splitter/weight_spec.rb
+++ b/spree/core/spec/models/spree/stock/splitter/weight_spec.rb
@@ -17,9 +17,9 @@ module Spree
context 'with packages that can be reduced' do
before do
- package.add_multiple(build_stubbed_list(:inventory_unit, 2, :without_assoc, variant: heavy_variant))
- package.add_multiple(build_stubbed_list(:inventory_unit, 4, :without_assoc, variant: variant))
- package.add_multiple(build_stubbed_list(:inventory_unit, 2, :without_assoc, variant: heavy_variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 2, :without_assoc, variant: heavy_variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 4, :without_assoc, variant: variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 2, :without_assoc, variant: heavy_variant))
end
it 'splits and keeps splitting until all packages are underweight' do
@@ -35,7 +35,7 @@ module Spree
let(:variant) { build_stubbed(:base_variant, weight: 200) }
before do
- package.add_multiple(build_stubbed_list(:inventory_unit, 2, :without_assoc, variant: variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 2, :without_assoc, variant: variant))
end
it 'handles packages that can not be reduced' do
@@ -49,11 +49,11 @@ module Spree
let(:package1) { Package.new(packer.stock_location) }
before do
- package.add_multiple(build_stubbed_list(:inventory_unit, 2, :without_assoc, variant: heavy_variant))
- package.add_multiple(build_stubbed_list(:inventory_unit, 4, :without_assoc, variant: variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 2, :without_assoc, variant: heavy_variant))
+ package.add_multiple(build_stubbed_list(:fulfillment_item, 4, :without_assoc, variant: variant))
- package1.add_multiple(build_stubbed_list(:inventory_unit, 2, :without_assoc, variant: variant))
- package1.add_multiple(build_stubbed_list(:inventory_unit, 4, :without_assoc, variant: heavy_variant))
+ package1.add_multiple(build_stubbed_list(:fulfillment_item, 2, :without_assoc, variant: variant))
+ package1.add_multiple(build_stubbed_list(:fulfillment_item, 4, :without_assoc, variant: heavy_variant))
end
it 'splits and keeps splitting until all packages are underweight' do
diff --git a/spree/core/spec/models/spree/store_spec.rb b/spree/core/spec/models/spree/store_spec.rb
index f1aa3e9e10..f4a73977f5 100644
--- a/spree/core/spec/models/spree/store_spec.rb
+++ b/spree/core/spec/models/spree/store_spec.rb
@@ -86,8 +86,8 @@ describe Spree::Store, type: :model, without_global_store: true do
end
describe '#shipments' do
- let!(:shipment) { create(:shipment, order: order) }
- let!(:shipment_2) { create(:shipment, order: order_2) }
+ let!(:shipment) { create(:fulfillment, order: order) }
+ let!(:shipment_2) { create(:fulfillment, order: order_2) }
it { expect(subject.shipments).to eq([shipment]) }
end
@@ -104,8 +104,8 @@ describe Spree::Store, type: :model, without_global_store: true do
describe '#inventory_units' do
let(:product) { create(:product, store: subject) }
let(:product_2) { create(:product, store: other_store) }
- let!(:inventory_unit) { create(:inventory_unit, variant: product.default_variant, order: order) }
- let!(:inventory_unit_2) { create(:inventory_unit, variant: product_2.default_variant, order: order_2) }
+ let!(:inventory_unit) { create(:fulfillment_item, variant: product.default_variant, order: order) }
+ let!(:inventory_unit_2) { create(:fulfillment_item, variant: product_2.default_variant, order: order_2) }
it { expect(subject.inventory_units).to eq([inventory_unit]) }
end
@@ -300,7 +300,7 @@ describe Spree::Store, type: :model, without_global_store: true do
before do
zone = create(:delivery_zone)
zone.members.create!(member_type: 'country', country_code: country.iso)
- create(:shipping_method, delivery_zone: zone)
+ create(:delivery_method, delivery_zone: zone)
store.default_country_code = country.iso
end
@@ -863,7 +863,7 @@ describe Spree::Store, type: :model, without_global_store: true do
before do
zone.members.create!(member_type: 'country', country_code: country1.iso)
zone.members.create!(member_type: 'country', country_code: country2.iso)
- create(:shipping_method, delivery_zone: zone)
+ create(:delivery_method, delivery_zone: zone)
end
it 'returns countries from those zones' do
@@ -879,7 +879,7 @@ describe Spree::Store, type: :model, without_global_store: true do
before do
zone.members.create!(member_type: 'state', country_code: state.country_code, state_code: state.abbr)
- create(:shipping_method, delivery_zone: zone)
+ create(:delivery_method, delivery_zone: zone)
end
it 'returns countries inferred from state-type zones' do
@@ -917,8 +917,8 @@ describe Spree::Store, type: :model, without_global_store: true do
before do
zone1.members.create!(member_type: 'country', country_code: country.iso)
zone2.members.create!(member_type: 'country', country_code: country.iso)
- create(:shipping_method, delivery_zone: zone1)
- create(:shipping_method, delivery_zone: zone2)
+ create(:delivery_method, delivery_zone: zone1)
+ create(:delivery_method, delivery_zone: zone2)
end
it 'deduplicates countries' do
diff --git a/spree/core/spec/models/spree/tax_provider/internal_spec.rb b/spree/core/spec/models/spree/tax_provider/internal_spec.rb
index 2991ef344d..0eec22d95b 100644
--- a/spree/core/spec/models/spree/tax_provider/internal_spec.rb
+++ b/spree/core/spec/models/spree/tax_provider/internal_spec.rb
@@ -219,7 +219,7 @@ describe Spree::TaxProvider::Internal, type: :model do
context 'with a classified delivery charge' do
let(:fulfillment) { order.fulfillments.first }
let(:reduced_rate_category) { create(:tax_category, name: "Reduced #{Time.current.to_f}") }
- let(:delivery_method) { create(:shipping_method, tax_category: reduced_rate_category) }
+ let(:delivery_method) { create(:delivery_method, tax_category: reduced_rate_category) }
before do
fulfillment.delivery_rates.destroy_all
diff --git a/spree/core/spec/models/spree/variant_media_spec.rb b/spree/core/spec/models/spree/variant_media_spec.rb
index 82b0b111f0..5b922ac123 100644
--- a/spree/core/spec/models/spree/variant_media_spec.rb
+++ b/spree/core/spec/models/spree/variant_media_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
RSpec.describe Spree::VariantMedia, type: :model do
let(:product) { create(:product) }
let(:variant) { create(:variant, product: product) }
- let(:asset) { create(:image, viewable: product) }
+ let(:asset) { create(:media, viewable: product) }
describe 'validations' do
it 'is valid when the asset belongs to the variant product' do
@@ -12,7 +12,7 @@ RSpec.describe Spree::VariantMedia, type: :model do
end
it 'rejects an asset attached to a different product' do
- other_asset = create(:image, viewable: create(:product))
+ other_asset = create(:media, viewable: create(:product))
vm = described_class.new(variant: variant, asset: other_asset)
expect(vm).not_to be_valid
expect(vm.errors[:asset]).to be_present
@@ -39,7 +39,7 @@ RSpec.describe Spree::VariantMedia, type: :model do
describe 'thumbnail propagation' do
let(:product_for_thumb) { create(:product) }
let(:variant_for_thumb) { create(:variant, product: product_for_thumb) }
- let(:product_asset) { create(:image, viewable: product_for_thumb) }
+ let(:product_asset) { create(:media, viewable: product_for_thumb) }
it 'sets the variant primary_media_id when the link is created' do
expect {
@@ -71,7 +71,7 @@ end
RSpec.describe Spree::Media, type: :model do
describe '#variant_ids=' do
let(:product) { create(:product) }
- let(:product_asset) { create(:image, viewable: product) }
+ let(:product_asset) { create(:media, viewable: product) }
let!(:variant_a) { create(:variant, product: product) }
let!(:variant_b) { create(:variant, product: product) }
@@ -122,7 +122,7 @@ RSpec.describe Spree::Media, type: :model do
end
it 'is a no-op for variant-pinned assets (legacy viewable_type)' do
- legacy_asset = create(:image, viewable: variant_a)
+ legacy_asset = create(:media, viewable: variant_a)
expect {
legacy_asset.variant_ids = [variant_b.to_param]
@@ -143,7 +143,7 @@ RSpec.describe Spree::Variant, type: :model do
let(:variant) { create(:variant, product: product) }
context 'with associated media linked from the product' do
- let!(:product_asset) { create(:image, viewable: product) }
+ let!(:product_asset) { create(:media, viewable: product) }
let!(:link) { Spree::VariantMedia.create!(variant: variant, asset: product_asset) }
it 'returns associated_media from gallery_media' do
@@ -160,8 +160,8 @@ RSpec.describe Spree::Variant, type: :model do
end
context 'with multiple linked assets' do
- let!(:second_asset) { create(:image, viewable: product) }
- let!(:first_asset) { create(:image, viewable: product) }
+ let!(:second_asset) { create(:media, viewable: product) }
+ let!(:first_asset) { create(:media, viewable: product) }
before do
# Reverse position order: first_asset is created second but pinned to the
@@ -179,7 +179,7 @@ RSpec.describe Spree::Variant, type: :model do
end
context 'with only direct images (legacy path)' do
- let!(:direct_image) { create(:image, viewable: variant) }
+ let!(:direct_image) { create(:media, viewable: variant) }
it 'returns direct images from gallery_media' do
expect(variant.gallery_media.to_a).to eq([direct_image])
diff --git a/spree/core/spec/models/spree/variant_spec.rb b/spree/core/spec/models/spree/variant_spec.rb
index 0fb9516e59..c99c40a279 100644
--- a/spree/core/spec/models/spree/variant_spec.rb
+++ b/spree/core/spec/models/spree/variant_spec.rb
@@ -1454,7 +1454,7 @@ describe Spree::Variant, type: :model do
let(:variant) { create(:variant) }
context 'when variant has images' do
- let!(:image) { create(:image, position: 1, viewable: variant) }
+ let!(:image) { create(:media, position: 1, viewable: variant) }
it 'returns the first image' do
expect(variant.reload.primary_media).to eq(image)
@@ -1472,8 +1472,8 @@ describe Spree::Variant, type: :model do
let(:variant) { create(:variant) }
context 'with images pinned to the variant' do
- let!(:image1) { create(:image, position: 1, viewable: variant) }
- let!(:image2) { create(:image, position: 2, viewable: variant) }
+ let!(:image1) { create(:media, position: 1, viewable: variant) }
+ let!(:image2) { create(:media, position: 2, viewable: variant) }
it 'returns the second image' do
expect(variant.secondary_image).to eq(image2)
@@ -1481,8 +1481,8 @@ describe Spree::Variant, type: :model do
end
context 'with product-level media linked to the variant' do
- let!(:image1) { create(:image, position: 1, viewable: variant.product) }
- let!(:image2) { create(:image, position: 2, viewable: variant.product) }
+ let!(:image1) { create(:media, position: 1, viewable: variant.product) }
+ let!(:image2) { create(:media, position: 2, viewable: variant.product) }
before { variant.associated_media = [image1, image2] }
@@ -1494,9 +1494,9 @@ describe Spree::Variant, type: :model do
describe '#additional_images' do
let(:variant) { create(:variant) }
- let!(:image1) { create(:image, position: 1, viewable: variant) }
- let!(:image2) { create(:image, position: 2, viewable: variant) }
- let!(:image3) { create(:image, position: 3, viewable: variant) }
+ let!(:image1) { create(:media, position: 1, viewable: variant) }
+ let!(:image2) { create(:media, position: 2, viewable: variant) }
+ let!(:image3) { create(:media, position: 3, viewable: variant) }
it 'returns all images except the default' do
expect(variant.additional_images).to eq([image2, image3])
@@ -1513,7 +1513,7 @@ describe Spree::Variant, type: :model do
end
context 'when variant has images' do
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
it 'returns true' do
expect(variant.reload.has_images?).to be true
@@ -1521,7 +1521,7 @@ describe Spree::Variant, type: :model do
end
context 'when images are preloaded' do
- let!(:image) { create(:image, viewable: variant) }
+ let!(:image) { create(:media, viewable: variant) }
it 'uses loaded association' do
loaded_variant = Spree::Variant.includes(:images).find(variant.id)
diff --git a/spree/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
index 566ce2e37d..15b02c7782 100644
--- a/spree/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::CSV::ProductVariantPresenter do
let(:presenter) { described_class.new(product, variant, 0, properties, taxons, store, custom_fields) }
let(:default_publication) { product.product_publications.find_by(channel: store.default_channel) }
- let!(:variant_images) { create_list(:image, 3, viewable: variant) }
+ let!(:variant_images) { create_list(:media, 3, viewable: variant) }
describe '#call' do
subject { presenter.call }
diff --git a/spree/core/spec/presenters/spree/data_feeds/google_presenter_spec.rb b/spree/core/spec/presenters/spree/data_feeds/google_presenter_spec.rb
index 5244d21699..e96f1198ea 100644
--- a/spree/core/spec/presenters/spree/data_feeds/google_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/data_feeds/google_presenter_spec.rb
@@ -114,7 +114,7 @@ Machine washable.</g:description>')
let!(:variant) { nil }
before do
- product.default_variant.images << create(:image)
+ product.default_variant.images << create(:media)
end
it 'includes default variant in feed' do
diff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rb
index a72aef7ac8..836bd37eda 100644
--- a/spree/core/spec/services/spree/carts/update_spec.rb
+++ b/spree/core/spec/services/spree/carts/update_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe Carts::Update do
let(:store) { create(:store, supported_currencies: 'USD,EUR,GBP') }
let!(:store_stock_location) { create(:stock_location, store: store, backorderable_default: true) }
- let!(:store_delivery_method) { create(:shipping_method, store: store) }
+ let!(:store_delivery_method) { create(:delivery_method, store: store) }
let(:user) { create(:user) }
let(:cart) { create(:cart_with_line_items, customer: user, store: store, currency: 'USD') }
@@ -369,8 +369,8 @@ module Spree
# A guest's edit updates the address row in place, so only the
# fields a quote reads can tell a new destination from a correction.
context 'when a guest who chose a rate edits the address' do
- let!(:standard) { create(:shipping_method, name: 'Standard', store: store).tap { |method| method.calculator.update!(preferred_amount: 5) } }
- let!(:express) { create(:shipping_method, name: 'Express', store: store).tap { |method| method.calculator.update!(preferred_amount: 15) } }
+ let!(:standard) { create(:delivery_method, name: 'Standard', store: store).tap { |method| method.calculator.update!(preferred_amount: 5) } }
+ let!(:express) { create(:delivery_method, name: 'Express', store: store).tap { |method| method.calculator.update!(preferred_amount: 15) } }
let(:cart) do
create(:cart_with_line_items, store: store, customer: nil, email: '[email protected]',
ship_address: create(:address, country: country, state: state),
@@ -860,7 +860,7 @@ module Spree
let(:country) { Spree::Country.by_iso('US') }
let!(:us_state) { Spree::State.resolve(country.iso, 'NY') }
let!(:zone) { create(:zone) }
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
let(:address_params) do
{
first_name: 'Buyer', last_name: 'McGee',
@@ -935,7 +935,7 @@ module Spree
subject { described_class.call(cart: cart, params: params) }
let!(:cart) { create(:cart_with_line_items, store: store) }
- let!(:shipping_method) { create(:shipping_method) }
+ let!(:shipping_method) { create(:delivery_method) }
let(:country) { Spree::Country.by_iso('US') }
let!(:us_state) { Spree::State.resolve(country.iso, 'NY') }
let(:params) do
diff --git a/spree/core/spec/services/spree/checkout/advance_spec.rb b/spree/core/spec/services/spree/checkout/advance_spec.rb
index adb97d5b76..3232cfe895 100644
--- a/spree/core/spec/services/spree/checkout/advance_spec.rb
+++ b/spree/core/spec/services/spree/checkout/advance_spec.rb
@@ -34,7 +34,7 @@ module Spree
context 'with shipping method selection' do
let!(:other_method) do
- create(:shipping_method).tap do |delivery_method|
+ create(:delivery_method).tap do |delivery_method|
delivery_method.calculator.preferred_amount = 33
delivery_method.calculator.save!
end
diff --git a/spree/core/spec/services/spree/media/destroy_spec.rb b/spree/core/spec/services/spree/media/destroy_spec.rb
index f5e442f4bb..508249758c 100644
--- a/spree/core/spec/services/spree/media/destroy_spec.rb
+++ b/spree/core/spec/services/spree/media/destroy_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Spree::Media::Destroy do
let(:product) { create(:product) }
- let(:media) { create(:image, viewable: product) }
+ let(:media) { create(:media, viewable: product) }
it 'destroys the row' do
described_class.call(media: media)
@@ -99,7 +99,7 @@ describe Spree::Media::Destroy do
end
it 'leaves unrelated files alone' do
- unrelated = create(:image, viewable: create(:product))
+ unrelated = create(:media, viewable: create(:product))
described_class.call(media: media)
diff --git a/spree/core/spec/services/spree/media/usage_spec.rb b/spree/core/spec/services/spree/media/usage_spec.rb
index ee108c57c0..ef1c516e7c 100644
--- a/spree/core/spec/services/spree/media/usage_spec.rb
+++ b/spree/core/spec/services/spree/media/usage_spec.rb
@@ -4,7 +4,7 @@ describe Spree::Media::Usage do
subject(:usage) { described_class.call(media: media).value }
let(:product) { create(:product, name: 'Original product') }
- let(:media) { create(:image, viewable: product) }
+ let(:media) { create(:media, viewable: product) }
# The library shows a file, not a placement, so the product it sits on is
# part of the answer. Omitting it read as "not used anywhere" for a file that
@@ -18,7 +18,7 @@ describe Spree::Media::Usage do
end
it 'is empty for a file placed nowhere' do
- unplaced = create(:image, viewable: nil)
+ unplaced = create(:media, viewable: nil)
expect(described_class.call(media: unplaced).value).to be_empty
end
diff --git a/spree/core/spec/services/spree/orders/create_from_cart_spec.rb b/spree/core/spec/services/spree/orders/create_from_cart_spec.rb
index c63d2f783c..7fc0548c55 100644
--- a/spree/core/spec/services/spree/orders/create_from_cart_spec.rb
+++ b/spree/core/spec/services/spree/orders/create_from_cart_spec.rb
@@ -58,7 +58,7 @@ module Spree
end
it 'duplicates addresses instead of sharing rows' do
- create(:shipping_method) if Spree::DeliveryMethod.none?
+ create(:delivery_method) if Spree::DeliveryMethod.none?
country = Spree::Country.by_iso('US')
cart.update!(
ship_address: create(:address, country: country, state: country.states.first),
diff --git a/spree/core/spec/services/spree/orders/create_spec.rb b/spree/core/spec/services/spree/orders/create_spec.rb
index 95b5ce3a91..0b9470efe2 100644
--- a/spree/core/spec/services/spree/orders/create_spec.rb
+++ b/spree/core/spec/services/spree/orders/create_spec.rb
@@ -10,7 +10,7 @@ module Spree
let(:state) { country.states.first || create(:state, country: country) }
let!(:zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |sm|
+ create(:delivery_method).tap do |sm|
sm.calculator.preferred_amount = 5
sm.calculator.save
end
diff --git a/spree/core/spec/services/spree/orders/update_spec.rb b/spree/core/spec/services/spree/orders/update_spec.rb
index 8ea3e23732..a1923ac640 100644
--- a/spree/core/spec/services/spree/orders/update_spec.rb
+++ b/spree/core/spec/services/spree/orders/update_spec.rb
@@ -16,7 +16,7 @@ module Spree
let!(:zone) { create(:zone) }
let!(:other_zone) { create(:zone) }
let!(:shipping_method) do
- create(:shipping_method).tap do |sm|
+ create(:delivery_method).tap do |sm|
sm.calculator.preferred_amount = 5
sm.calculator.save
end
@@ -210,7 +210,7 @@ module Spree
context 'when an admin chose a rate' do
let(:initial_address) { create(:address, customer: user, country: country, state: state) }
let!(:express) do
- create(:shipping_method, name: 'Express').tap do |method|
+ create(:delivery_method, name: 'Express').tap do |method|
method.calculator.preferred_amount = 15
method.calculator.save
end
diff --git a/spree/core/spec/services/spree/purchases/amount_due_at_checkout_spec.rb b/spree/core/spec/services/spree/purchases/amount_due_at_checkout_spec.rb
index a2750a7e5c..c6be5d29d9 100644
--- a/spree/core/spec/services/spree/purchases/amount_due_at_checkout_spec.rb
+++ b/spree/core/spec/services/spree/purchases/amount_due_at_checkout_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Spree::Purchases::AmountDueAtCheckout do
address = create(:address)
cart.update!(ship_address: address, bill_address: address)
create(:line_item, cart: cart, order: nil, price: 100, quantity: 1)
- create(:shipment, cart: cart, order: nil)
+ create(:fulfillment, cart: cart, order: nil)
Spree::Carts::RecalculateTotals.call(cart: cart.reload)
end
end
diff --git a/spree/core/spec/services/spree/store_credits/remove_spec.rb b/spree/core/spec/services/spree/store_credits/remove_spec.rb
index f483a85ae5..8fed15d9eb 100644
--- a/spree/core/spec/services/spree/store_credits/remove_spec.rb
+++ b/spree/core/spec/services/spree/store_credits/remove_spec.rb
@@ -13,7 +13,7 @@ describe Spree::StoreCredits::Remove, type: :service do
before do
create(:store_credit_payment_method)
- Spree::Checkout::AddStoreCredit.call(order: order)
+ Spree::StoreCredits::Apply.call(order: order)
end
it { expect { subject }.to change { order.payments.checkout.store_credits.count }.from(1).to(0) }
diff --git a/spree/core/spec/workflows/spree/fulfillments/create_spec.rb b/spree/core/spec/workflows/spree/fulfillments/create_spec.rb
index d58abd3a4b..e69f87b211 100644
--- a/spree/core/spec/workflows/spree/fulfillments/create_spec.rb
+++ b/spree/core/spec/workflows/spree/fulfillments/create_spec.rb
@@ -49,7 +49,7 @@ module Spree
describe 'moving all unfulfilled items (items omitted)' do
it 'creates a fulfillment holding every unshipped unit and destroys the drained source' do
expect(execute.success?).to eq(true)
- expect(fulfillment).to be_kind_of(Spree::Shipment)
+ expect(fulfillment).to be_kind_of(Spree::Fulfillment)
expect(order.reload.shipments).to contain_exactly(fulfillment)
expect(fulfillment.inventory_units.sum(:quantity)).to eq(line_items.sum(&:quantity))
end
@@ -148,7 +148,7 @@ module Spree
end
describe 'delivery method' do
- let(:delivery_method) { create(:shipping_method) }
+ let(:delivery_method) { create(:delivery_method) }
let(:params) { { order: order, stock_location: stock_location, delivery_method: delivery_method } }
it 'keeps the delivery method selected through the rate refresh' do
@@ -165,7 +165,7 @@ module Spree
end
it 'inherits the first non-nil method when draining sources with different carriers' do
- other_method = create(:shipping_method)
+ other_method = create(:delivery_method)
second_source = order.shipments.create!(stock_location: stock_location)
second_source.add_shipping_method(other_method, true)
line_items.last.inventory_units.update_all(shipment_id: second_source.id)
@@ -203,7 +203,7 @@ module Spree
end
it 'prices the carrier rate at the given cost' do
- params[:delivery_method] = create(:shipping_method)
+ params[:delivery_method] = create(:delivery_method)
expect(execute.success?).to eq(true)
expect(fulfillment.selected_shipping_rate.cost).to eq(BigDecimal('7.42'))
@@ -296,7 +296,7 @@ module Spree
end
it 'freezes the inherited cost and carrier, keeping the order total unchanged' do
- delivery_method = create(:shipping_method)
+ delivery_method = create(:delivery_method)
params[:delivery_method] = delivery_method
# Settle factory-persisted totals before measuring invariance.
diff --git a/spree/core/spec/workflows/spree/orders/complete_spec.rb b/spree/core/spec/workflows/spree/orders/complete_spec.rb
index 54c8602b6d..23a99fa13d 100644
--- a/spree/core/spec/workflows/spree/orders/complete_spec.rb
+++ b/spree/core/spec/workflows/spree/orders/complete_spec.rb
@@ -100,7 +100,7 @@ module Spree
end
it 'leaves the fulfillment unfulfilled until someone hands it over' do
- Spree::Shipment.create(order: order, stock_location: create(:stock_location))
+ Spree::Fulfillment.create(order: order, stock_location: create(:stock_location))
order.shipments.reload
allow(order).to receive_messages(paid?: true, complete?: true)
@@ -112,7 +112,7 @@ module Spree
it 'does not sell inventory units if track_inventory_levels is false' do
stub_store_preferences(track_inventory_levels: false)
- expect(Spree::InventoryUnit).not_to receive(:sell_units)
+ expect(Spree::FulfillmentItem).not_to receive(:sell_units)
described_class.call(order: order)
end
diff --git a/spree/core/spec/workflows/spree/products/status_transitions_spec.rb b/spree/core/spec/workflows/spree/products/status_transitions_spec.rb
index 5b89a2bd35..1bbe3ca5ca 100644
--- a/spree/core/spec/workflows/spree/products/status_transitions_spec.rb
+++ b/spree/core/spec/workflows/spree/products/status_transitions_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe 'Spree::Products nested attributes' do
describe 'media given as a library file' do
let(:product) { create(:product, store: store) }
- let(:library_file) { create(:image, viewable: create(:product, store: store)) }
+ let(:library_file) { create(:media, viewable: create(:product, store: store)) }
it 'places a copy sharing the source file' do
expect {
@@ -108,7 +108,7 @@ RSpec.describe 'Spree::Products nested attributes' do
# The same tenancy rule the media endpoint enforces with a 404.
it 'ignores a file from another store' do
- foreign = create(:image, viewable: create(:product, store: create(:store)))
+ foreign = create(:media, viewable: create(:product, store: create(:store)))
expect {
Spree.product_update_workflow.call(
diff --git a/spree/emails/spec/models/spree/shipment_spec.rb b/spree/emails/spec/models/spree/shipment_spec.rb
index a822d02fba..525727d191 100644
--- a/spree/emails/spec/models/spree/shipment_spec.rb
+++ b/spree/emails/spec/models/spree/shipment_spec.rb
@@ -1,9 +1,9 @@
require 'spec_helper'
-describe Spree::Shipment, type: :model do
+describe Spree::Fulfillment, type: :model do
let(:order) { create(:order) }
- let(:shipping_method) { create(:shipping_method, name: 'UPS') }
- let(:shipment) { create(:shipment, cost: 1, status: 'unfulfilled', stock_location: create(:stock_location), order: order) }
+ let(:shipping_method) { create(:delivery_method, name: 'UPS') }
+ let(:shipment) { create(:fulfillment, cost: 1, status: 'unfulfilled', stock_location: create(:stock_location), order: order) }
before do
allow(order).to receive_messages backordered?: false,
diff --git a/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb b/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb
index fd20e58f17..f0805641e5 100644
--- a/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb
+++ b/spree/providers/easypost/spec/models/spree_easypost/delivery_rate_provider_spec.rb
@@ -106,7 +106,7 @@ RSpec.describe SpreeEasyPost::DeliveryRateProvider do
it 'quotes for a cart-owned package against the cart ship address' do
cart = create(:cart, store: store, ship_address: create(:address))
create(:line_item, cart: cart, order: nil)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
sent_to_address = nil
allow(shipment_service).to receive(:create) do |params|
@@ -125,7 +125,7 @@ RSpec.describe SpreeEasyPost::DeliveryRateProvider do
it 'declines to quote when the owner has no ship address yet' do
cart = create(:cart, store: store, ship_address: nil)
create(:line_item, cart: cart, order: nil)
- fulfillment = create(:shipment, cart: cart, order: nil, stock_location: create(:stock_location))
+ fulfillment = create(:fulfillment, cart: cart, order: nil, stock_location: create(:stock_location))
expect(provider.estimates(fulfillment.to_package)).to eq([])
end