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.

Update specs for the user->customer rename across core and api

Łukasz Adamczyke39c96a291b1
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/custom_fields_polymorphic_parent_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/custom_fields_polymorphic_parent_spec.rb
index 164bb43c00..7f45909a4d 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/custom_fields_polymorphic_parent_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/custom_fields_polymorphic_parent_spec.rb
@@ -50,10 +50,10 @@ RSpec.describe Spree::Api::V3::Admin::CustomFieldsController, type: :controller
end
# Simulates the dev-mode class-reload condition where
- # `enabled_resources.include?(Spree.user_class)` returns false because the
+ # `enabled_resources.include?(Spree.customer_class)` returns false because the
# cached class reference goes stale after Zeitwerk reloads. The customer
# route must still resolve in that case.
- describe 'when enabled_resources does not contain Spree.user_class' do
+ describe 'when enabled_resources does not contain Spree.customer_class' do
let!(:parent) { create(:user) }
let!(:definition) { create(:metafield_definition, :for_user) }
let!(:custom_field) do
@@ -63,7 +63,7 @@ RSpec.describe Spree::Api::V3::Admin::CustomFieldsController, type: :controller
before do
@original_resources = Rails.application.config.spree.metafields.enabled_resources
- Rails.application.config.spree.metafields.enabled_resources = @original_resources - [Spree.user_class]
+ Rails.application.config.spree.metafields.enabled_resources = @original_resources - [Spree.customer_class]
end
after { Rails.application.config.spree.metafields.enabled_resources = @original_resources }
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 bc27cfef59..fdaca091a0 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
@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::AddressesController, type: :con
include_context 'API v3 Admin authenticated'
let(:customer) { create(:user) }
- let!(:address) { create(:address, user: customer) }
+ let!(:address) { create(:address, customer: customer) }
before { request.headers.merge!(headers) }
@@ -96,7 +96,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::AddressesController, type: :con
end
it 'rotates the default billing flag' do
- other = create(:address, user: customer)
+ other = create(:address, customer: customer)
customer.update!(bill_address_id: other.id)
target_id = address.id
@@ -107,7 +107,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::AddressesController, type: :con
end
context 'when the address is referenced by a completed order' do
- let!(:order) { create(:completed_order_with_totals, user: customer, ship_address: address) }
+ let!(:order) { create(:completed_order_with_totals, customer: customer, ship_address: address) }
it 'edits a copy instead of mutating the historical order address in place' do
original_id = address.id
@@ -177,13 +177,13 @@ RSpec.describe Spree::Api::V3::Admin::Customers::AddressesController, type: :con
end
context 'as the ship address' do
- let!(:order) { create(:completed_order_with_totals, user: customer, ship_address: address) }
+ let!(:order) { create(:completed_order_with_totals, customer: customer, ship_address: address) }
it_behaves_like 'soft-deletes the referenced address', :ship_address
end
context 'as the bill address' do
- let!(:order) { create(:completed_order_with_totals, user: customer, bill_address: address) }
+ let!(:order) { create(:completed_order_with_totals, customer: customer, bill_address: address) }
it_behaves_like 'soft-deletes the referenced address', :bill_address
end
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
index 62a1279212..93bc341efd 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::CreditCardsController, type: :c
let(:customer) { create(:user) }
let(:payment_method) { create(:credit_card_payment_method) }
- let!(:credit_card) { create(:credit_card, user: customer, payment_method: payment_method) }
+ let!(:credit_card) { create(:credit_card, customer: customer, payment_method: payment_method) }
before { request.headers.merge!(headers) }
@@ -73,7 +73,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::CreditCardsController, type: :c
context 'when card belongs to a different customer (security check)' do
let(:other_customer) { create(:user) }
- let!(:other_card) { create(:credit_card, user: other_customer, payment_method: payment_method) }
+ let!(:other_card) { create(:credit_card, customer: other_customer, payment_method: payment_method) }
it 'returns 404 — cannot read another customer\'s cards' do
get :show, params: { customer_id: customer.prefixed_id, id: other_card.prefixed_id }, as: :json
@@ -86,7 +86,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::CreditCardsController, type: :c
describe 'cross-store isolation' do
let(:other_store) { create(:store) }
let(:other_payment_method) { create(:credit_card_payment_method, store: other_store) }
- let!(:foreign_card) { create(:credit_card, user: customer, payment_method: other_payment_method) }
+ let!(:foreign_card) { create(:credit_card, customer: customer, payment_method: other_payment_method) }
it 'excludes cards from other stores in the index' do
get :index, params: { customer_id: customer.prefixed_id }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers/store_credits_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers/store_credits_controller_spec.rb
index 216b17ab29..8d13913bb3 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers/store_credits_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers/store_credits_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::StoreCreditsController, type: :
let(:customer) { create(:user) }
let(:category) { create(:store_credit_category) }
- let!(:store_credit) { create(:store_credit, user: customer, store: store, amount: 50.00, category: category) }
+ let!(:store_credit) { create(:store_credit, customer: customer, store: store, amount: 50.00, category: category) }
before { request.headers.merge!(headers) }
@@ -52,7 +52,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::StoreCreditsController, type: :
let(:custom_permission_set) do
Class.new(Spree::PermissionSets::Base) do
def activate!
- can [:read, :admin], Spree.user_class
+ can [:read, :admin], Spree.customer_class
can :manage, Spree::StoreCredit
end
end
@@ -184,7 +184,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::StoreCreditsController, type: :
describe 'cross-store isolation' do
let(:other_store) { create(:store) }
let!(:foreign_credit) do
- create(:store_credit, user: customer, store: other_store, amount: 99.00, category: category)
+ create(:store_credit, customer: customer, store: other_store, amount: 99.00, category: category)
end
it 'excludes other stores\' credits from the index' do
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
index b43e7fe90b..e8876d6992 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
@@ -69,10 +69,10 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
end
it 'creates a customer' do
- expect { post :create, params: create_params, as: :json }.to change(Spree.user_class, :count).by(1)
+ expect { post :create, params: create_params, as: :json }.to change(Spree.customer_class, :count).by(1)
expect(response).to have_http_status(:created)
- created = Spree.user_class.find_by_prefix_id(json_response['id'])
+ created = Spree.customer_class.find_by_prefix_id(json_response['id'])
expect(created.email).to eq('[email protected]')
expect(created.first_name).to eq('Sam')
expect(created.tag_list).to contain_exactly('wholesale', 'priority')
@@ -98,7 +98,7 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
it 'creates the customer' do
expect { post :create, params: no_password_params, as: :json }.
- to change(Spree.user_class, :count).by(1)
+ to change(Spree.customer_class, :count).by(1)
expect(response).to have_http_status(:created)
end
@@ -106,8 +106,8 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
it 'leaves the customer with no usable credential' do
post :create, params: no_password_params, as: :json
- created = Spree.user_class.find_by_prefix_id(json_response['id'])
- expect(created.encrypted_password).to be_blank
+ created = Spree.customer_class.find_by_prefix_id(json_response['id'])
+ expect(created.password_digest).to be_blank
end
end
end
@@ -162,14 +162,14 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
# customer's ability to log in.
context 'without password' do
it 'updates profile fields without touching the existing credential' do
- original_digest = customer.encrypted_password
+ original_digest = customer.password_digest
expect(original_digest).to be_present
patch :update, params: { id: customer.prefixed_id, first_name: 'Updated' }, as: :json
expect(response).to have_http_status(:ok)
expect(customer.reload.first_name).to eq('Updated')
- expect(customer.encrypted_password).to eq(original_digest)
+ expect(customer.password_digest).to eq(original_digest)
end
end
end
@@ -180,14 +180,14 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
expect {
delete :destroy, params: { id: target.prefixed_id }, as: :json
- }.to change(Spree.user_class, :count).by(-1)
+ }.to change(Spree.customer_class, :count).by(-1)
expect(response).to have_http_status(:no_content)
end
context 'when customer has completed orders' do
let(:target) { create(:user) }
- before { create(:completed_order_with_totals, user: target, store: store) }
+ before { create(:completed_order_with_totals, customer: target, store: store) }
it 'returns 422 with error' do
delete :destroy, params: { id: target.prefixed_id }, as: :json
@@ -295,7 +295,7 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
expect(alice.reload.tag_list.count { |t| t == 'vip' }).to eq(1)
end
- # Users aren't store-scoped (`Spree.user_class.for_store` is a no-op by
+ # Users aren't store-scoped (`Spree.customer_class.for_store` is a no-op by
# design — admins are users too), so cross-store filtering happens at
# the ability layer, not the relation. Bulk endpoints follow suit and
# apply tags to any user the admin can update.
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/gift_cards_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/gift_cards_controller_spec.rb
index 690cd9eacf..286b25677d 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/gift_cards_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/gift_cards_controller_spec.rb
@@ -69,8 +69,8 @@ RSpec.describe Spree::Api::V3::Admin::Orders::GiftCardsController, type: :contro
context 'when the order already has store credit applied (mutual exclusion)' do
let(:customer) { create(:user) }
- let!(:order) { create(:order_with_line_items, store: store, user: customer) }
- let!(:store_credit) { create(:store_credit, store: store, user: customer, amount: 100) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: customer) }
+ let!(:store_credit) { create(:store_credit, store: store, customer: customer, amount: 100) }
before { Spree.checkout_add_store_credit_service.call(order: order) }
@@ -93,7 +93,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::GiftCardsController, type: :contro
context 'when gift card is restricted to a specific user but order has none' do
let(:gift_card_owner) { create(:user) }
- let!(:gift_card) { create(:gift_card, store: store, user: gift_card_owner) }
+ let!(:gift_card) { create(:gift_card, store: store, customer: gift_card_owner) }
it 'returns 422' do
post :create, params: { order_id: order.prefixed_id, code: gift_card.code }, as: :json
@@ -105,8 +105,8 @@ RSpec.describe Spree::Api::V3::Admin::Orders::GiftCardsController, type: :contro
context 'when gift card is restricted to a different user than the order' do
let(:gift_card_owner) { create(:user) }
let(:order_customer) { create(:user) }
- let!(:order) { create(:order_with_line_items, store: store, user: order_customer) }
- let!(:gift_card) { create(:gift_card, store: store, user: gift_card_owner) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: order_customer) }
+ let!(:gift_card) { create(:gift_card, store: store, customer: gift_card_owner) }
it 'returns 422' do
post :create, params: { order_id: order.prefixed_id, code: gift_card.code }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
index 14fc26e7a4..b8c5ef5f4d 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
@@ -96,9 +96,9 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :control
context 'off-session charge against a saved credit card (source_id)' do
let(:customer) { create(:user) }
- let(:order) { create(:completed_order_with_totals, store: store, user: customer) }
+ let(:order) { create(:completed_order_with_totals, store: store, customer: customer) }
let(:credit_card_method) { create(:credit_card_payment_method) }
- let(:saved_card) { create(:credit_card, user: customer, payment_method: credit_card_method) }
+ let(:saved_card) { create(:credit_card, customer: customer, payment_method: credit_card_method) }
it 'attaches the saved card as the payment source' do
post :create, params: {
@@ -116,7 +116,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :control
context 'when source belongs to a different customer' do
let(:other_customer) { create(:user) }
- let(:other_card) { create(:credit_card, user: other_customer, payment_method: credit_card_method) }
+ let(:other_card) { create(:credit_card, customer: other_customer, payment_method: credit_card_method) }
it 'returns 404 to prevent cross-customer use' do
post :create, params: {
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/store_credits_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/store_credits_controller_spec.rb
index 8836d1874a..7e837ad59d 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/store_credits_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/store_credits_controller_spec.rb
@@ -6,8 +6,8 @@ RSpec.describe Spree::Api::V3::Admin::Orders::StoreCreditsController, type: :con
include_context 'API v3 Admin authenticated'
let(:customer) { create(:user) }
- let!(:order) { create(:order_with_line_items, store: store, user: customer) }
- let!(:store_credit) { create(:store_credit, store: store, user: customer, amount: 50.00) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: customer) }
+ let!(:store_credit) { create(:store_credit, store: store, customer: customer, amount: 50.00) }
let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
before { request.headers.merge!(headers) }
@@ -53,7 +53,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::StoreCreditsController, type: :con
end
context 'when the order has no customer' do
- let!(:order) { create(:order_with_line_items, store: store, user: nil) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: nil) }
it 'returns 422 (no customer means no store credit)' do
post :create, params: { order_id: order.prefixed_id }, as: :json
@@ -64,7 +64,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::StoreCreditsController, type: :con
context 'when order belongs to a different store' do
let!(:other_store) { create(:store) }
- let!(:order) { create(:order_with_line_items, store: other_store, user: customer) }
+ let!(:order) { create(:order_with_line_items, store: other_store, customer: customer) }
it 'returns 404' do
post :create, params: { order_id: order.prefixed_id }, as: :json
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 93e59a664a..98693f60b2 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
@@ -74,10 +74,10 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
# callback resets `email` from `user.email`. Pass `user: nil` so our
# explicit email sticks for the email-match assertion.
let!(:matching_order) do
- create(:order, store: store, state: 'cart', user: nil, email: '[email protected]')
+ create(:order, store: store, state: 'cart', customer: nil, email: '[email protected]')
end
let!(:non_matching_order) do
- create(:order, store: store, state: 'cart', user: nil, email: '[email protected]')
+ create(:order, store: store, state: 'cart', customer: nil, email: '[email protected]')
end
it 'matches by order number substring' do
@@ -416,7 +416,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
context 'with customer reassignment via customer_id' do
let(:original_customer) { create(:user) }
let(:new_customer) { create(:user) }
- let!(:order) { create(:order, store: store, state: 'cart', user: original_customer) }
+ let!(:order) { create(:order, store: store, state: 'cart', customer: original_customer) }
it 'reassigns to the new customer' do
patch :update, params: { id: order.prefixed_id, customer_id: new_customer.prefixed_id }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/tags_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/tags_controller_spec.rb
index 450d8425e7..4e571e26ba 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/tags_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/tags_controller_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe Spree::Api::V3::Admin::TagsController, type: :controller do
let(:api_key) { create(:api_key, :secret, store: store, scopes: ['read_products']) }
it 'forbids listing customer tags' do
- get :index, params: { taggable_type: Spree.user_class.to_s }, as: :json
+ get :index, params: { taggable_type: Spree.customer_class.to_s }, as: :json
expect(response).to have_http_status(:forbidden)
expect(json_response['error']['details']['required_scope']).to eq('read_customers')
@@ -78,7 +78,7 @@ RSpec.describe Spree::Api::V3::Admin::TagsController, type: :controller do
let(:api_key) { create(:api_key, :secret, store: store, scopes: ['read_customers']) }
it 'allows listing customer tags' do
- get :index, params: { taggable_type: Spree.user_class.to_s }, as: :json
+ get :index, params: { taggable_type: Spree.customer_class.to_s }, as: :json
expect(response).to have_http_status(:ok)
expect(json_response['data'].map { |t| t['name'] }).to include('vip')
diff --git a/spree/api/spec/controllers/spree/api/v3/store/auth_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/auth_controller_spec.rb
index 0d068688a3..967afba131 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/auth_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/auth_controller_spec.rb
@@ -136,7 +136,7 @@ RSpec.describe Spree::Api::V3::Store::AuthController, type: :controller do
expect {
post :create, params: { provider: 'external_idp', token: 'valid-jwt' }
- }.not_to change(Spree.user_class, :count)
+ }.not_to change(Spree.customer_class, :count)
expect(json_response['user']['id']).to eq(first_user_id)
end
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
index 247a4f110b..6224befff9 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/discount_codes_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::DiscountCodesController, type: :con
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -90,7 +90,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::DiscountCodesController, type: :con
end
context 'with guest spree token' do
- let(:guest_order) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_order) { create(:order_with_line_items, store: store, customer: nil) }
let!(:promotion) { create(:promotion_with_item_adjustment, code: 'GUEST10') }
before do
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 ed35070c4c..ca58219228 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
@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
include_context 'API v3 Store'
let!(:order) do
- create(:order_with_line_items, user: user, store: store, state: 'delivery').tap do |o|
+ create(:order_with_line_items, customer: user, store: store, state: 'delivery').tap do |o|
o.create_proposed_shipments
o.shipments.first.refresh_rates
o.reload
@@ -82,7 +82,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::FulfillmentsController, type: :cont
it 'does not advance from payment to complete' do
create(:store_credit_payment_method)
- credit = create(:store_credit, user: order.user, store: store, amount: order.total)
+ credit = create(:store_credit, customer: order.user, store: store, amount: order.total)
order.payments.create!(
source: credit,
payment_method: Spree::PaymentMethod::StoreCredit.first,
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
index e4f5c1f590..776061cf1a 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/gift_card_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::GiftCardsController, type: :control
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -54,7 +54,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::GiftCardsController, type: :control
end
context 'with guest spree token' do
- let(:guest_order) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_order) { create(:order_with_line_items, store: store, customer: nil) }
before do
request.headers['Authorization'] = nil
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
index 2a041e86dd..b76e8cd36f 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/items_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::ItemsController, type: :controller
let(:product) { create(:product) }
let(:variant) { create(:variant, product: product) }
- let!(:order) { create(:order, user: user, store: store) }
+ let!(:order) { create(:order, customer: user, store: store) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -54,7 +54,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::ItemsController, type: :controller
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order, user: nil, store: store) }
+ let(:guest_order) { create(:order, customer: nil, store: store) }
before { request.headers['Authorization'] = nil }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
index 963a9aa073..6617b7292d 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
include_context 'API v3 Store'
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'payment') }
let(:payment_method) { create(:bogus_payment_method) }
let!(:payment_session) do
create(:bogus_payment_session,
@@ -43,7 +43,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order_with_line_items, user: nil, store: store, state: 'payment') }
+ let(:guest_order) { create(:order_with_line_items, customer: nil, store: store, state: 'payment') }
before { request.headers['Authorization'] = nil }
@@ -97,7 +97,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
it 'returns not found for payment session from another order' do
other_user = create(:user)
- other_order = create(:order_with_line_items, user: other_user, store: store, state: 'payment')
+ other_order = create(:order_with_line_items, customer: other_user, store: store, state: 'payment')
other_session = create(:bogus_payment_session,
order: other_order,
payment_method: payment_method)
@@ -109,7 +109,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
it 'returns not found for external_id from another order' do
other_user = create(:user)
- other_order = create(:order_with_line_items, user: other_user, store: store, state: 'payment')
+ other_order = create(:order_with_line_items, customer: other_user, store: store, state: 'payment')
other_session = create(:bogus_payment_session,
order: other_order,
payment_method: payment_method)
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
index 8b1c36aae5..d8503bdf38 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controll
include_context 'API v3 Store'
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'payment') }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -69,7 +69,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controll
end
context 'with spree token (guest)' do
- let(:guest_order) { create(:order_with_line_items, user: nil, store: store, state: 'payment') }
+ let(:guest_order) { create(:order_with_line_items, customer: nil, store: store, state: 'payment') }
before { request.headers['Authorization'] = nil }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
index f63dbf91d2..3f015eb0a0 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/store_credits_controller_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe Spree::Api::V3::Store::Carts::StoreCreditsController, type: :cont
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, user: user, store: store, state: 'payment') }
+ let!(:order) { create(:order_with_line_items, customer: user, store: store, state: 'payment') }
let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
- let!(:store_credit) { create(:store_credit, user: user, store: store, amount: 100) }
+ let!(:store_credit) { create(:store_credit, customer: user, store: store, amount: 100) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -25,7 +25,7 @@ RSpec.describe Spree::Api::V3::Store::Carts::StoreCreditsController, type: :cont
context 'without available store credit' do
let(:user_without_credit) { create(:user) }
- let!(:order_without_credit) { create(:order_with_line_items, user: user_without_credit, store: store, state: 'payment') }
+ let!(:order_without_credit) { create(:order_with_line_items, customer: user_without_credit, store: store, state: 'payment') }
it 'returns an error' do
jwt = Spree::Api::V3::TestingSupport.generate_jwt(user_without_credit)
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 f7812464a8..1da6aeb7c9 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
@@ -23,8 +23,8 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
request.headers['Authorization'] = "Bearer #{jwt_token}"
end
- let!(:user_cart1) { create(:order, user: user, store: store) }
- let!(:user_cart2) { create(:order, user: user, store: store) }
+ let!(:user_cart1) { create(:order, customer: user, store: store) }
+ let!(:user_cart2) { create(:order, customer: user, store: store) }
it 'returns the current users carts' do
get :index
@@ -37,7 +37,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'scopes carts to the request channel — other channels never leak into a surface' do
wholesale = create(:channel, store: store, code: 'wholesale')
- wholesale_cart = create(:order, user: user, store: store, channel: wholesale)
+ wholesale_cart = create(:order, customer: user, store: store, channel: wholesale)
get :index
@@ -77,7 +77,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'does not return other users carts' do
other_user = create(:user)
- create(:order, user: other_user, store: store)
+ create(:order, customer: other_user, store: store)
get :index
@@ -86,7 +86,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'does not return guest carts' do
- create(:order, user: nil, store: store)
+ create(:order, customer: nil, store: store)
get :index
@@ -95,7 +95,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'does not return completed orders' do
- create(:completed_order_with_totals, user: user, store: store)
+ create(:completed_order_with_totals, customer: user, store: store)
get :index
@@ -105,7 +105,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'does not return carts from other stores' do
other_store = create(:store)
- create(:order, user: user, store: other_store)
+ create(:order, customer: user, store: other_store)
get :index
@@ -351,7 +351,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
request.headers['Authorization'] = "Bearer #{jwt_token}"
end
- let!(:cart) { create(:order_with_line_items, user: user, store: store) }
+ let!(:cart) { create(:order_with_line_items, customer: user, store: store) }
it 'returns the users cart' do
get :show, params: { id: cart.prefixed_id }
@@ -362,7 +362,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns forbidden when cart belongs to another user' do
other_user = create(:user)
- other_cart = create(:order_with_line_items, user: other_user, store: store)
+ other_cart = create(:order_with_line_items, customer: other_user, store: store)
get :show, params: { id: other_cart.prefixed_id }
@@ -483,7 +483,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
context 'auto-advance' do
let(:user) { create(:user_with_addresses) }
- let(:cart) { create(:order_with_line_items, store: store, user: user) }
+ let(:cart) { create(:order_with_line_items, store: store, customer: user) }
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
let!(:zone) { create(:zone, zone_members: [Spree::ZoneMember.new(zoneable: country)]) }
@@ -494,7 +494,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'generates shipments when address is present but shipments are empty' do
- address = create(:address, user: user, country: country, state: us_state)
+ address = create(:address, customer: user, country: country, state: us_state)
cart.update!(email: '[email protected]', ship_address: address)
cart.shipments.delete_all
cart.update_column(:state, 'address')
@@ -509,7 +509,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'surfaces a delivery_unavailable warning when the cart cannot be delivered' do
- address = create(:address, user: user, country: country, state: us_state)
+ address = create(:address, customer: user, country: country, state: us_state)
cart.update!(email: '[email protected]', ship_address: address)
cart.shipments.delete_all
cart.update_column(:state, 'address')
@@ -571,7 +571,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
describe 'PATCH #update' do
let(:user) { create(:user_with_addresses) }
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:us_state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
let!(:zone) { create(:zone, zone_members: [Spree::ZoneMember.new(zoneable: country)]) }
@@ -583,7 +583,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'accepts shipping_address_id to use an existing address' do
order.update!(email: '[email protected]')
- existing_address = user.addresses.first || create(:address, user: user, country: country, state: us_state)
+ existing_address = user.addresses.first || create(:address, customer: user, country: country, state: us_state)
patch :update, params: { id: order.prefixed_id, shipping_address_id: existing_address.prefixed_id }
@@ -592,7 +592,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'when a line item cannot be delivered to the address' do
- let(:address) { user.addresses.first || create(:address, user: user, country: country, state: us_state) }
+ let(:address) { user.addresses.first || create(:address, customer: user, country: country, state: us_state) }
let(:unserved_category) { create(:shipping_category, name: 'Unserved') }
before do
@@ -738,7 +738,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
describe 'PATCH #associate' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil, email: '[email protected]') }
+ let(:guest_cart) { create(:order_with_line_items, store: store, customer: nil, email: '[email protected]') }
context 'with JWT authentication' do
before do
@@ -819,7 +819,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
it 'returns not found for completed order' do
- completed_order = create(:completed_order_with_totals, store: store, user: nil)
+ completed_order = create(:completed_order_with_totals, store: store, customer: nil)
patch :associate, params: { id: completed_order.prefixed_id }
@@ -828,7 +828,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
it 'returns not found when cart belongs to another user' do
other_user = create(:user)
- other_user_cart = create(:order_with_line_items, store: store, user: other_user)
+ other_user_cart = create(:order_with_line_items, store: store, customer: other_user)
patch :associate, params: { id: other_user_cart.prefixed_id }
@@ -899,7 +899,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'with JWT authentication' do
- let!(:user_cart) { create(:order_with_line_items, user: user, store: store) }
+ let!(:user_cart) { create(:order_with_line_items, customer: user, store: store) }
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
@@ -914,7 +914,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
describe 'POST #complete' do
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'confirm') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'confirm') }
before do
request.headers['Authorization'] = "Bearer #{jwt_token}"
@@ -951,7 +951,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'when order cannot be completed' do
- let(:incomplete_order) { create(:order_with_line_items, user: user, store: store, state: 'address') }
+ let(:incomplete_order) { create(:order_with_line_items, customer: user, store: store, state: 'address') }
it 'returns unprocessable entity with cart_cannot_complete code' do
post :complete, params: { id: incomplete_order.prefixed_id }
@@ -962,7 +962,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
end
context 'when order was already completed by the gateway' do
- let(:completed_order) { create(:completed_order_with_totals, user: user, store: store) }
+ let(:completed_order) { create(:completed_order_with_totals, customer: user, store: store) }
it 'returns the completed order via JWT' do
post :complete, params: { id: completed_order.prefixed_id }
@@ -992,7 +992,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
context 'with guest cart token' do
let(:guest_order) do
- order = create(:order_with_line_items, user: nil, store: store, email: '[email protected]')
+ order = create(:order_with_line_items, customer: nil, store: store, email: '[email protected]')
order.update_column(:state, 'confirm')
order
end
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 ac2565d97a..2fde76be29 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
@@ -7,7 +7,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
let(:country) { create(:country) }
let(:state) { create(:state, country: country) }
- let!(:address) { create(:address, user: user, country: country, state: state) }
+ let!(:address) { create(:address, customer: user, country: country, state: state) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -31,7 +31,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
it 'only returns addresses belonging to the current user' do
other_user = create(:user)
- other_address = create(:address, user: other_user)
+ other_address = create(:address, customer: other_user)
get :index
@@ -67,7 +67,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
context 'when address belongs to another user' do
let(:other_user) { create(:user) }
- let(:other_address) { create(:address, user: other_user) }
+ let(:other_address) { create(:address, customer: other_user) }
it 'returns not found' do
get :show, params: { id: other_address.prefixed_id }
@@ -153,7 +153,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
context 'when address belongs to another user' do
let(:other_user) { create(:user) }
- let(:other_address) { create(:address, user: other_user) }
+ let(:other_address) { create(:address, customer: other_user) }
it 'returns not found' do
patch :update, params: { id: other_address.prefixed_id, first_name: 'Hacker' }
@@ -317,13 +317,13 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
end
context 'as the ship address' do
- let!(:order) { create(:completed_order_with_totals, user: user, ship_address: address) }
+ let!(:order) { create(:completed_order_with_totals, customer: user, ship_address: address) }
it_behaves_like 'soft-deletes the referenced address', :ship_address
end
context 'as the bill address' do
- let!(:order) { create(:completed_order_with_totals, user: user, bill_address: address) }
+ let!(:order) { create(:completed_order_with_totals, customer: user, bill_address: address) }
it_behaves_like 'soft-deletes the referenced address', :bill_address
end
@@ -331,7 +331,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::AddressesController, type: :cont
context 'when address belongs to another user' do
let!(:other_user) { create(:user) }
- let!(:other_address) { create(:address, user: other_user) }
+ let!(:other_address) { create(:address, customer: other_user) }
it 'returns not found' do
expect {
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/credit_cards_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/credit_cards_controller_spec.rb
index 2ab97bfdfc..1894291d3d 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/credit_cards_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/credit_cards_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::CreditCardsController, type: :co
include_context 'API v3 Store'
let(:payment_method) { create(:credit_card_payment_method, store: store) }
- let!(:credit_card) { create(:credit_card, user: user, payment_method: payment_method) }
+ let!(:credit_card) { create(:credit_card, customer: user, payment_method: payment_method) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -30,7 +30,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::CreditCardsController, type: :co
it 'only returns credit cards belonging to the current user' do
other_user = create(:user)
- other_card = create(:credit_card, user: other_user, payment_method: payment_method)
+ other_card = create(:credit_card, customer: other_user, payment_method: payment_method)
get :index
@@ -60,7 +60,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::CreditCardsController, type: :co
context 'when credit card belongs to another user' do
let(:other_user) { create(:user) }
- let(:other_card) { create(:credit_card, user: other_user, payment_method: payment_method) }
+ let(:other_card) { create(:credit_card, customer: other_user, payment_method: payment_method) }
it 'returns not found' do
get :show, params: { id: other_card.prefixed_id }
@@ -91,7 +91,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::CreditCardsController, type: :co
context 'when credit card belongs to another user' do
let!(:other_user) { create(:user) }
- let!(:other_card) { create(:credit_card, user: other_user, payment_method: payment_method) }
+ let!(:other_card) { create(:credit_card, customer: other_user, payment_method: payment_method) }
it 'returns not found' do
expect {
@@ -116,7 +116,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::CreditCardsController, type: :co
describe 'cross-store isolation' do
let(:other_store) { create(:store) }
let(:other_payment_method) { create(:credit_card_payment_method, store: other_store) }
- let!(:foreign_card) { create(:credit_card, user: user, payment_method: other_payment_method) }
+ let!(:foreign_card) { create(:credit_card, customer: user, payment_method: other_payment_method) }
it 'excludes cards from other stores in the index' do
get :index
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/gift_cards_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/gift_cards_controller_spec.rb
index 6095e9d440..254faa7643 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/gift_cards_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/gift_cards_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
include_context 'API v3 Store'
- let!(:gift_card) { create(:gift_card, user: user, store: store, amount: 100, amount_used: 25) }
+ let!(:gift_card) { create(:gift_card, customer: user, store: store, amount: 100, amount_used: 25) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -52,7 +52,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
it 'only returns gift cards belonging to the current user' do
other_user = create(:user)
- other_card = create(:gift_card, user: other_user, store: store)
+ other_card = create(:gift_card, customer: other_user, store: store)
get :index
@@ -63,7 +63,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
it 'only returns gift cards from the current store' do
other_store = create(:store)
- other_store_card = create(:gift_card, user: user, store: other_store)
+ other_store_card = create(:gift_card, customer: user, store: other_store)
get :index
@@ -73,8 +73,8 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
end
it 'returns gift cards ordered by created_at desc' do
- older_card = create(:gift_card, user: user, store: store, created_at: 1.day.ago)
- newer_card = create(:gift_card, user: user, store: store, created_at: 1.day.from_now)
+ older_card = create(:gift_card, customer: user, store: store, created_at: 1.day.ago)
+ newer_card = create(:gift_card, customer: user, store: store, created_at: 1.day.from_now)
get :index
@@ -84,7 +84,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
end
context 'with expired gift card' do
- let!(:expired_card) { create(:gift_card, user: user, store: store, expires_at: 1.day.ago) }
+ let!(:expired_card) { create(:gift_card, customer: user, store: store, expires_at: 1.day.ago) }
it 'includes expired gift cards' do
get :index
@@ -104,7 +104,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
end
context 'with partially redeemed gift card' do
- let!(:partial_card) { create(:gift_card, user: user, store: store, state: :partially_redeemed, amount: 50, amount_used: 20) }
+ let!(:partial_card) { create(:gift_card, customer: user, store: store, state: :partially_redeemed, amount: 50, amount_used: 20) }
it 'shows correct state and amounts' do
get :index
@@ -146,7 +146,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
context 'when gift card belongs to another user' do
let(:other_user) { create(:user) }
- let(:other_card) { create(:gift_card, user: other_user, store: store) }
+ let(:other_card) { create(:gift_card, customer: other_user, store: store) }
it 'returns not found' do
get :show, params: { id: other_card.prefixed_id }
@@ -157,7 +157,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::GiftCardsController, type: :cont
context 'when gift card belongs to another store' do
let(:other_store) { create(:store) }
- let(:other_store_card) { create(:gift_card, user: user, store: other_store) }
+ let(:other_store_card) { create(:gift_card, customer: user, store: other_store) }
it 'returns not found' do
get :show, params: { id: other_store_card.prefixed_id }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/orders_controller_spec.rb
index 82c95c453e..4d9e307686 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/orders_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::OrdersController, type: :control
include_context 'API v3 Store'
- let!(:order) { create(:completed_order_with_totals, user: user, store: store) }
+ let!(:order) { create(:completed_order_with_totals, customer: user, store: store) }
let!(:other_user_order) { create(:completed_order_with_totals, store: store) }
before do
@@ -31,7 +31,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::OrdersController, type: :control
it 'does not return orders from other stores' do
other_store = create(:store)
- create(:completed_order_with_totals, user: user, store: other_store)
+ create(:completed_order_with_totals, customer: user, store: other_store)
get :index
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
index 4cba9bdfd3..03ad762804 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
end
it 'publishes customer.password_reset_requested event' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset_requested', hash_including(:reset_token))
post :create, params: { email: user.email }
@@ -56,14 +56,14 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
end
it 'includes redirect_url in event payload' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset_requested', hash_including(redirect_url: 'https://myshop.com/reset-password'))
post :create, params: { email: user.email, redirect_url: 'https://myshop.com/reset-password' }
end
it 'silently drops redirect_url when it does not match allowed origin' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset_requested', hash_not_including(:redirect_url))
post :create, params: { email: user.email, redirect_url: 'https://evil.com/phishing' }
@@ -74,7 +74,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
context 'when store has no allowed origins' do
it 'silently drops redirect_url to prevent open redirect' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset_requested', hash_not_including(:redirect_url))
post :create, params: { email: user.email, redirect_url: 'https://anything.com/reset' }
@@ -85,7 +85,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
context 'without redirect_url' do
it 'does not include redirect_url in event payload' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset_requested', hash_not_including(:redirect_url))
post :create, params: { email: user.email }
@@ -126,7 +126,7 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
end
it 'publishes customer.password_reset event' do
- expect_any_instance_of(Spree.user_class).to receive(:publish_event)
+ expect_any_instance_of(Spree.customer_class).to receive(:publish_event)
.with('customer.password_reset')
patch :update, params: {
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/store_credits_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/store_credits_controller_spec.rb
index 482e056e4a..177636ba9a 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/store_credits_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/store_credits_controller_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe Spree::Api::V3::Store::Customer::StoreCreditsController, type: :c
include_context 'API v3 Store'
- let!(:store_credit) { create(:store_credit, user: user, store: store, currency: 'USD', amount: 50) }
- let!(:other_currency_credit) { create(:store_credit, user: user, store: store, currency: 'EUR', amount: 25) }
- let!(:other_store_credit) { create(:store_credit, user: create(:user), store: store, currency: 'USD', amount: 100) }
+ let!(:store_credit) { create(:store_credit, customer: user, store: store, currency: 'USD', amount: 50) }
+ let!(:other_currency_credit) { create(:store_credit, customer: user, store: store, currency: 'EUR', amount: 25) }
+ let!(:other_store_credit) { create(:store_credit, customer: create(:user), store: store, currency: 'USD', amount: 100) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
index 46ace631a2..a957ac14b5 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
it 'creates a new user' do
expect {
post :create, params: valid_params
- }.to change(Spree.user_class, :count).by(1)
+ }.to change(Spree.customer_class, :count).by(1)
expect(response).to have_http_status(:created)
end
@@ -43,7 +43,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params.merge(first_name: 'John', last_name: 'Doe')
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: '[email protected]')
+ new_user = Spree.customer_class.find_by(email: '[email protected]')
expect(new_user.first_name).to eq('John')
expect(new_user.last_name).to eq('Doe')
end
@@ -52,7 +52,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params.merge(phone: '+1234567890')
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: '[email protected]')
+ new_user = Spree.customer_class.find_by(email: '[email protected]')
expect(new_user.phone).to eq('+1234567890')
end
@@ -60,7 +60,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params.merge(accepts_email_marketing: true)
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: '[email protected]')
+ new_user = Spree.customer_class.find_by(email: '[email protected]')
expect(new_user.accepts_email_marketing).to eq(true)
end
@@ -68,7 +68,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params.merge(metadata: { source: 'storefront' })
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: '[email protected]')
+ new_user = Spree.customer_class.find_by(email: '[email protected]')
expect(new_user.metadata).to eq({ 'source' => 'storefront' })
end
@@ -85,7 +85,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: valid_params[:email])
+ new_user = Spree.customer_class.find_by(email: valid_params[:email])
expect(subscriber.reload.user).to eq(new_user)
expect(new_user.accepts_email_marketing).to eq(false)
end
@@ -104,7 +104,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
post :create, params: valid_params.merge(accepts_email_marketing: false)
expect(response).to have_http_status(:created)
- new_user = Spree.user_class.find_by(email: valid_params[:email])
+ new_user = Spree.customer_class.find_by(email: valid_params[:email])
expect(subscriber.reload.user).to eq(new_user)
expect(new_user.accepts_email_marketing).to eq(true)
expect(json_response['user']['accepts_email_marketing']).to eq(true)
@@ -204,7 +204,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
context 'newsletter subscriber' do
it 'exposes the current store subscriber' do
- subscriber = create(:newsletter_subscriber, :verified, user: user, email: user.email, store: store)
+ subscriber = create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: store)
get :show
@@ -218,7 +218,7 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
end
it 'is null when the only subscriber is on a different store' do
- create(:newsletter_subscriber, :verified, user: user, email: user.email, store: create(:store))
+ create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: create(:store))
get :show
diff --git a/spree/api/spec/controllers/spree/api/v3/store/digitals_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/digitals_controller_spec.rb
index dc4871c633..6cea174ae7 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/digitals_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/digitals_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::DigitalsController, type: :controller do
include_context 'API v3 Store'
- let(:order) { create(:order_with_line_items, store: store, user: user) }
+ let(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:line_item) { order.line_items.first }
let(:digital) { create(:digital, variant: line_item.variant) }
let!(:digital_link) { create(:digital_link, digital: digital, line_item: line_item) }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb
index 733a5155f8..ced385c31b 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/orders_controller_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Api::V3::Store::OrdersController, type: :controller do
end
describe 'GET #show' do
- let(:order) { create(:completed_order_with_totals, user: user, store: store) }
+ let(:order) { create(:completed_order_with_totals, customer: user, store: store) }
context 'authenticated user' do
before do
@@ -33,7 +33,7 @@ RSpec.describe Spree::Api::V3::Store::OrdersController, type: :controller do
end
context 'with spree token' do
- let(:guest_order) { create(:completed_order_with_totals, user: nil, store: store) }
+ let(:guest_order) { create(:completed_order_with_totals, customer: nil, store: store) }
it 'returns the order for guest with valid token' do
request.headers['x-spree-token'] = guest_order.token
@@ -76,7 +76,7 @@ RSpec.describe Spree::Api::V3::Store::OrdersController, type: :controller do
end
it 'returns not found for incomplete orders' do
- incomplete_order = create(:order_with_line_items, user: user, store: store)
+ incomplete_order = create(:order_with_line_items, customer: user, store: store)
get :show, params: { id: incomplete_order.to_param }
expect(response).to have_http_status(:not_found)
diff --git a/spree/api/spec/controllers/spree/api/v3/store/storefront_gating_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/storefront_gating_spec.rb
index 7a09c671d0..c02d7fe123 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/storefront_gating_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/storefront_gating_spec.rb
@@ -67,8 +67,8 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller do
include_context 'API v3 Store'
let(:channel) { store.default_channel }
- let(:guest_cart) { create(:order, store: store, channel: channel, user: nil, email: '[email protected]') }
- let(:user_cart) { create(:order, store: store, channel: channel, user: user) }
+ let(:guest_cart) { create(:order, store: store, channel: channel, customer: nil, email: '[email protected]') }
+ let(:user_cart) { create(:order, store: store, channel: channel, customer: user) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
diff --git a/spree/api/spec/controllers/spree/api/v3/store/wishlist_items_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/wishlist_items_controller_spec.rb
index 2409c8024b..774717e208 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/wishlist_items_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/wishlist_items_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistItemsController, type: :controller
include_context 'API v3 Store'
- let(:wishlist) { create(:wishlist, user: user, store: store) }
+ let(:wishlist) { create(:wishlist, customer: user, store: store) }
let(:product) { create(:product) }
let(:variant) { create(:variant, product: product) }
let!(:wished_item) { create(:wished_item, wishlist: wishlist, variant: variant) }
@@ -51,7 +51,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistItemsController, type: :controller
context 'error handling' do
it 'returns not found for other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
post :create, params: { wishlist_id: other_wishlist.prefixed_id, variant_id: new_variant.prefixed_id, quantity: 1 }
@@ -110,7 +110,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistItemsController, type: :controller
it 'returns not found for item in other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
other_item = create(:wished_item, wishlist: other_wishlist, variant: variant)
patch :update, params: { wishlist_id: other_wishlist.prefixed_id, id: other_item.prefixed_id, quantity: 5 }
@@ -141,7 +141,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistItemsController, type: :controller
it 'returns not found for item in other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
other_item = create(:wished_item, wishlist: other_wishlist, variant: variant)
delete :destroy, params: { wishlist_id: other_wishlist.prefixed_id, id: other_item.prefixed_id }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/wishlists_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/wishlists_controller_spec.rb
index 9da514e89f..39d84f8eed 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/wishlists_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/wishlists_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistsController, type: :controller do
include_context 'API v3 Store'
- let!(:wishlist) { create(:wishlist, user: user, store: store) }
+ let!(:wishlist) { create(:wishlist, customer: user, store: store) }
before do
request.headers['X-Spree-Api-Key'] = api_key.token
@@ -23,7 +23,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistsController, type: :controller do
it 'does not return other users wishlists' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
get :index
@@ -70,7 +70,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistsController, type: :controller do
it 'returns not found for other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
get :show, params: { id: other_wishlist.prefixed_id }
@@ -146,7 +146,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistsController, type: :controller do
context 'error handling' do
it 'returns not found for other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
patch :update, params: { id: other_wishlist.prefixed_id, name: 'Hacked' }
@@ -176,7 +176,7 @@ RSpec.describe Spree::Api::V3::Store::WishlistsController, type: :controller do
it 'returns not found for other users wishlist' do
other_user = create(:user)
- other_wishlist = create(:wishlist, user: other_user, store: store)
+ other_wishlist = create(:wishlist, customer: other_user, store: store)
delete :destroy, params: { id: other_wishlist.prefixed_id }
diff --git a/spree/api/spec/integration/spree/api/v3/admin/customers/addresses_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/customers/addresses_spec.rb
index a2c74e922b..21e1aae671 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/customers/addresses_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/customers/addresses_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Admin Customer Addresses API', type: :request, swagger_doc: 'api
include_context 'API v3 Admin'
let!(:customer) { create(:user) }
- let!(:address) { create(:address, user: customer) }
+ let!(:address) { create(:address, customer: customer) }
let(:country) { address.country }
let(:state) { address.state }
let(:Authorization) { "Bearer #{admin_jwt_token}" }
diff --git a/spree/api/spec/integration/spree/api/v3/admin/customers/credit_cards_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/customers/credit_cards_spec.rb
index da1bd48c2f..bf50e899da 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/customers/credit_cards_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/customers/credit_cards_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'Admin Customer Credit Cards API', type: :request, swagger_doc: '
let!(:customer) { create(:user) }
let!(:payment_method) { create(:credit_card_payment_method) }
- let!(:credit_card) { create(:credit_card, user: customer, payment_method: payment_method) }
+ let!(:credit_card) { create(:credit_card, customer: customer, payment_method: payment_method) }
let(:Authorization) { "Bearer #{admin_jwt_token}" }
path '/api/v3/admin/customers/{customer_id}/credit_cards' do
diff --git a/spree/api/spec/integration/spree/api/v3/admin/customers/store_credits_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/customers/store_credits_spec.rb
index 6e91e6e381..9e7accd5e0 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/customers/store_credits_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/customers/store_credits_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'Admin Customer Store Credits API', type: :request, swagger_doc:
let!(:customer) { create(:user) }
let!(:category) { create(:store_credit_category) }
- let!(:store_credit) { create(:store_credit, user: customer, store: store, amount: 50.00, category: category) }
+ let!(:store_credit) { create(:store_credit, customer: customer, store: store, amount: 50.00, category: category) }
let(:Authorization) { "Bearer #{admin_jwt_token}" }
path '/api/v3/admin/customers/{customer_id}/store_credits' do
diff --git a/spree/api/spec/integration/spree/api/v3/admin/orders/store_credits_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/orders/store_credits_spec.rb
index c05dd10908..0268bcf623 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/orders/store_credits_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/orders/store_credits_spec.rb
@@ -6,8 +6,8 @@ RSpec.describe 'Admin Order Store Credits API', type: :request, swagger_doc: 'ap
include_context 'API v3 Admin'
let(:customer) { create(:user) }
- let!(:order) { create(:order_with_line_items, store: store, user: customer) }
- let!(:store_credit) { create(:store_credit, store: store, user: customer, amount: 50.00) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: customer) }
+ let!(:store_credit) { create(:store_credit, store: store, customer: customer, amount: 50.00) }
let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
let(:Authorization) { "Bearer #{admin_jwt_token}" }
diff --git a/spree/api/spec/integration/spree/api/v3/admin/tags_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/tags_spec.rb
index 459a64f338..69a31e77f4 100644
--- a/spree/api/spec/integration/spree/api/v3/admin/tags_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/admin/tags_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Admin Tags API', type: :request, swagger_doc: 'api-reference/adm
description: 'Optional case-insensitive substring filter'
response '200', 'tags found' do
- let(:taggable_type) { Spree.user_class.to_s }
+ let(:taggable_type) { Spree.customer_class.to_s }
let(:'x-spree-api-key') { secret_api_key.plaintext_token }
before do
diff --git a/spree/api/spec/integration/spree/api/v3/store/addresses_spec.rb b/spree/api/spec/integration/spree/api/v3/store/addresses_spec.rb
index 3aee1ef155..86c9194e05 100644
--- a/spree/api/spec/integration/spree/api/v3/store/addresses_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/addresses_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Addresses API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
let(:country) { address.country }
let(:state) { address.state }
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 6825e95ea7..8724d50297 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
@@ -32,10 +32,10 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'carts listed' do
- let!(:cart1) { create(:order_with_line_items, store: store, user: user) }
- let!(:cart2) { create(:order_with_line_items, store: store, user: user) }
- let!(:completed_order) { create(:completed_order_with_totals, store: store, user: user) }
- let!(:other_user_cart) { create(:order_with_line_items, store: store, user: create(:user)) }
+ let!(:cart1) { create(:order_with_line_items, store: store, customer: user) }
+ let!(:cart2) { create(:order_with_line_items, store: store, customer: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, store: store, customer: user) }
+ let!(:other_user_cart) { create(:order_with_line_items, store: store, customer: create(:user)) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
@@ -224,7 +224,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
}
response '200', 'cart updated' do
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { order.prefixed_id }
@@ -254,7 +254,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
parameter name: :id, in: :path, type: :string, required: true, description: 'Cart prefixed ID'
response '204', 'cart deleted' do
- let!(:cart) { create(:order_with_line_items, store: store, user: user) }
+ let!(:cart) { create(:order_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { cart.prefixed_id }
@@ -283,7 +283,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
parameter name: :id, in: :path, type: :string, required: true, description: 'Cart prefixed ID'
response '200', 'cart associated successfully' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:order_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:'x-spree-token') { guest_cart.token }
@@ -299,7 +299,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '401', 'unauthorized - JWT required' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:order_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { '' }
let(:'x-spree-token') { guest_cart.token }
@@ -311,7 +311,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '403', 'forbidden - cart token missing or does not match' do
- let(:guest_cart) { create(:order_with_line_items, store: store, user: nil) }
+ let(:guest_cart) { create(:order_with_line_items, store: store, customer: nil) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:'x-spree-token') { 'does-not-match' }
@@ -340,7 +340,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
response '200', 'cart completed' do
let(:completable_order) do
- order = create(:order_with_line_items, store: store, user: user)
+ order = create(:order_with_line_items, store: store, customer: user)
Spree.checkout_advance_service.call(order: order)
payment_method = create(:check_payment_method)
create(:payment, order: order, amount: order.total, payment_method: payment_method, state: 'checkout')
@@ -361,7 +361,7 @@ RSpec.describe 'Carts API', type: :request, swagger_doc: 'api-reference/store.ya
end
response '422', 'cannot complete' do
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { order.prefixed_id }
diff --git a/spree/api/spec/integration/spree/api/v3/store/credit_cards_spec.rb b/spree/api/spec/integration/spree/api/v3/store/credit_cards_spec.rb
index 3e37bc3590..019eb6871b 100644
--- a/spree/api/spec/integration/spree/api/v3/store/credit_cards_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/credit_cards_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Credit Cards API', type: :request, swagger_doc: 'api-reference/s
include_context 'API v3 Store'
let(:payment_method) { create(:credit_card_payment_method, store: store) }
- let!(:credit_card) { create(:credit_card, user: user, payment_method: payment_method) }
+ let!(:credit_card) { create(:credit_card, customer: user, payment_method: payment_method) }
path '/api/v3/store/customers/me/credit_cards' do
get 'List saved credit cards' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/customer_orders_spec.rb b/spree/api/spec/integration/spree/api/v3/store/customer_orders_spec.rb
index bf957f5dbf..23ab904b77 100644
--- a/spree/api/spec/integration/spree/api/v3/store/customer_orders_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/customer_orders_spec.rb
@@ -42,8 +42,8 @@ RSpec.describe 'Customer Orders API', type: :request, swagger_doc: 'api-referenc
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'orders listed' do
- let!(:completed_order) { create(:completed_order_with_totals, store: store, user: user) }
- let!(:incomplete_order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, store: store, customer: user) }
+ let!(:incomplete_order) { create(:order_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
@@ -92,7 +92,7 @@ RSpec.describe 'Customer Orders API', type: :request, swagger_doc: 'api-referenc
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'order found' do
- let(:completed_order) { create(:completed_order_with_totals, store: store, user: user) }
+ let(:completed_order) { create(:completed_order_with_totals, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { completed_order.to_param }
@@ -109,7 +109,7 @@ RSpec.describe 'Customer Orders API', type: :request, swagger_doc: 'api-referenc
response '404', 'order belongs to another user' do
let(:other_user) { create(:user) }
- let(:other_order) { create(:completed_order_with_totals, store: store, user: other_user) }
+ let(:other_order) { create(:completed_order_with_totals, store: store, customer: other_user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { other_order.to_param }
diff --git a/spree/api/spec/integration/spree/api/v3/store/customers_spec.rb b/spree/api/spec/integration/spree/api/v3/store/customers_spec.rb
index 746c5d223a..22460a9863 100644
--- a/spree/api/spec/integration/spree/api/v3/store/customers_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/customers_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe 'Customers API', type: :request, swagger_doc: 'api-reference/stor
expect(data['user']).to be_present
# Verify user was created with all fields
- new_user = Spree.user_class.find_by(email: '[email protected]')
+ new_user = Spree.customer_class.find_by(email: '[email protected]')
expect(new_user).to be_present
expect(new_user.first_name).to eq('John')
expect(new_user.phone).to eq('+1234567890')
diff --git a/spree/api/spec/integration/spree/api/v3/store/digitals_spec.rb b/spree/api/spec/integration/spree/api/v3/store/digitals_spec.rb
index dc4d1d2f0d..a44674197d 100644
--- a/spree/api/spec/integration/spree/api/v3/store/digitals_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/digitals_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Digitals API', type: :request, swagger_doc: 'api-reference/store
include_context 'API v3 Store'
let(:product) { create(:product) }
- let(:order) { create(:order_with_line_items, store: store, user: user, line_items_attributes: [{ variant: product.default_variant, quantity: 1 }]) }
+ let(:order) { create(:order_with_line_items, store: store, customer: user, line_items_attributes: [{ variant: product.default_variant, quantity: 1 }]) }
let(:line_item) { order.line_items.first }
let(:digital) { create(:digital, variant: line_item.variant) }
let!(:digital_link) { create(:digital_link, digital: digital, line_item: line_item) }
diff --git a/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb b/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
index 00a17c64e7..c7204e92c6 100644
--- a/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/discount_codes_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Discount Codes API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/discount_codes' do
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 c19b703971..f6480c5ae3 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!(:order) { create(:order_with_line_items, store: store, user: user, state: 'delivery') }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user, state: 'delivery') }
let!(:fulfillment) { order.shipments.first }
let(:cart_id) { order.prefixed_id }
diff --git a/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb b/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
index 90daf3a57c..427a23aa85 100644
--- a/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/gift_card_cart_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Gift Card API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/gift_cards' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/gift_cards_spec.rb b/spree/api/spec/integration/spree/api/v3/store/gift_cards_spec.rb
index 7774ea3449..bb0646dc82 100644
--- a/spree/api/spec/integration/spree/api/v3/store/gift_cards_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/gift_cards_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Gift Cards API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:gift_card) { create(:gift_card, user: user, store: store) }
+ let!(:gift_card) { create(:gift_card, customer: user, store: store) }
path '/api/v3/store/customers/me/gift_cards' do
get 'List gift cards' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb b/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
index 66eb173453..484d00afa7 100644
--- a/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/line_items_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Items API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order, store: store, user: user) }
+ let!(:order) { create(:order, store: store, customer: user) }
let!(:product) { create(:product) }
let!(:variant) { product.default_variant }
let!(:line_item) { create(:line_item, order: order, variant: variant, quantity: 1) }
diff --git a/spree/api/spec/integration/spree/api/v3/store/newsletter_subscribers_spec.rb b/spree/api/spec/integration/spree/api/v3/store/newsletter_subscribers_spec.rb
index 9db46dd077..3a96008a29 100644
--- a/spree/api/spec/integration/spree/api/v3/store/newsletter_subscribers_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/newsletter_subscribers_spec.rb
@@ -269,7 +269,7 @@ RSpec.describe 'Newsletter Subscribers API', type: :request, swagger_doc: 'api-r
response '204', 'token path also flips the linked user\'s accepts_email_marketing flag' do
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { '' }
- let!(:subscriber) { create(:newsletter_subscriber, :verified, user: user, email: user.email, store: store) }
+ let!(:subscriber) { create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: store) }
let(:id) { subscriber.prefixed_id }
let(:token) { subscriber.generate_token_for(:unsubscribe) }
@@ -285,8 +285,8 @@ RSpec.describe 'Newsletter Subscribers API', type: :request, swagger_doc: 'api-r
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { '' }
let(:other_store) { create(:store) }
- let!(:subscriber) { create(:newsletter_subscriber, :verified, user: user, email: user.email, store: store) }
- let!(:other_subscriber) { create(:newsletter_subscriber, :verified, user: user, email: user.email, store: other_store) }
+ let!(:subscriber) { create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: store) }
+ let!(:other_subscriber) { create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: other_store) }
let(:id) { subscriber.prefixed_id }
let(:token) { subscriber.generate_token_for(:unsubscribe) }
@@ -302,7 +302,7 @@ RSpec.describe 'Newsletter Subscribers API', type: :request, swagger_doc: 'api-r
response '204', 'unsubscribed via JWT (owner)' do
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
- let!(:subscriber) { create(:newsletter_subscriber, :verified, user: user, email: user.email, store: store) }
+ let!(:subscriber) { create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: store) }
let(:id) { subscriber.prefixed_id }
let(:token) { nil }
@@ -397,7 +397,7 @@ RSpec.describe 'Newsletter Subscribers API', type: :request, swagger_doc: 'api-r
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:other_user) { create(:user) }
- let!(:subscriber) { create(:newsletter_subscriber, :verified, user: other_user, email: other_user.email, store: store) }
+ let!(:subscriber) { create(:newsletter_subscriber, :verified, customer: other_user, email: other_user.email, store: store) }
let(:id) { subscriber.prefixed_id }
let(:token) { nil }
@@ -413,7 +413,7 @@ RSpec.describe 'Newsletter Subscribers API', type: :request, swagger_doc: 'api-r
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:other_store) { create(:store) }
- let!(:subscriber) { create(:newsletter_subscriber, :verified, user: user, email: user.email, store: other_store) }
+ let!(:subscriber) { create(:newsletter_subscriber, :verified, customer: user, email: user.email, store: other_store) }
let(:id) { subscriber.prefixed_id }
let(:token) { nil }
diff --git a/spree/api/spec/integration/spree/api/v3/store/orders_spec.rb b/spree/api/spec/integration/spree/api/v3/store/orders_spec.rb
index 7b542c676c..dd0357ebac 100644
--- a/spree/api/spec/integration/spree/api/v3/store/orders_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/orders_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe 'Orders API', type: :request, swagger_doc: 'api-reference/store.y
description: 'Comma-separated list of fields to include (e.g., total,amount_due,item_count). id is always included.'
response '200', 'order found (authenticated)' do
- let(:completed_order) { create(:completed_order_with_totals, store: store, user: user) }
+ let(:completed_order) { create(:completed_order_with_totals, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { completed_order.to_param }
@@ -48,7 +48,7 @@ RSpec.describe 'Orders API', type: :request, swagger_doc: 'api-reference/store.y
end
response '200', 'order found (guest via order token)' do
- let(:guest_order) { create(:completed_order_with_totals, store: store, user: nil, email: '[email protected]') }
+ let(:guest_order) { create(:completed_order_with_totals, store: store, customer: nil, email: '[email protected]') }
let(:'x-spree-api-key') { api_key.token }
let(:id) { guest_order.to_param }
let(:'x-spree-token') { guest_order.token }
@@ -73,7 +73,7 @@ RSpec.describe 'Orders API', type: :request, swagger_doc: 'api-reference/store.y
end
response '404', 'incomplete order not accessible' do
- let(:incomplete_order) { create(:order_with_line_items, store: store, user: user) }
+ let(:incomplete_order) { create(:order_with_line_items, store: store, customer: user) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:id) { incomplete_order.to_param }
diff --git a/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb b/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
index 633c545a3a..dc4a956d99 100644
--- a/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/payment_sessions_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Payment Sessions API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user, state: 'payment') }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user, state: 'payment') }
let(:payment_method) { create(:bogus_payment_method) }
let!(:payment_session) do
create(:bogus_payment_session,
diff --git a/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb b/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
index 33b3f7fae6..be041dec8f 100644
--- a/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/payments_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Cart Payments API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:order) { create(:order_with_line_items, store: store, user: user, state: 'payment') }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user, state: 'payment') }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/payments' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/store_credits_customer_spec.rb b/spree/api/spec/integration/spree/api/v3/store/store_credits_customer_spec.rb
index 36c9a2180f..07c7560cc9 100644
--- a/spree/api/spec/integration/spree/api/v3/store/store_credits_customer_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/store_credits_customer_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Customer Store Credits API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:store_credit) { create(:store_credit, user: user, store: store, currency: 'USD', amount: 100) }
+ let!(:store_credit) { create(:store_credit, customer: user, store: store, currency: 'USD', amount: 100) }
path '/api/v3/store/customers/me/store_credits' do
get 'List store credits' do
diff --git a/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb b/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
index 92fa4de5a1..90fc77660b 100644
--- a/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/store_credits_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Cart Store Credits API', type: :request, swagger_doc: 'api-refer
include_context 'API v3 Store'
let(:user) { create(:user_with_addresses) }
- let!(:order) { create(:order_with_line_items, store: store, user: user) }
+ let!(:order) { create(:order_with_line_items, store: store, customer: user) }
let(:cart_id) { order.prefixed_id }
path '/api/v3/store/carts/{cart_id}/store_credits' do
@@ -34,7 +34,7 @@ RSpec.describe 'Cart Store Credits API', type: :request, swagger_doc: 'api-refer
response '200', 'store credit applied' do
let(:store_credit_payment_method) { create(:store_credit_payment_method) }
- let(:store_credit) { create(:store_credit, user: user, store: store, amount: 50) }
+ let(:store_credit) { create(:store_credit, customer: user, store: store, amount: 50) }
let(:'x-spree-api-key') { api_key.token }
let(:'Authorization') { "Bearer #{jwt_token}" }
let(:body) { { amount: 10 } }
diff --git a/spree/api/spec/integration/spree/api/v3/store/wishlists_spec.rb b/spree/api/spec/integration/spree/api/v3/store/wishlists_spec.rb
index 34b60e189b..9046a8d8cb 100644
--- a/spree/api/spec/integration/spree/api/v3/store/wishlists_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/store/wishlists_spec.rb
@@ -5,7 +5,7 @@ require 'swagger_helper'
RSpec.describe 'Wishlists API', type: :request, swagger_doc: 'api-reference/store.yaml' do
include_context 'API v3 Store'
- let!(:wishlist) { create(:wishlist, user: user, store: store, name: 'My Wishlist') }
+ let!(:wishlist) { create(:wishlist, customer: user, store: store, name: 'My Wishlist') }
let!(:product) { create(:product) }
let!(:variant) { product.default_variant }
let!(:wished_item) { create(:wished_item, wishlist: wishlist, variant: variant) }
diff --git a/spree/core/spec/finders/spree/addresses/find_spec.rb b/spree/core/spec/finders/spree/addresses/find_spec.rb
index d5c22c71a0..5681fb44e8 100644
--- a/spree/core/spec/finders/spree/addresses/find_spec.rb
+++ b/spree/core/spec/finders/spree/addresses/find_spec.rb
@@ -8,7 +8,7 @@ describe Spree::Addresses::Find do
let!(:address4) { create(:address, customer: user, quick_checkout: true) }
describe '#execute' do
- let(:scope) { Spree::Address.where(user: user) }
+ let(:scope) { Spree::Address.where(customer: user) }
context 'without any filter parameters' do
let(:params) { {} }
diff --git a/spree/core/spec/jobs/spree/imports/create_rows_job_spec.rb b/spree/core/spec/jobs/spree/imports/create_rows_job_spec.rb
index fdea606e65..d743cc8b0e 100644
--- a/spree/core/spec/jobs/spree/imports/create_rows_job_spec.rb
+++ b/spree/core/spec/jobs/spree/imports/create_rows_job_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Spree::Imports::CreateRowsJob, type: :job do
let!(:import) do
create(
:import,
- customer: user,
+ user: user,
owner: store,
type: 'Spree::Imports::Products',
status: :completed_mapping
diff --git a/spree/core/spec/models/spree/order/callbacks_spec.rb b/spree/core/spec/models/spree/order/callbacks_spec.rb
index dbd57b8731..109d671b62 100644
--- a/spree/core/spec/models/spree/order/callbacks_spec.rb
+++ b/spree/core/spec/models/spree/order/callbacks_spec.rb
@@ -24,7 +24,7 @@ describe Spree::Order, type: :model do
let(:user) { double(:user, email: '[email protected]') }
before do
- allow(order).to receive_messages user: user
+ allow(order).to receive_messages customer: user
end
it 'assigns the email address of the user' do
diff --git a/spree/core/spec/subscribers/spree/report_subscriber_spec.rb b/spree/core/spec/subscribers/spree/report_subscriber_spec.rb
index b8cf8395da..53667518a4 100644
--- a/spree/core/spec/subscribers/spree/report_subscriber_spec.rb
+++ b/spree/core/spec/subscribers/spree/report_subscriber_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Spree::ReportSubscriber do
let(:report) do
create(:report,
store: store,
- customer: user,
+ user: user,
date_from: 1.month.ago,
date_to: Time.current,
currency: store.default_currency
diff --git a/spree/emails/spec/mailers/spree/shipment_mailer_spec.rb b/spree/emails/spec/mailers/spree/shipment_mailer_spec.rb
index e59a85c0fe..0697501575 100644
--- a/spree/emails/spec/mailers/spree/shipment_mailer_spec.rb
+++ b/spree/emails/spec/mailers/spree/shipment_mailer_spec.rb
@@ -6,7 +6,7 @@ describe Spree::ShipmentMailer, type: :mailer do
include EmailSpec::Matchers
let(:store) { @default_store }
- let(:order) { create(:shipped_order, store: store, email: '[email protected]', user: nil) }
+ let(:order) { create(:shipped_order, store: store, email: '[email protected]', customer: nil) }
let(:shipment) { order.shipments.first }
let(:shipping_method) { shipment.shipping_method }
diff --git a/spree/emails/spec/models/spree/order_spec.rb b/spree/emails/spec/models/spree/order_spec.rb
index 97fe363e6a..779827153c 100644
--- a/spree/emails/spec/models/spree/order_spec.rb
+++ b/spree/emails/spec/models/spree/order_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::Order, type: :model do
let(:store) { @default_store }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
context '#finalize!' do
let(:order) { create(:order, email: '[email protected]', store: store) }