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 and factories for the Customer rename

Łukasz Adamczykc3a6a6c0653e
diff --git a/spree/core/lib/spree/testing_support/common_rake.rb b/spree/core/lib/spree/testing_support/common_rake.rb
index a1bcf1186e..fa45783038 100644
--- a/spree/core/lib/spree/testing_support/common_rake.rb
+++ b/spree/core/lib/spree/testing_support/common_rake.rb
@@ -8,8 +8,8 @@ namespace :common do
# When using execute with a Hash, args IS the hash directly
defaults = {
authentication: 'dummy',
- user_class: 'Spree::LegacyUser',
- admin_user_class: 'Spree::LegacyAdminUser',
+ user_class: 'Spree::Customer',
+ admin_user_class: 'Spree::AdminUser',
install_storefront: false,
install_admin: false,
javascript: false,
diff --git a/spree/core/lib/spree/testing_support/factories/customer_group_user_factory.rb b/spree/core/lib/spree/testing_support/factories/customer_group_user_factory.rb
index aec4e5113c..48fdbe9f84 100644
--- a/spree/core/lib/spree/testing_support/factories/customer_group_user_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/customer_group_user_factory.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :customer_group_user, class: Spree::CustomerGroupUser do
customer_group
- user
+ customer
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/gateway_customer_factory.rb b/spree/core/lib/spree/testing_support/factories/gateway_customer_factory.rb
index d8415a6cd7..ee13395672 100644
--- a/spree/core/lib/spree/testing_support/factories/gateway_customer_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/gateway_customer_factory.rb
@@ -1,7 +1,7 @@
FactoryBot.define do
factory :gateway_customer, class: Spree::GatewayCustomer do
sequence(:profile_id) { |n| "cus_#{n}" }
- user { |p| p.association(:user) }
+ customer { |p| p.association(:customer) }
payment_method { |p| p.association(:payment_method) }
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/metafield_definition_factory.rb b/spree/core/lib/spree/testing_support/factories/metafield_definition_factory.rb
index 341e6f5095..f434e0226b 100644
--- a/spree/core/lib/spree/testing_support/factories/metafield_definition_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/metafield_definition_factory.rb
@@ -74,7 +74,7 @@ FactoryBot.define do
end
trait :for_user do
- resource_type { Spree.user_class.name }
+ resource_type { Spree.customer_class.name }
key { 'user_preference' }
name { 'User Preference' }
end
diff --git a/spree/core/lib/spree/testing_support/factories/newsletter_subscriber_factory.rb b/spree/core/lib/spree/testing_support/factories/newsletter_subscriber_factory.rb
index 642d960c13..647af072cd 100644
--- a/spree/core/lib/spree/testing_support/factories/newsletter_subscriber_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/newsletter_subscriber_factory.rb
@@ -6,7 +6,7 @@ FactoryBot.define do
store { Spree::Current.store || create(:store) }
trait :with_user do
- association :user, factory: :user
+ association :customer, factory: :customer
end
trait :verified do
diff --git a/spree/core/lib/spree/testing_support/factories/order_factory.rb b/spree/core/lib/spree/testing_support/factories/order_factory.rb
index 3ded3d33d1..3f0848890b 100644
--- a/spree/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/order_factory.rb
@@ -1,9 +1,9 @@
FactoryBot.define do
factory :order, class: Spree::Order do
- user
+ customer
bill_address
completed_at { nil }
- email { user&.email }
+ email { customer&.email }
currency { 'USD' }
locale { 'en' }
@@ -93,7 +93,7 @@ FactoryBot.define do
factory :completed_order_with_store_credit_payment do
after(:create) do |order|
- store_credit = create(:store_credit, amount: order.total, store: order.store, user: order.user)
+ store_credit = create(:store_credit, amount: order.total, store: order.store, customer: order.customer)
payment_method = create(:store_credit_payment_method, store: order.store)
create(:store_credit_payment, amount: order.total, order: order, source: store_credit, payment_method: payment_method)
diff --git a/spree/core/lib/spree/testing_support/factories/payment_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
index d376e70ab4..419f4b54fe 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
@@ -17,7 +17,7 @@ FactoryBot.define do
factory :custom_payment, class: Spree::Payment do
payment_method { create(:custom_payment_method, store: order.store) }
- source { create(:payment_source, user: order.user, payment_method: payment_method) }
+ source { create(:payment_source, customer: order.customer, payment_method: payment_method) }
end
end
@@ -30,6 +30,6 @@ FactoryBot.define do
factory :store_credit_payment, class: Spree::Payment, parent: :payment do
payment_method { create(:store_credit_payment_method, store: order.store) }
- source { create(:store_credit, store: order.store, user: order.user) }
+ source { create(:store_credit, store: order.store, customer: order.customer) }
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/payment_setup_session_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_setup_session_factory.rb
index 203702c158..95863b1e4b 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_setup_session_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_setup_session_factory.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :payment_setup_session, class: 'Spree::PaymentSetupSession' do
- customer { create(:user) }
+ customer { create(:customer) }
payment_method { create(:credit_card_payment_method) }
status { 'pending' }
external_id { "seti_test_#{SecureRandom.hex(12)}" }
@@ -13,7 +13,7 @@ FactoryBot.define do
trait :completed do
status { 'completed' }
- payment_source { create(:credit_card, user: customer) }
+ payment_source { create(:credit_card, customer: customer) }
end
trait :failed do
diff --git a/spree/core/lib/spree/testing_support/factories/store_credit_factory.rb b/spree/core/lib/spree/testing_support/factories/store_credit_factory.rb
index e77b902c1f..bf5f33b701 100644
--- a/spree/core/lib/spree/testing_support/factories/store_credit_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/store_credit_factory.rb
@@ -2,7 +2,7 @@ FactoryBot.define do
sequence(:store_credits_order_number) { |n| "R1000#{n}" }
factory :store_credit, class: Spree::StoreCredit do
- user
+ customer
association :created_by, factory: :admin_user
association :category, factory: :store_credit_category
amount { 150.00 }
diff --git a/spree/core/lib/spree/testing_support/factories/user_factory.rb b/spree/core/lib/spree/testing_support/factories/user_factory.rb
index 308547155f..039ee0a3d7 100644
--- a/spree/core/lib/spree/testing_support/factories/user_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/user_factory.rb
@@ -1,7 +1,6 @@
FactoryBot.define do
- factory :user, class: Spree.user_class do
+ factory :customer, aliases: [:user], class: Spree.customer_class do
email { generate(:random_email) }
- login { email }
password { 'secret' }
password_confirmation { password }
@@ -11,11 +10,11 @@ FactoryBot.define do
public_metadata { {} }
private_metadata { {} }
- factory :user_with_addresses, aliases: [:user_with_addreses] do
- after(:create) do |user|
- ship_address = create(:address, user: user)
- bill_address = create(:address, user: user)
- user.update_columns(ship_address_id: ship_address.id, bill_address_id: bill_address.id)
+ factory :customer_with_addresses, aliases: [:user_with_addresses, :user_with_addreses] do
+ after(:create) do |customer|
+ ship_address = create(:address, customer: customer)
+ bill_address = create(:address, customer: customer)
+ customer.update_columns(ship_address_id: ship_address.id, bill_address_id: bill_address.id)
end
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/wishlist_factory.rb b/spree/core/lib/spree/testing_support/factories/wishlist_factory.rb
index d819f0666b..4ac7db49c8 100644
--- a/spree/core/lib/spree/testing_support/factories/wishlist_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/wishlist_factory.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :wishlist, class: Spree::Wishlist do
- user
+ customer
sequence(:name) { |n| "Wishlist_#{n}" }
is_private { true }
diff --git a/spree/core/spec/finders/spree/addresses/find_spec.rb b/spree/core/spec/finders/spree/addresses/find_spec.rb
index f9331905a9..d5c22c71a0 100644
--- a/spree/core/spec/finders/spree/addresses/find_spec.rb
+++ b/spree/core/spec/finders/spree/addresses/find_spec.rb
@@ -2,10 +2,10 @@ require 'spec_helper'
describe Spree::Addresses::Find do
let!(:user) { create(:user) }
- let!(:address1) { create(:address, user: user) }
- let!(:address2) { create(:address, user: user) }
- let!(:address3) { create(:address, user: user, quick_checkout: true) }
- let!(:address4) { create(:address, user: user, quick_checkout: true) }
+ let!(:address1) { create(:address, customer: user) }
+ let!(:address2) { create(:address, customer: user) }
+ let!(:address3) { create(:address, customer: user, quick_checkout: true) }
+ let!(:address4) { create(:address, customer: user, quick_checkout: true) }
describe '#execute' do
let(:scope) { Spree::Address.where(user: user) }
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 d743cc8b0e..fdea606e65 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,
- user: user,
+ customer: user,
owner: store,
type: 'Spree::Imports::Products',
status: :completed_mapping
diff --git a/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb b/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb
index 0420916f15..454a6a7c30 100644
--- a/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb
+++ b/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb
@@ -54,10 +54,10 @@ RSpec.describe Spree::ApiResourceGenerator, type: :generator do
expect(result[:migration]).to include('t.references :product, null: false, index: true, foreign_key: false')
end
- it 'respects Spree.user_class for user references' do
+ it 'respects Spree.customer_class for user references' do
result = run_generator(['UserBrand', 'user:references', 'name:string'])
- expect(result[:model]).to include('belongs_to :user, class_name: "::#{Spree.user_class}"')
+ expect(result[:model]).to include('belongs_to :user, class_name: "::#{Spree.customer_class}"')
end
it 'checks model_existed_before_run against destination_root, not process cwd' do
diff --git a/spree/core/spec/lib/generators/spree/model/model_generator_spec.rb b/spree/core/spec/lib/generators/spree/model/model_generator_spec.rb
index 3343367380..8727e847f4 100644
--- a/spree/core/spec/lib/generators/spree/model/model_generator_spec.rb
+++ b/spree/core/spec/lib/generators/spree/model/model_generator_spec.rb
@@ -96,10 +96,10 @@ RSpec.describe Spree::ModelGenerator, type: :generator do
expect(result[:model]).to include("belongs_to :product, class_name: 'Spree::Product'")
end
- it 'resolves to Spree.user_class for user/user_id attributes' do
+ it 'resolves to Spree.customer_class for user/user_id attributes' do
result = run_generator(['UserPreference', 'user:references'])
- expect(result[:model]).to include('belongs_to :user, class_name: "::#{Spree.user_class}"')
+ expect(result[:model]).to include('belongs_to :user, class_name: "::#{Spree.customer_class}"')
end
it 'resolves to Spree.admin_user_class for admin-user-shaped column names' do
diff --git a/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
index d6113a7baa..1184fdf24e 100644
--- a/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
+++ b/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
@@ -29,7 +29,7 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
it 'sets session return url' do
allow(controller).to receive_messages(request: double(fullpath: '/redirect'))
controller.store_location
- expect(session[:legacy_user_return_to]).to eq '/redirect'
+ expect(session[:customer_return_to]).to eq '/redirect'
end
end
diff --git a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
index fb4d8fd94d..5ddc9ac108 100644
--- a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
+++ b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb
@@ -24,7 +24,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
controller(FakesController) {}
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
let!(:store) { @default_store }
describe '#current_order' do
@@ -34,7 +34,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context 'create_order_if_necessary option is false' do
- let!(:order) { create :order, user: user, store: store }
+ let!(:order) { create :order, customer: user, store: store }
it 'returns current order' do
expect(controller.current_order).to eq order
@@ -121,7 +121,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context "user is blank" do
- let(:order) { create(:order, user: nil, store: store) }
+ let(:order) { create(:order, customer: nil, store: store) }
it 'calls Spree::Order#associate_user! method' do
expect_any_instance_of(Spree::Order).to receive(:associate_user!)
@@ -130,7 +130,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context "user isn't blank" do
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
it 'does not calls Spree::Order#associate_user! method' do
expect_any_instance_of(Spree::Order).not_to receive(:associate_user!)
@@ -148,7 +148,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context 'within the same store' do
- let!(:incomplete_order) { create(:order, user: user, store: order.store) }
+ let!(:incomplete_order) { create(:order, customer: user, store: order.store) }
it 'calls Spree::Order#merge!' do
expect(order).to receive(:merge!).with(incomplete_order, user)
@@ -157,7 +157,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
end
context 'within different store' do
- let!(:incomplete_order) { create(:order, user: user, store: create(:store)) }
+ let!(:incomplete_order) { create(:order, customer: user, store: create(:store)) }
it 'does not call Spree::Order#merge!' do
expect(order).not_to receive(:merge!)
diff --git a/spree/core/spec/lib/spree/core_spec.rb b/spree/core/spec/lib/spree/core_spec.rb
index dbee6094fb..6800defd74 100644
--- a/spree/core/spec/lib/spree/core_spec.rb
+++ b/spree/core/spec/lib/spree/core_spec.rb
@@ -1,52 +1,65 @@
require 'spec_helper'
describe Spree do
- describe '.user_class' do
+ describe '.customer_class' do
after do
- described_class.user_class = 'Spree::LegacyUser'
+ described_class.customer_class = 'Spree::Customer'
end
- context 'when user_class is a Class instance' do
+ context 'when customer_class is a Class instance' do
it 'raises an error' do
- described_class.user_class = Spree::LegacyUser
+ described_class.customer_class = Spree::Customer
- expect { described_class.user_class }.to raise_error(RuntimeError)
+ expect { described_class.customer_class }.to raise_error(RuntimeError)
end
end
- context 'when user_class is a Symbol instance' do
- it 'returns the user_class constant' do
- described_class.user_class = :'Spree::LegacyUser'
+ context 'when customer_class is a Symbol instance' do
+ it 'returns the customer_class constant' do
+ described_class.customer_class = :'Spree::Customer'
- expect(described_class.user_class).to eq(Spree::LegacyUser)
+ expect(described_class.customer_class).to eq(Spree::Customer)
end
end
- context 'when user_class is a String instance' do
- it 'returns the user_class constant' do
- described_class.user_class = 'Spree::LegacyUser'
+ context 'when customer_class is a String instance' do
+ it 'returns the customer_class constant' do
+ described_class.customer_class = 'Spree::Customer'
- expect(described_class.user_class).to eq(Spree::LegacyUser)
+ expect(described_class.customer_class).to eq(Spree::Customer)
end
end
context 'when constantize is false' do
- it 'returns the user_class as a String' do
- described_class.user_class = 'Spree::LegacyUser'
+ it 'returns the customer_class as a String' do
+ described_class.customer_class = 'Spree::Customer'
- expect(described_class.user_class(constantize: false)).to eq('Spree::LegacyUser')
+ expect(described_class.customer_class(constantize: false)).to eq('Spree::Customer')
end
end
end
+ describe '.user_class (deprecated alias for .customer_class)' do
+ after do
+ described_class.customer_class = 'Spree::Customer'
+ end
+
+ it 'delegates reads and writes to customer_class' do
+ described_class.user_class = 'Spree::Customer'
+
+ expect(described_class.user_class).to eq(Spree::Customer)
+ expect(described_class.customer_class).to eq(Spree::Customer)
+ end
+ end
+
describe '.admin_user_class' do
after do
- described_class.admin_user_class = 'Spree::LegacyAdminUser'
+ described_class.admin_user_class = 'Spree::AdminUser'
end
context 'when admin_user_class is a Class instance' do
it 'raises an error' do
- described_class.admin_user_class = Spree::LegacyUser
+ described_class.admin_user_class = Spree::AdminUser
expect { described_class.admin_user_class }.to raise_error(RuntimeError)
end
@@ -54,25 +67,25 @@ describe Spree do
context 'when admin_user_class is a Symbol instance' do
it 'returns the admin_user_class constant' do
- described_class.admin_user_class = :'Spree::LegacyUser'
+ described_class.admin_user_class = :'Spree::AdminUser'
- expect(described_class.admin_user_class).to eq(Spree::LegacyUser)
+ expect(described_class.admin_user_class).to eq(Spree::AdminUser)
end
end
context 'when admin_user_class is a String instance' do
it 'returns the admin_user_class constant' do
- described_class.admin_user_class = 'Spree::LegacyUser'
+ described_class.admin_user_class = 'Spree::AdminUser'
- expect(described_class.admin_user_class).to eq(Spree::LegacyUser)
+ expect(described_class.admin_user_class).to eq(Spree::AdminUser)
end
end
context 'when constantize is false' do
it 'returns the admin_user_class as a String' do
- described_class.admin_user_class = 'Spree::LegacyUser'
+ described_class.admin_user_class = 'Spree::AdminUser'
- expect(described_class.admin_user_class(constantize: false)).to eq('Spree::LegacyUser')
+ expect(described_class.admin_user_class(constantize: false)).to eq('Spree::AdminUser')
end
end
end
diff --git a/spree/core/spec/lib/tasks/core_spec.rb b/spree/core/spec/lib/tasks/core_spec.rb
index fbabb869ce..9e2bc9a6e1 100644
--- a/spree/core/spec/lib/tasks/core_spec.rb
+++ b/spree/core/spec/lib/tasks/core_spec.rb
@@ -37,7 +37,7 @@ end
describe 'core:migrate_newsletter_subscribers' do
include_context 'rake'
- before { allow_any_instance_of(Spree.user_class).to receive(:sync_newsletter_subscription_with_marketing_consent) }
+ before { allow_any_instance_of(Spree.customer_class).to receive(:sync_newsletter_subscription_with_marketing_consent) }
let!(:user) { create(:user, accepts_email_marketing: true) }
let(:conflicted_user) { create(:user, accepts_email_marketing: true) }
@@ -45,7 +45,7 @@ describe 'core:migrate_newsletter_subscribers' do
before do
create_list(:user, 5, accepts_email_marketing: true)
create_list(:user, 5, accepts_email_marketing: false)
- create(:newsletter_subscriber, :verified, email: conflicted_user.email, user: conflicted_user)
+ create(:newsletter_subscriber, :verified, email: conflicted_user.email, customer: conflicted_user)
end
it 'migrates newsletter subscribers' do
@@ -53,7 +53,7 @@ describe 'core:migrate_newsletter_subscribers' do
expect(Spree::NewsletterSubscriber.unverified.count).to eq(0)
expect(Spree::NewsletterSubscriber.verified.count).to eq(7)
- expect(Spree::NewsletterSubscriber.find_by(user: user).attributes).to include(
+ expect(Spree::NewsletterSubscriber.find_by(customer: user).attributes).to include(
'email' => user.email,
'verified_at' => user.updated_at,
'verification_token' => nil,
diff --git a/spree/core/spec/models/spree/ability_spec.rb b/spree/core/spec/models/spree/ability_spec.rb
index 8be4872c83..6dcd4e362a 100644
--- a/spree/core/spec/models/spree/ability_spec.rb
+++ b/spree/core/spec/models/spree/ability_spec.rb
@@ -33,7 +33,7 @@ describe Spree::Ability, type: :model do
let(:resource_shipment) { Spree::Shipment.new }
let(:resource_product) { store.products.new }
let(:resource_user) { create(:user) }
- let(:resource_order) { create(:order, user: resource_user) }
+ let(:resource_order) { create(:order, customer: resource_user) }
let(:fakedispatch_user) { create(:user) }
let(:fakedispatch_ability) { Spree::Ability.new(fakedispatch_user) }
@@ -118,7 +118,7 @@ describe Spree::Ability, type: :model do
end
context 'requested by other user' do
- before { resource.user = Spree.user_class.new }
+ before { resource.user = Spree.customer_class.new }
it_behaves_like 'create only'
end
@@ -224,7 +224,7 @@ describe Spree::Ability, type: :model do
let(:guest_address) { create(:address, user_id: nil) }
context 'with non-persisted guest user' do
- let(:guest_user) { Spree.user_class.new }
+ let(:guest_user) { Spree.customer_class.new }
let(:guest_ability) { Spree::Ability.new(guest_user) }
it 'cannot read guest addresses with nil user_id' do
diff --git a/spree/core/spec/models/spree/address_spec.rb b/spree/core/spec/models/spree/address_spec.rb
index 463a9ec203..90fe7741a9 100644
--- a/spree/core/spec/models/spree/address_spec.rb
+++ b/spree/core/spec/models/spree/address_spec.rb
@@ -324,7 +324,7 @@ describe Spree::Address, type: :model do
context 'when user is assigned and it has default name' do
it 'should assign address name to the user' do
user = create(:user, first_name: nil, last_name: nil)
- create(:address, user: user, firstname: 'John', lastname: 'Doe')
+ create(:address, customer: user, firstname: 'John', lastname: 'Doe')
expect(user.reload.first_name).to eq 'John'
expect(user.reload.last_name).to eq 'Doe'
@@ -520,9 +520,9 @@ describe Spree::Address, type: :model do
context 'editable & destroy' do
subject(:destroy_address) { address.destroy }
- let(:address) { create(:address, user: user) }
- let(:address2) { create(:address, user: user) }
- let(:address3) { create(:address, user: user) }
+ let(:address) { create(:address, customer: user) }
+ let(:address2) { create(:address, customer: user) }
+ let(:address3) { create(:address, customer: user) }
let(:order) { create(:completed_order_with_totals) }
let(:user) { create(:user) }
@@ -566,7 +566,7 @@ describe Spree::Address, type: :model do
context 'when an incomplete order references the address' do
let!(:incomplete_order) do
- create(:order, user: user, bill_address: address, ship_address: address, state: 'delivery')
+ create(:order, customer: user, bill_address: address, ship_address: address, state: 'delivery')
end
it 'detaches the address from the order and resets it to the address step' do
@@ -584,7 +584,7 @@ describe Spree::Address, type: :model do
end
it "leaves another user's order referencing the same address untouched" do
- other_order = create(:order, user: create(:user), bill_address: address, ship_address: address, state: 'delivery')
+ other_order = create(:order, customer: create(:user), bill_address: address, ship_address: address, state: 'delivery')
address.destroy
@@ -613,7 +613,7 @@ describe Spree::Address, type: :model do
before do
user.update(ship_address: address2, bill_address: address2)
user.reload
- allow_any_instance_of(Spree::LegacyUser).to receive(:save!).and_raise(ActiveRecord::RecordInvalid.new)
+ allow_any_instance_of(Spree.customer_class).to receive(:save!).and_raise(ActiveRecord::RecordInvalid.new)
end
it 'does not set deleted_at attribute for address' do
@@ -625,8 +625,8 @@ describe Spree::Address, type: :model do
describe '#assign_new_default_address_to_user' do
shared_examples 'default address' do
context 'when 2 addresses are available' do
- let!(:address2_quick_checkout) { create(:address, user: user, quick_checkout: true) }
- let!(:address3) { create(:address, user: user) }
+ let!(:address2_quick_checkout) { create(:address, customer: user, quick_checkout: true) }
+ let!(:address3) { create(:address, customer: user) }
it 'assigns last available address as default to bill and ship address' do
user.update!(bill_address: address, ship_address: address)
diff --git a/spree/core/spec/models/spree/admin_user_spec.rb b/spree/core/spec/models/spree/admin_user_spec.rb
index d1c5e5fdfc..7c4c7173bf 100644
--- a/spree/core/spec/models/spree/admin_user_spec.rb
+++ b/spree/core/spec/models/spree/admin_user_spec.rb
@@ -15,14 +15,12 @@ describe Spree.admin_user_class, type: :model do
expect(described_class.find_by_password_reset_token(token)).to be_nil
end
- # Regression: modern admin schemas have no password_salt column and Devise
- # defines no such method — the token payload must fall back to
- # encrypted_password instead of raising NameError. The test table
- # deliberately omits the legacy column so this spec exercises that path;
- # if password_salt ever responds again, the schema drifted back to the
- # legacy shape that masked the production 500.
- it 'generates tokens without a password_salt column' do
- expect(admin_user).not_to respond_to(:password_salt)
+ # The token payload keys off the password salt/digest so it invalidates
+ # when the password changes. has_secure_password provides #password_salt
+ # (derived from password_digest); the generator also falls back through
+ # encrypted_password/password_digest for legacy/Devise schemas without a
+ # password_salt column, so it never raises NameError.
+ it 'generates a password reset token from the password digest' do
expect(admin_user.generate_token_for(:password_reset)).to be_present
end
end
diff --git a/spree/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb b/spree/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb
index 47e8e498bc..0cc4d9ee2b 100644
--- a/spree/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb
+++ b/spree/core/spec/models/spree/authentication/strategies/base_strategy_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::Authentication::Strategies::BaseStrategy do
let(:params) { { email: '[email protected]', password: 'secret' } }
let(:request_env) { {} }
- let(:user_class) { Spree.user_class }
+ let(:user_class) { Spree.customer_class }
subject(:strategy) do
described_class.new(params: params, request_env: request_env, user_class: user_class)
@@ -27,8 +27,8 @@ describe Spree::Authentication::Strategies::BaseStrategy do
described_class.new(params: params, request_env: request_env)
end
- it 'defaults to Spree.user_class' do
- expect(strategy.user_class).to eq(Spree.user_class)
+ it 'defaults to Spree.customer_class' do
+ expect(strategy.user_class).to eq(Spree.customer_class)
end
end
end
diff --git a/spree/core/spec/models/spree/base_spec.rb b/spree/core/spec/models/spree/base_spec.rb
index bb29e020bf..f275df00a3 100644
--- a/spree/core/spec/models/spree/base_spec.rb
+++ b/spree/core/spec/models/spree/base_spec.rb
@@ -104,6 +104,6 @@ describe Spree::Base do
end
describe '.json_api_permitted_attributes' do
- it { expect(Spree::Address.json_api_permitted_attributes).to contain_exactly('firstname', 'lastname', 'address1', 'address2', 'city', 'zipcode', 'phone', 'state_name', 'alternative_phone', 'company', 'state_id', 'country_id', 'created_at', 'updated_at', 'user_id', 'deleted_at', 'label', 'public_metadata', 'private_metadata', 'quick_checkout', 'latitude', 'longitude') }
+ it { expect(Spree::Address.json_api_permitted_attributes).to contain_exactly('firstname', 'lastname', 'address1', 'address2', 'city', 'zipcode', 'phone', 'state_name', 'alternative_phone', 'company', 'state_id', 'country_id', 'created_at', 'updated_at', 'customer_id', 'deleted_at', 'label', 'public_metadata', 'private_metadata', 'quick_checkout', 'latitude', 'longitude') }
end
end
diff --git a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb
index 0f6bbadc69..f3a8a242aa 100644
--- a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb
+++ b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb
@@ -19,8 +19,8 @@ describe Spree::AdminUserMethods do
end
describe 'prefixed_id' do
- it 'generates a prefixed_id starting with admin_' do
- expect(admin_user.prefixed_id).to start_with('admin_')
+ it 'generates a prefixed_id starting with adm_' do
+ expect(admin_user.prefixed_id).to start_with('adm_')
end
it 'uses prefixed_id as to_param' do
@@ -194,18 +194,18 @@ describe Spree::AdminUserMethods do
end
describe 'class configuration' do
- it 'uses a different class than Spree.user_class' do
- expect(Spree.admin_user_class).to eq(Spree::LegacyAdminUser)
- expect(Spree.user_class).to eq(Spree::LegacyUser)
- expect(Spree.admin_user_class).not_to eq(Spree.user_class)
+ it 'uses a different class than Spree.customer_class' do
+ expect(Spree.admin_user_class).to eq(Spree::AdminUser)
+ expect(Spree.customer_class).to eq(Spree::Customer)
+ expect(Spree.admin_user_class).not_to eq(Spree.customer_class)
end
- it 'does not include UserMethods' do
- expect(Spree::LegacyAdminUser.included_modules).not_to include(Spree::UserMethods)
+ it 'does not include CustomerMethods' do
+ expect(Spree::AdminUser.included_modules).not_to include(Spree::CustomerMethods)
end
it 'includes AdminUserMethods' do
- expect(Spree::LegacyAdminUser.included_modules).to include(Spree::AdminUserMethods)
+ expect(Spree::AdminUser.included_modules).to include(Spree::AdminUserMethods)
end
end
diff --git a/spree/core/spec/models/spree/concerns/user_methods_spec.rb b/spree/core/spec/models/spree/concerns/user_methods_spec.rb
index d5e668a558..175a37a087 100644
--- a/spree/core/spec/models/spree/concerns/user_methods_spec.rb
+++ b/spree/core/spec/models/spree/concerns/user_methods_spec.rb
@@ -9,11 +9,11 @@ describe Spree::UserMethods do
subject { test_user.last_incomplete_spree_order(current_store) }
context 'with an incomplete order' do
- let(:last_incomplete_order) { create :order, user: test_user, store: current_store }
+ let(:last_incomplete_order) { create :order, customer: test_user, store: current_store }
before do
- create(:order, user: test_user, created_at: 1.day.ago, store: current_store)
- create(:order, user: create(:user), store: current_store)
+ create(:order, customer: test_user, created_at: 1.day.ago, store: current_store)
+ create(:order, customer: create(:user), store: current_store)
last_incomplete_order
end
@@ -21,7 +21,7 @@ describe Spree::UserMethods do
end
context 'with incomplete canceled order' do
- let(:canceled_order) { create(:order, user: test_user, created_at: 1.day.ago, store: current_store, state: 'canceled') }
+ let(:canceled_order) { create(:order, customer: test_user, created_at: 1.day.ago, store: current_store, state: 'canceled') }
it { is_expected.to be_nil }
end
@@ -37,7 +37,7 @@ describe Spree::UserMethods do
context 'rstrict t delete dependent destroyed' do
before do
test_user.promotion_rules.create!(promotion: possible_promotion)
- create(:order, user: test_user, completed_at: Time.current)
+ create(:order, customer: test_user, completed_at: Time.current)
end
it 'does not destroy dependent destroy items' do
@@ -49,7 +49,7 @@ describe Spree::UserMethods do
context 'allow to destroy dependent destroy' do
before do
test_user.promotion_rules.create!(promotion: possible_promotion)
- create(:order, user: test_user, created_at: 1.day.ago)
+ create(:order, customer: test_user, created_at: 1.day.ago)
test_user.destroy
end
@@ -69,13 +69,13 @@ describe Spree::UserMethods do
let(:inactive_payment_method) { create(:credit_card_payment_method, active: false) }
let!(:valid_credit_card) do
- create(:credit_card, user: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year, payment_method: active_payment_method)
+ create(:credit_card, customer: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year, payment_method: active_payment_method)
end
- let!(:other_user_credit_card) { create(:credit_card, user: other_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year) }
- let!(:blank_payment_profile_credit_card) { create(:credit_card, user: test_user, gateway_customer_profile_id: nil, year: next_year) }
- let!(:outdated_credit_card) { create(:credit_card, user: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: previous_year) }
+ let!(:other_user_credit_card) { create(:credit_card, customer: other_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year) }
+ let!(:blank_payment_profile_credit_card) { create(:credit_card, customer: test_user, gateway_customer_profile_id: nil, year: next_year) }
+ let!(:outdated_credit_card) { create(:credit_card, customer: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: previous_year) }
let!(:credit_card_with_inactive_payment_method) do
- create(:credit_card, user: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year, payment_method: inactive_payment_method)
+ create(:credit_card, customer: test_user, gateway_customer_profile_id: gateway_customer_profile_id, year: next_year, payment_method: inactive_payment_method)
end
it 'includes only not expired credit cards with payment profile that belong to subject user' do
@@ -102,7 +102,6 @@ describe Spree::UserMethods do
describe '#scramble_email_and_names' do
it 'scramble email and names' do
expect { test_user.send(:scramble_email_and_names) }.to change(test_user, :email).and change(test_user, :first_name).and change(test_user, :last_name)
- expect(test_user.login).to eq(test_user.email)
expect(test_user.first_name).to eq('Deleted')
expect(test_user.last_name).to eq('User')
end
@@ -123,51 +122,51 @@ describe Spree::UserMethods do
let!(:user_5) { create(:user, email: '[email protected]', first_name: 'John', last_name: 'Doe') }
it 'returns users based on a full email' do
- expect(Spree.user_class.search('[email protected]')).to eq([user_1])
- expect(Spree.user_class.search('[email protected]')).to eq([user_2])
- expect(Spree.user_class.search('[email protected]')).to eq([user_4])
- expect(Spree.user_class.search('[email protected]')).to eq([user_5])
+ expect(Spree.customer_class.search('[email protected]')).to eq([user_1])
+ expect(Spree.customer_class.search('[email protected]')).to eq([user_2])
+ expect(Spree.customer_class.search('[email protected]')).to eq([user_4])
+ expect(Spree.customer_class.search('[email protected]')).to eq([user_5])
end
it 'matches a partial email substring (admin pickers feed it a few chars at a time)' do
- expect(Spree.user_class.search('mary.moe@')).to eq([user_3])
- expect(Spree.user_class.search('john.doe')).to eq([user_1])
+ expect(Spree.customer_class.search('mary.moe@')).to eq([user_3])
+ expect(Spree.customer_class.search('john.doe')).to eq([user_1])
end
it 'is case-insensitive across email and name' do
mixed = create(:user, email: '[email protected]', first_name: 'Greg', last_name: 'Smith')
- expect(Spree.user_class.search('[email protected]')).to eq([mixed])
- expect(Spree.user_class.search('[email protected]')).to eq([mixed])
- expect(Spree.user_class.search('gReG.SmItH')).to eq([mixed])
- expect(Spree.user_class.search('GREG')).to eq([mixed])
- expect(Spree.user_class.search('SMITH')).to eq([mixed])
- expect(Spree.user_class.search('greg smith')).to eq([mixed])
- expect(Spree.user_class.search('GREG SMITH')).to eq([mixed])
+ expect(Spree.customer_class.search('[email protected]')).to eq([mixed])
+ expect(Spree.customer_class.search('[email protected]')).to eq([mixed])
+ expect(Spree.customer_class.search('gReG.SmItH')).to eq([mixed])
+ expect(Spree.customer_class.search('GREG')).to eq([mixed])
+ expect(Spree.customer_class.search('SMITH')).to eq([mixed])
+ expect(Spree.customer_class.search('greg smith')).to eq([mixed])
+ expect(Spree.customer_class.search('GREG SMITH')).to eq([mixed])
end
it 'returns users based on the first name' do
- expect(Spree.user_class.search('joh')).to include(user_1, user_5)
- expect(Spree.user_class.search('jan')).to include(user_2)
- expect(Spree.user_class.search('jan')).not_to include(user_1, user_3, user_4, user_5)
- expect(Spree.user_class.search('greg')).not_to include(user_1, user_2, user_3, user_4, user_5)
+ expect(Spree.customer_class.search('joh')).to include(user_1, user_5)
+ expect(Spree.customer_class.search('jan')).to include(user_2)
+ expect(Spree.customer_class.search('jan')).not_to include(user_1, user_3, user_4, user_5)
+ expect(Spree.customer_class.search('greg')).not_to include(user_1, user_2, user_3, user_4, user_5)
end
it 'returns users based on the last name' do
- expect(Spree.user_class.search('do')).to include(user_1, user_5)
- expect(Spree.user_class.search('moe')).to include(user_3)
- expect(Spree.user_class.search('moe')).not_to include(user_1, user_2, user_4, user_5)
- expect(Spree.user_class.search('smith')).not_to include(user_1, user_2, user_3, user_4, user_5)
+ expect(Spree.customer_class.search('do')).to include(user_1, user_5)
+ expect(Spree.customer_class.search('moe')).to include(user_3)
+ expect(Spree.customer_class.search('moe')).not_to include(user_1, user_2, user_4, user_5)
+ expect(Spree.customer_class.search('smith')).not_to include(user_1, user_2, user_3, user_4, user_5)
end
it 'returns users based on the full name' do
- expect(Spree.user_class.search('joh do')).to include(user_1, user_5)
- expect(Spree.user_class.search('ane gon')).to include(user_2)
- expect(Spree.user_class.search('ane gon')).not_to include(user_1, user_3, user_4, user_5)
- expect(Spree.user_class.search('mary moe')).to include(user_3)
- expect(Spree.user_class.search('mary moe')).not_to include(user_1, user_2, user_4, user_5)
- expect(Spree.user_class.search('jane moe')).to include(user_2, user_3)
- expect(Spree.user_class.search('greg smith')).not_to include(user_1, user_2, user_3, user_4, user_5)
+ expect(Spree.customer_class.search('joh do')).to include(user_1, user_5)
+ expect(Spree.customer_class.search('ane gon')).to include(user_2)
+ expect(Spree.customer_class.search('ane gon')).not_to include(user_1, user_3, user_4, user_5)
+ expect(Spree.customer_class.search('mary moe')).to include(user_3)
+ expect(Spree.customer_class.search('mary moe')).not_to include(user_1, user_2, user_4, user_5)
+ expect(Spree.customer_class.search('jane moe')).to include(user_2, user_3)
+ expect(Spree.customer_class.search('greg smith')).not_to include(user_1, user_2, user_3, user_4, user_5)
end
end
@@ -179,7 +178,7 @@ describe Spree::UserMethods do
end
it 'returns false if user has completed orders' do
- create(:order, user: test_user, completed_at: Time.current)
+ create(:order, customer: test_user, completed_at: Time.current)
expect(subject).to be(false)
end
@@ -205,7 +204,7 @@ describe Spree::UserMethods do
end
context 'when a user is created with the flag already set to true' do
- let(:new_user) { Spree.user_class.last }
+ let(:new_user) { Spree.customer_class.last }
it 'creates a verified newsletter subscriber for the current store' do
expect {
@@ -224,7 +223,7 @@ describe Spree::UserMethods do
before do
user.update!(accepts_email_marketing: true)
# Subscriber on another store proves the removal is scoped to the current store only.
- create(:newsletter_subscriber, user: user, email: user.email, store: other_store)
+ create(:newsletter_subscriber, customer: user, email: user.email, store: other_store)
end
it 'destroys only the current store subscriber, leaving other stores intact' do
@@ -255,13 +254,13 @@ describe Spree::UserMethods do
let(:other_store) { create(:store) }
it 'returns the subscriber for the given store' do
- subscriber = create(:newsletter_subscriber, user: user, email: user.email, store: current_store)
+ subscriber = create(:newsletter_subscriber, customer: user, email: user.email, store: current_store)
expect(user.newsletter_subscriber(current_store)).to eq(subscriber)
end
it 'defaults to the current store' do
- subscriber = create(:newsletter_subscriber, user: user, email: user.email, store: current_store)
+ subscriber = create(:newsletter_subscriber, customer: user, email: user.email, store: current_store)
Spree::Current.with(store: current_store) do
expect(user.newsletter_subscriber).to eq(subscriber)
@@ -273,7 +272,7 @@ describe Spree::UserMethods do
end
it 'ignores subscribers on other stores' do
- create(:newsletter_subscriber, user: user, email: user.email, store: other_store)
+ create(:newsletter_subscriber, customer: user, email: user.email, store: other_store)
expect(user.newsletter_subscriber(current_store)).to be_nil
end
diff --git a/spree/core/spec/models/spree/credit_card_spec.rb b/spree/core/spec/models/spree/credit_card_spec.rb
index 782f296d16..82d8f3af1a 100644
--- a/spree/core/spec/models/spree/credit_card_spec.rb
+++ b/spree/core/spec/models/spree/credit_card_spec.rb
@@ -150,14 +150,14 @@ describe Spree::CreditCard, type: :model do
let(:user) { create(:user) }
let(:payment_method) { create(:credit_card_payment_method) }
let!(:existing_card) do
- create(:credit_card, user: user, payment_method: payment_method,
+ create(:credit_card, customer: user, payment_method: payment_method,
fingerprint: 'FZqjhq46SWprIY8i', month: 11, year: 2030)
end
def build_duplicate(attributes = {})
build(
:credit_card,
- { user: user, payment_method: payment_method, fingerprint: 'FZqjhq46SWprIY8i', month: 11, year: 2030 }.merge(attributes)
+ { customer: user, payment_method: payment_method, fingerprint: 'FZqjhq46SWprIY8i', month: 11, year: 2030 }.merge(attributes)
)
end
@@ -176,7 +176,7 @@ describe Spree::CreditCard, type: :model do
end
it 'does not enforce uniqueness when the fingerprint is missing' do
- create(:credit_card, user: user, payment_method: payment_method, fingerprint: nil, month: 11, year: 2030)
+ create(:credit_card, customer: user, payment_method: payment_method, fingerprint: nil, month: 11, year: 2030)
expect(build_duplicate(fingerprint: nil)).to be_valid
end
@@ -363,8 +363,8 @@ describe Spree::CreditCard, type: :model do
it 'ensures only one credit card per user is default at a time' do
user = FactoryBot.create(:user)
- first = FactoryBot.create(:credit_card, user: user, default: true)
- second = FactoryBot.create(:credit_card, user: user, default: true)
+ first = FactoryBot.create(:credit_card, customer: user, default: true)
+ second = FactoryBot.create(:credit_card, customer: user, default: true)
expect(first.reload.default).to eq false
expect(second.reload.default).to eq true
@@ -377,8 +377,8 @@ describe Spree::CreditCard, type: :model do
end
it 'allows default credit cards for different users' do
- first = FactoryBot.create(:credit_card, user: FactoryBot.create(:user), default: true)
- second = FactoryBot.create(:credit_card, user: FactoryBot.create(:user), default: true)
+ first = FactoryBot.create(:credit_card, customer: FactoryBot.create(:user), default: true)
+ second = FactoryBot.create(:credit_card, customer: FactoryBot.create(:user), default: true)
expect(first.reload.default).to eq true
expect(second.reload.default).to eq true
@@ -386,8 +386,8 @@ describe Spree::CreditCard, type: :model do
it 'allows this card to save even if the previously default card has expired' do
user = FactoryBot.create(:user)
- first = FactoryBot.create(:credit_card, user: user, default: true)
- second = FactoryBot.create(:credit_card, user: user, default: false)
+ first = FactoryBot.create(:credit_card, customer: user, default: true)
+ second = FactoryBot.create(:credit_card, customer: user, default: false)
first.update_columns(year: Time.current.year, month: 1.month.ago.month)
expect { second.update!(default: true) }.not_to raise_error
diff --git a/spree/core/spec/models/spree/customer_group_user_spec.rb b/spree/core/spec/models/spree/customer_group_user_spec.rb
index 5887197b66..c40e2d9ef4 100644
--- a/spree/core/spec/models/spree/customer_group_user_spec.rb
+++ b/spree/core/spec/models/spree/customer_group_user_spec.rb
@@ -6,25 +6,25 @@ RSpec.describe Spree::CustomerGroupUser, type: :model do
describe 'associations' do
it { is_expected.to belong_to(:customer_group).optional(false) }
- it { is_expected.to belong_to(:user).optional(false) }
+ it { is_expected.to belong_to(:customer).optional(false) }
end
describe 'validations' do
it { is_expected.to validate_presence_of(:customer_group) }
- it { is_expected.to validate_presence_of(:user) }
+ it { is_expected.to validate_presence_of(:customer) }
context 'uniqueness' do
- let!(:existing) { create(:customer_group_user, customer_group: customer_group, user: user) }
+ let!(:existing) { create(:customer_group_user, customer_group: customer_group, customer: user) }
it 'validates uniqueness of customer_group_id within user scope' do
- duplicate = build(:customer_group_user, customer_group: customer_group, user: user)
+ duplicate = build(:customer_group_user, customer_group: customer_group, customer: user)
expect(duplicate).not_to be_valid
expect(duplicate.errors[:customer_group_id]).to include('has already been taken')
end
it 'allows same user in different groups' do
other_group = create(:customer_group)
- new_membership = build(:customer_group_user, customer_group: other_group, user: user)
+ new_membership = build(:customer_group_user, customer_group: other_group, customer: user)
expect(new_membership).to be_valid
end
end
diff --git a/spree/core/spec/models/spree/customer_spec.rb b/spree/core/spec/models/spree/customer_spec.rb
new file mode 100644
index 0000000000..e88b379bfa
--- /dev/null
+++ b/spree/core/spec/models/spree/customer_spec.rb
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe Spree::Customer, type: :model do
+ subject(:customer) { create(:customer, password: 'secret-123', password_confirmation: 'secret-123') }
+
+ describe 'has_secure_password' do
+ it 'authenticates with the correct password' do
+ expect(customer.authenticate('secret-123')).to eq(customer)
+ end
+
+ it 'rejects an incorrect password' do
+ expect(customer.authenticate('wrong')).to be(false)
+ end
+
+ it 'exposes valid_password? as an alias for authenticate' do
+ expect(customer.valid_password?('secret-123')).to be(true)
+ expect(customer.valid_password?('wrong')).to be(false)
+ end
+
+ it 'allows a customer without a password (admin-created, claim later)' do
+ expect(build(:customer, password: nil, password_confirmation: nil)).to be_valid
+ end
+ end
+
+ describe 'validations' do
+ it 'requires an email' do
+ expect(build(:customer, email: nil)).not_to be_valid
+ end
+
+ it 'enforces case-insensitive email uniqueness' do
+ customer
+ dup = build(:customer, email: customer.email.upcase)
+ expect(dup).not_to be_valid
+ end
+ end
+
+ describe 'password reset tokens' do
+ it 'round-trips through find_by_password_reset_token' do
+ token = customer.generate_token_for(:password_reset)
+ expect(described_class.find_by_password_reset_token(token)).to eq(customer)
+ end
+
+ it 'invalidates the token when the password changes' do
+ token = customer.generate_token_for(:password_reset)
+ customer.update!(password: 'new-secret-123', password_confirmation: 'new-secret-123')
+ expect(described_class.find_by_password_reset_token(token)).to be_nil
+ end
+ end
+
+ describe 'account lockout' do
+ it 'is not locked by default' do
+ expect(customer).not_to be_locked
+ end
+
+ it 'locks after five failed attempts' do
+ 5.times { customer.record_failed_attempt! }
+ expect(customer).to be_locked
+ end
+
+ it 'clears the lock on reset' do
+ 5.times { customer.record_failed_attempt! }
+ customer.reset_failed_attempts!
+ expect(customer.reload).not_to be_locked
+ expect(customer.failed_attempts).to eq(0)
+ end
+ end
+
+ describe 'prefixed id' do
+ it 'uses the cust_ prefix' do
+ expect(customer.prefixed_id).to start_with('cust_')
+ end
+ end
+end
diff --git a/spree/core/spec/models/spree/gift_card_spec.rb b/spree/core/spec/models/spree/gift_card_spec.rb
index 0c7e5ebe35..20945de9d8 100644
--- a/spree/core/spec/models/spree/gift_card_spec.rb
+++ b/spree/core/spec/models/spree/gift_card_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe Spree::GiftCard, type: :model do
describe '#to_csv' do
let(:user) { create(:user, first_name: 'John', last_name: 'Doe', email: '[email protected]') }
- let(:gift_card) { create(:gift_card, store: store, user: user, amount: 50.00) }
+ let(:gift_card) { create(:gift_card, store: store, customer: user, amount: 50.00) }
subject { gift_card.to_csv }
diff --git a/spree/core/spec/models/spree/import_spec.rb b/spree/core/spec/models/spree/import_spec.rb
index 19f64b869b..961bb8f984 100644
--- a/spree/core/spec/models/spree/import_spec.rb
+++ b/spree/core/spec/models/spree/import_spec.rb
@@ -120,7 +120,7 @@ RSpec.describe Spree::Import, :job, type: :model do
context 'for Customers import' do
it 'returns the user class' do
import.type = 'Spree::Imports::Customers'
- expect(import.model_class).to eq(Spree.user_class)
+ expect(import.model_class).to eq(Spree.customer_class)
end
end
end
diff --git a/spree/core/spec/models/spree/imports/customers_spec.rb b/spree/core/spec/models/spree/imports/customers_spec.rb
index 41d5822035..a1174959f4 100644
--- a/spree/core/spec/models/spree/imports/customers_spec.rb
+++ b/spree/core/spec/models/spree/imports/customers_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Spree::Imports::Customers, type: :model do
describe '#model_class' do
it 'returns the user class' do
- expect(import.model_class).to eq Spree.user_class
+ expect(import.model_class).to eq Spree.customer_class
end
end
diff --git a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb b/spree/core/spec/models/spree/newsletter_subscriber_spec.rb
index ba7d7f41b2..f1e6ffe9ca 100644
--- a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb
+++ b/spree/core/spec/models/spree/newsletter_subscriber_spec.rb
@@ -21,7 +21,7 @@ describe Spree::NewsletterSubscriber, type: :model, newsletter: true do
end
describe 'associations' do
- it { is_expected.to belong_to(:user).optional }
+ it { is_expected.to belong_to(:customer).optional }
it { is_expected.to belong_to(:store).without_validating_presence }
end
@@ -67,7 +67,7 @@ describe Spree::NewsletterSubscriber, type: :model, newsletter: true do
let(:subscribe_service) { double(Spree::Newsletter::Subscribe) }
context 'with user and store' do
- subject { described_class.subscribe(email: email, user: user, store: store) }
+ subject { described_class.subscribe(email: email, customer: user, store: store) }
let(:user) { create(:user) }
let(:store) { create(:store) }
diff --git a/spree/core/spec/models/spree/order/address_spec.rb b/spree/core/spec/models/spree/order/address_spec.rb
index 0b7d66e575..c217b50532 100644
--- a/spree/core/spec/models/spree/order/address_spec.rb
+++ b/spree/core/spec/models/spree/order/address_spec.rb
@@ -50,7 +50,7 @@ describe Spree::Order, type: :model do
context 'address book' do
let(:order) { create(:order) }
- let(:address) { create(:address, user: order.user) }
+ let(:address) { create(:address, customer: order.user) }
describe 'mass attribute assignment for bill_address_id, ship_address_id' do
it 'is able to mass assign bill_address_id' do
@@ -84,8 +84,8 @@ describe Spree::Order, type: :model do
end
context 'when user wants to update firstname of the address with already completed order' do
- let(:address) { create(:address, user: order.user) }
- let!(:completed_order) { create(:completed_order_with_totals, user: order.user, ship_address: address) }
+ let(:address) { create(:address, customer: order.user) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: order.user, ship_address: address) }
it 'creates new address with updated attributes' do
expect(
diff --git a/spree/core/spec/models/spree/order/checkout_spec.rb b/spree/core/spec/models/spree/order/checkout_spec.rb
index 5c4a02adea..1473adeffd 100644
--- a/spree/core/spec/models/spree/order/checkout_spec.rb
+++ b/spree/core/spec/models/spree/order/checkout_spec.rb
@@ -498,7 +498,7 @@ describe Spree::Order, type: :model do
let(:accept_marketing) { true }
it 'subscribes to newsletter' do
- expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: order.user, store: order.store)
+ expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, customer: order.customer, store: order.store)
order.next!
end
end
@@ -566,7 +566,7 @@ describe Spree::Order, type: :model do
end
it 'creates a new user' do
- expect { order.next! }.to change { Spree.user_class.count }.by(1)
+ expect { order.next! }.to change { Spree.customer_class.count }.by(1)
expect(order.user).to be_present
expect(order.user.email).to eq(order.email)
end
@@ -578,7 +578,7 @@ describe Spree::Order, type: :model do
end
it 'does not create a new user' do
- expect { order.next! }.not_to change { Spree.user_class.count }
+ expect { order.next! }.not_to change { Spree.customer_class.count }
end
end
end
diff --git a/spree/core/spec/models/spree/order/store_credit_spec.rb b/spree/core/spec/models/spree/order/store_credit_spec.rb
index 60de4b389c..c00d2b3eeb 100644
--- a/spree/core/spec/models/spree/order/store_credit_spec.rb
+++ b/spree/core/spec/models/spree/order/store_credit_spec.rb
@@ -52,7 +52,7 @@ describe 'Order' do
context 'there is enough store credit to pay for the entire order' do
let(:store_credit) { create(:store_credit, amount: order_total) }
- let(:order) { create(:order, user: store_credit.user, total: order_total) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total) }
before do
subject
@@ -70,7 +70,7 @@ describe 'Order' do
let(:expected_cc_total) { 100.0 }
let(:store_credit_total) { order_total - expected_cc_total }
let(:store_credit) { create(:store_credit, amount: store_credit_total) }
- let(:order) { create(:order, user: store_credit.user, total: order_total) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total) }
before do
# callbacks recalculate total based on line items
@@ -92,10 +92,10 @@ describe 'Order' do
let(:amount_difference) { 100 }
let!(:primary_store_credit) { create(:store_credit, amount: (order_total - amount_difference)) }
let!(:secondary_store_credit) do
- create(:store_credit, amount: order_total, user: primary_store_credit.user,
+ create(:store_credit, amount: order_total, customer: primary_store_credit.user,
credit_type: create(:secondary_credit_type))
end
- let(:order) { create(:order, user: primary_store_credit.user, total: order_total) }
+ let(:order) { create(:order, customer: primary_store_credit.user, total: order_total) }
before do
Timecop.scale(3600)
@@ -123,7 +123,7 @@ describe 'Order' do
subject { order.remove_store_credit_payments }
let(:order_total) { 500.00 }
- let(:order) { create(:order, user: store_credit.user, total: order_total) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total) }
context 'when order is not complete' do
let(:store_credit) { create(:store_credit, amount: order_total - 1) }
@@ -162,13 +162,13 @@ describe 'Order' do
context 'order has an associated user' do
subject { order.covered_by_store_credit? }
- let(:order) { create(:order, user: user, total: order_total) }
+ let(:order) { create(:order, customer: user, total: order_total) }
let(:user) { create(:user) }
let(:order_total) { 10.0 }
context 'user has enough store credit to pay for the order' do
let!(:store_credit_payment) { create(:store_credit_payment, order: order, source: store_credit, amount: 10.0) }
- let(:store_credit) { create(:store_credit, amount: 10.0, store: order.store, user: order.user) }
+ let(:store_credit) { create(:store_credit, amount: 10.0, store: order.store, customer: order.user) }
it { is_expected.to be(true) }
end
@@ -199,7 +199,7 @@ describe 'Order' do
end
context 'order has an associated user' do
- subject { create(:order, user: user) }
+ subject { create(:order, customer: user) }
let(:user) { create(:user) }
let(:available_store_credit) { 25.0 }
@@ -215,7 +215,7 @@ describe 'Order' do
context 'when store is provided' do
let!(:store) { @default_store }
let!(:second_store) { create(:store) }
- let!(:store_credit) { create(:store_credit, amount: '100', user: user, store: store) }
+ let!(:store_credit) { create(:store_credit, amount: '100', customer: user, store: store) }
before do
allow(user).to receive(:total_available_store_credit).and_call_original
@@ -254,12 +254,12 @@ describe 'Order' do
end
context 'order has an associated user' do
- let(:order) { create(:order, user: user, currency: 'USD') }
+ let(:order) { create(:order, customer: user, currency: 'USD') }
let(:user) { create(:user) }
- let!(:store_credit_1) { create(:store_credit, user: user, amount: 10, currency: 'USD') }
- let!(:store_credit_2) { create(:store_credit, user: user, amount: 15, currency: 'USD') }
- let!(:store_credit_3) { create(:store_credit, user: user, amount: 20, currency: 'EUR') }
+ let!(:store_credit_1) { create(:store_credit, customer: user, amount: 10, currency: 'USD') }
+ let!(:store_credit_2) { create(:store_credit, customer: user, amount: 15, currency: 'USD') }
+ let!(:store_credit_3) { create(:store_credit, customer: user, amount: 20, currency: 'EUR') }
it 'returns the user available store credits' do
expect(subject).to eq([store_credit_2, store_credit_1])
@@ -277,7 +277,7 @@ describe 'Order' do
end
context 'order has an associated user' do
- subject { create(:order, user: user) }
+ subject { create(:order, customer: user) }
let(:user) { create(:user) }
@@ -365,7 +365,7 @@ describe 'Order' do
let(:store) { @default_store }
let(:store_credit) { create(:store_credit, store: store) }
- let(:order) { create(:order, user: store_credit.user, store: store) }
+ let(:order) { create(:order, customer: store_credit.user, store: store) }
context 'the store credit is more than the order total' do
let(:order_total) { store_credit.amount - 1 }
diff --git a/spree/core/spec/models/spree/order_contents_spec.rb b/spree/core/spec/models/spree/order_contents_spec.rb
index 22d29b2ea4..70906cb574 100644
--- a/spree/core/spec/models/spree/order_contents_spec.rb
+++ b/spree/core/spec/models/spree/order_contents_spec.rb
@@ -6,7 +6,7 @@ describe Spree::OrderContents, type: :model do
let!(:zone) { create(:zone_with_country, default_tax: true) }
let(:store) { create(:store, checkout_zone: zone) }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
let(:variant) { create(:variant) }
describe '#add' do
@@ -59,7 +59,7 @@ describe Spree::OrderContents, type: :model do
end
context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
+ let(:order) { create(:order, customer: user, store: store, total: 100) }
let!(:payment) { create(:store_credit_payment, order: order) }
it { expect { subject.add(variant, 1) }.to change { order.payments.store_credits.count }.by(-1) }
@@ -173,7 +173,7 @@ describe Spree::OrderContents, type: :model do
end
context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
+ let(:order) { create(:order, customer: user, store: store, total: 100) }
let(:payment) { create(:store_credit_payment, amount: 10, order: order) }
before do
@@ -227,7 +227,7 @@ describe Spree::OrderContents, type: :model do
end
context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
+ let(:order) { create(:order, customer: user, store: store, total: 100) }
let(:payment) { create(:store_credit_payment, amount: 10, order: order) }
before do
@@ -281,7 +281,7 @@ describe Spree::OrderContents, type: :model do
end
context 'when store_credits payment' do
- let(:order) { create(:order, user: user, store: store, total: 100) }
+ let(:order) { create(:order, customer: user, store: store, total: 100) }
let!(:payment) { create(:store_credit_payment, amount: 10, order: order) }
it { expect { subject.update_cart params }.to change { order.payments.store_credits.count }.by(-1) }
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index b2945e46a1..64e7984b32 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -11,7 +11,7 @@ describe Spree::Order, type: :model do
let(:user) { create(:user) }
let!(:store) { @default_store }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
before { allow(Spree::LegacyUser).to receive_messages(current: build(:user)) }
@@ -19,9 +19,9 @@ describe Spree::Order, type: :model do
describe 'Scopes' do
let!(:user) { create(:user) }
- let!(:completed_order) { create(:order, user: user, completed_at: Time.current) }
- let!(:incompleted_order) { create(:order, user: user, completed_at: nil) }
- let!(:canceled_order) { create(:order, user: user, completed_at: nil, state: 'canceled') }
+ let!(:completed_order) { create(:order, customer: user, completed_at: Time.current) }
+ let!(:incompleted_order) { create(:order, customer: user, completed_at: nil) }
+ let!(:canceled_order) { create(:order, customer: user, completed_at: nil, state: 'canceled') }
describe '.complete' do
it { expect(Spree::Order.complete).to include completed_order }
@@ -38,11 +38,11 @@ describe Spree::Order, type: :model do
end
describe '.search' do
- let!(:order_1) { create(:order, number: 'R100', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Don', last_name: 'Roe')) }
- let!(:order_2) { create(:order, number: 'R101', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Jane', last_name: 'Gone')) }
- let!(:order_3) { create(:order, number: 'R200', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Mary', last_name: 'Moe')) }
- let!(:order_4) { create(:order, number: 'R300', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Ayn', last_name: 'Rand')) }
- let!(:order_5) { create(:order, number: 'R400', user: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'John', last_name: 'Doe')) }
+ let!(:order_1) { create(:order, number: 'R100', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Don', last_name: 'Roe')) }
+ let!(:order_2) { create(:order, number: 'R101', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Jane', last_name: 'Gone')) }
+ let!(:order_3) { create(:order, number: 'R200', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Mary', last_name: 'Moe')) }
+ let!(:order_4) { create(:order, number: 'R300', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'Ayn', last_name: 'Rand')) }
+ let!(:order_5) { create(:order, number: 'R400', customer: create(:user, email: '[email protected]'), bill_address: create(:address, first_name: 'John', last_name: 'Doe')) }
it 'returns orders based on an email' do
expect(described_class.search('[email protected]')).to eq([order_1])
@@ -75,8 +75,8 @@ describe Spree::Order, type: :model do
end
describe 'Callbacks' do
- let(:order) { build(:order, user: user, store: store, ship_address: ship_address) }
- let(:ship_address) { create(:address, user: user) }
+ let(:order) { build(:order, customer: user, store: store, ship_address: ship_address) }
+ let(:ship_address) { create(:address, customer: user) }
describe '#clone_shipping_address' do
it 'clones the shipping address when use_shipping is true' do
@@ -164,7 +164,7 @@ describe Spree::Order, type: :model do
describe '#full_name' do
subject { order.full_name }
- let(:order) { build(:order, user: user, bill_address: bill_address, email: email) }
+ let(:order) { build(:order, customer: user, bill_address: bill_address, email: email) }
let(:bill_address) { nil }
let(:email) { '[email protected]' }
@@ -603,7 +603,7 @@ describe Spree::Order, type: :model do
end
describe '#amount_due' do
- let(:store_credit) { create(:store_credit, amount: 200, store: order.store, user: order.user) }
+ let(:store_credit) { create(:store_credit, amount: 200, store: order.store, customer: order.user) }
let(:store_credit_payment_method) { create(:store_credit_payment_method, store: order.store) }
before { order.update_columns(total: 100, payment_total: 0) }
@@ -866,7 +866,7 @@ describe Spree::Order, type: :model do
let(:no_method) { double :payment_method, available_for_order?: false, available_for_store?: true, store: store }
let(:methods) { [ok_method, no_method] }
let(:store_2) { create(:store) }
- let(:order_from_different_store) { create(:order, user: user, store: store_2) }
+ let(:order_from_different_store) { create(:order, customer: user, store: store_2) }
it 'includes frontend payment methods' do
payment_method = store.payment_methods.create!(name: 'Fake', active: true, display_on: 'front_end')
@@ -1334,7 +1334,7 @@ describe Spree::Order, type: :model do
describe '#amount' do
before do
- @order = create(:order, user: user)
+ @order = create(:order, customer: user)
@order.line_items = [create(:line_item, price: 1.0, quantity: 2),
create(:line_item, price: 1.0, quantity: 1)]
end
@@ -1739,7 +1739,7 @@ describe Spree::Order, type: :model do
describe '#promo_code' do
context 'without promo code' do
- let(:order) { build_stubbed(:order, user: nil, email: nil) }
+ let(:order) { build_stubbed(:order, customer: nil, email: nil) }
it 'returns nil' do
expect(order.promo_code).to be_nil
@@ -2087,10 +2087,10 @@ describe Spree::Order, type: :model do
subject { order.bill_address_id = address.id }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, bill_address: bill_address, ship_address: ship_address) }
- let(:bill_address) { create(:address, user: user) }
- let(:ship_address) { create(:address, user: user) }
- let(:address) { create(:address, user: user) }
+ let(:order) { create(:order, customer: user, bill_address: bill_address, ship_address: ship_address) }
+ let(:bill_address) { create(:address, customer: user) }
+ let(:ship_address) { create(:address, customer: user) }
+ let(:address) { create(:address, customer: user) }
context 'when assigned address exist' do
context 'when assigned address belongs to user' do
@@ -2108,7 +2108,7 @@ describe Spree::Order, type: :model do
end
context 'when assigned address does not belong to user' do
- let(:address) { create(:address, user: create(:user)) }
+ let(:address) { create(:address, customer: create(:user)) }
it 'sets order bill address to nil' do
expect { subject }.to change { order.bill_address_id }.to(nil)
@@ -2117,7 +2117,7 @@ describe Spree::Order, type: :model do
context 'with guest user' do
let(:user) { nil }
- let(:address) { create(:address, user: nil) }
+ let(:address) { create(:address, customer: nil) }
context 'when assigning the same existing address' do
let(:address) { bill_address }
@@ -2138,7 +2138,7 @@ describe Spree::Order, type: :model do
describe '#bill_address_attributes=' do
subject { order.bill_address_attributes = address_attributes }
- let(:order) { create(:order, user: user) }
+ let(:order) { create(:order, customer: user) }
let(:address_attributes) { attributes_for(:address) }
context 'when user has default bill address' do
@@ -2174,7 +2174,7 @@ describe Spree::Order, type: :model do
end
context 'when user has address but without default bill address' do
- let(:address) { create(:address, user: user) }
+ let(:address) { create(:address, customer: user) }
let(:user) { create(:user_with_addresses) }
before { user.bill_address = nil }
@@ -2192,10 +2192,10 @@ describe Spree::Order, type: :model do
subject { order.ship_address_id = address.id }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, bill_address: bill_address, ship_address: ship_address) }
- let(:bill_address) { create(:address, user: user) }
- let(:ship_address) { create(:address, user: user) }
- let(:address) { create(:address, user: user) }
+ let(:order) { create(:order, customer: user, bill_address: bill_address, ship_address: ship_address) }
+ let(:bill_address) { create(:address, customer: user) }
+ let(:ship_address) { create(:address, customer: user) }
+ let(:address) { create(:address, customer: user) }
context 'when assigned address exist' do
context 'when assigned address belongs to user' do
@@ -2213,7 +2213,7 @@ describe Spree::Order, type: :model do
end
context 'when assigned address does not belong to user' do
- let(:address) { create(:address, user: create(:user)) }
+ let(:address) { create(:address, customer: create(:user)) }
it 'sets order ship address to nil' do
expect { subject }.to change { order.ship_address_id }.to(nil)
@@ -2222,7 +2222,7 @@ describe Spree::Order, type: :model do
context 'with guest user' do
let(:user) { nil }
- let(:address) { create(:address, user: nil) }
+ let(:address) { create(:address, customer: nil) }
context 'when assigning the same existing address' do
let(:address) { ship_address }
@@ -2243,7 +2243,7 @@ describe Spree::Order, type: :model do
describe '#ship_address_attributes=' do
subject { order.ship_address_attributes = address_attributes }
- let(:order) { create(:order, user: user) }
+ let(:order) { create(:order, customer: user) }
let(:address_attributes) { attributes_for(:address) }
context 'when user has default ship address' do
@@ -2277,7 +2277,7 @@ describe Spree::Order, type: :model do
end
context 'when user has address but without default ship address' do
- let(:address) { create(:address, user: user) }
+ let(:address) { create(:address, customer: user) }
let(:user) { create(:user_with_addresses) }
before { user.update(ship_address: nil) }
@@ -2467,7 +2467,7 @@ describe Spree::Order, type: :model do
let!(:refund) { create(:refund, amount: amount, payment: order.payments.first) }
let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method) }
- let!(:store_credit) { create(:store_credit, user: order.user, amount: 15) }
+ let!(:store_credit) { create(:store_credit, customer: order.user, amount: 15) }
before do
order.update_column(:total, 110)
@@ -2541,7 +2541,7 @@ describe Spree::Order, type: :model do
let!(:refund) { create(:refund, amount: amount, payment: order.payments.first) }
let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method) }
- let!(:store_credit) { create(:store_credit, user: order.user, amount: 15) }
+ let!(:store_credit) { create(:store_credit, customer: order.user, amount: 15) }
before do
order.update_column(:total, 110)
@@ -2861,7 +2861,7 @@ describe Spree::Order, type: :model do
end
describe '#remove_out_of_stock_items!' do
- let(:order) { create(:order_with_totals, store: store, user: user) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
context 'when all items are in stock' do
it 'does not remove any items' do
@@ -2906,7 +2906,7 @@ describe Spree::Order, type: :model do
end
context 'when cart is empty' do
- let(:order) { create(:order, store: store, user: user) }
+ let(:order) { create(:order, store: store, customer: user) }
it 'does nothing' do
order.remove_out_of_stock_items!
diff --git a/spree/core/spec/models/spree/payment_method/store_credit_spec.rb b/spree/core/spec/models/spree/payment_method/store_credit_spec.rb
index 96dc90b50e..0a1be02aaa 100644
--- a/spree/core/spec/models/spree/payment_method/store_credit_spec.rb
+++ b/spree/core/spec/models/spree/payment_method/store_credit_spec.rb
@@ -296,15 +296,15 @@ describe Spree::PaymentMethod::StoreCredit do
context 'when user have store credits' do
let(:store) { @default_store }
let!(:user_with_store_credits) { create(:user) }
- let!(:store_credit) { create(:store_credit, user: user_with_store_credits, store: store) }
- let!(:order_with_store_credit) { create(:order, user: user_with_store_credits, store: store) }
+ let!(:store_credit) { create(:store_credit, customer: user_with_store_credits, store: store) }
+ let!(:order_with_store_credit) { create(:order, customer: user_with_store_credits, store: store) }
it { expect(store_credit_payment_method.available_for_order?(order_with_store_credit)).to be true }
end
context "when user don't store credits" do
let!(:user_without_store_credits) { create(:user) }
- let!(:order_without_store_credit) { create(:order, user: user_without_store_credits) }
+ let!(:order_without_store_credit) { create(:order, customer: user_without_store_credits) }
it { expect(store_credit_payment_method.available_for_order?(order_without_store_credit)).to be false }
end
diff --git a/spree/core/spec/models/spree/payment_setup_session_spec.rb b/spree/core/spec/models/spree/payment_setup_session_spec.rb
index 176fa74fd0..dd84927da9 100644
--- a/spree/core/spec/models/spree/payment_setup_session_spec.rb
+++ b/spree/core/spec/models/spree/payment_setup_session_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Spree::PaymentSetupSession, type: :model do
end
it 'can have a payment_source (CreditCard)' do
- credit_card = create(:credit_card, user: user)
+ credit_card = create(:credit_card, customer: user)
payment_setup_session.update!(payment_source: credit_card)
expect(payment_setup_session.payment_source).to eq(credit_card)
expect(payment_setup_session.payment_source_type).to eq('Spree::CreditCard')
diff --git a/spree/core/spec/models/spree/payment_source_spec.rb b/spree/core/spec/models/spree/payment_source_spec.rb
index 5d9dbe423a..b4bc0a5bf8 100644
--- a/spree/core/spec/models/spree/payment_source_spec.rb
+++ b/spree/core/spec/models/spree/payment_source_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
RSpec.describe Spree::PaymentSource, type: :model do
let(:store) { @default_store }
let(:payment_method) { create(:custom_payment_method) }
- let(:payment_source) { create(:payment_source, user: user, payment_method: payment_method) }
+ let(:payment_source) { create(:payment_source, customer: user, payment_method: payment_method) }
let(:user) { create(:user) }
describe '#gateway_customer' do
- let!(:gateway_customer) { create(:gateway_customer, payment_method: payment_method, user: user) }
+ let!(:gateway_customer) { create(:gateway_customer, payment_method: payment_method, customer: user) }
context 'when user is present' do
it 'returns the gateway customer for the user' do
@@ -16,7 +16,7 @@ RSpec.describe Spree::PaymentSource, type: :model do
end
context 'when user is not present' do
- let(:payment_source) { create(:payment_source, user: nil, payment_method: payment_method) }
+ let(:payment_source) { create(:payment_source, customer: nil, payment_method: payment_method) }
it 'returns nil' do
expect(payment_source.gateway_customer).to be_nil
diff --git a/spree/core/spec/models/spree/payment_spec.rb b/spree/core/spec/models/spree/payment_spec.rb
index 46abcd8d92..95ce909a23 100644
--- a/spree/core/spec/models/spree/payment_spec.rb
+++ b/spree/core/spec/models/spree/payment_spec.rb
@@ -244,9 +244,9 @@ describe Spree::Payment, type: :model do
context 'when source is not a credit card' do
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, total: 100) }
+ let(:order) { create(:order, customer: user, total: 100) }
let(:gateway) { create(:custom_payment_method) }
- let(:source) { create(:payment_source, user: user, payment_method: gateway) }
+ let(:source) { create(:payment_source, customer: user, payment_method: gateway) }
let(:payment) { build(:custom_payment, source: source, amount: 100, payment_method: gateway) }
it 'creates a payment profile' do
@@ -942,7 +942,7 @@ describe Spree::Payment, type: :model do
end
context 'existing card' do
- let!(:credit_card) { create(:credit_card, number: '4111111111111112', user: order.user, payment_method: gateway, gateway_customer_profile_id: 'BGS-1234567890') }
+ let!(:credit_card) { create(:credit_card, number: '4111111111111112', customer: order.user, payment_method: gateway, gateway_customer_profile_id: 'BGS-1234567890') }
let(:params) do
{
diff --git a/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb b/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
index f1b3a6006f..47f985fbaa 100644
--- a/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
+++ b/spree/core/spec/models/spree/permission_sets/ability_integration_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe 'Permission Sets Integration with Ability', type: :model do
Class.new(Spree::PermissionSets::Base) do
def activate!
can [:read, :admin], Spree::Order
- can [:read, :admin], Spree.user_class
+ can [:read, :admin], Spree.customer_class
end
end
end
@@ -92,7 +92,7 @@ RSpec.describe 'Permission Sets Integration with Ability', type: :model do
end
describe 'default role' do
- let(:guest_user) { Spree.user_class.new }
+ let(:guest_user) { Spree.customer_class.new }
before do
Spree.permissions.assign(:default, Spree::PermissionSets::DefaultCustomer)
diff --git a/spree/core/spec/models/spree/permission_sets/default_customer_spec.rb b/spree/core/spec/models/spree/permission_sets/default_customer_spec.rb
index f67f404408..2f2cc5619b 100644
--- a/spree/core/spec/models/spree/permission_sets/default_customer_spec.rb
+++ b/spree/core/spec/models/spree/permission_sets/default_customer_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Spree::PermissionSets::DefaultCustomer do
end
context 'with user order' do
- let(:order) { build(:order, user: user) }
+ let(:order) { build(:order, customer: user) }
it 'allows viewing own order' do
expect(ability.can?(:show, order)).to be true
@@ -56,7 +56,7 @@ RSpec.describe Spree::PermissionSets::DefaultCustomer do
end
context 'with token' do
- let(:order) { build(:order, user: nil, token: 'secret') }
+ let(:order) { build(:order, customer: nil, token: 'secret') }
it 'allows viewing order with correct token' do
expect(ability.can?(:show, order, 'secret')).to be true
@@ -92,7 +92,7 @@ RSpec.describe Spree::PermissionSets::DefaultCustomer do
end
it 'allows creating new user' do
- expect(ability.can?(:create, Spree.user_class)).to be true
+ expect(ability.can?(:create, Spree.customer_class)).to be true
end
end
@@ -125,7 +125,7 @@ RSpec.describe Spree::PermissionSets::DefaultCustomer do
end
context 'with guest user (non-persisted)' do
- let(:guest_user) { Spree.user_class.new }
+ let(:guest_user) { Spree.customer_class.new }
let(:guest_ability) { Spree::Ability.new(guest_user) }
let(:guest_permission_set) { described_class.new(guest_ability) }
let(:guest_address) { build(:address, user_id: nil) }
@@ -169,9 +169,9 @@ RSpec.describe Spree::PermissionSets::DefaultCustomer do
end
context 'wishlist permissions' do
- let(:own_wishlist) { build(:wishlist, user: user) }
- let(:public_wishlist) { build(:wishlist, user: create(:user), is_private: false) }
- let(:private_wishlist) { build(:wishlist, user: create(:user), is_private: true) }
+ let(:own_wishlist) { build(:wishlist, customer: user) }
+ let(:public_wishlist) { build(:wishlist, customer: create(:user), is_private: false) }
+ let(:private_wishlist) { build(:wishlist, customer: create(:user), is_private: true) }
it 'allows managing own wishlist' do
expect(ability.can?(:manage, own_wishlist)).to be true
diff --git a/spree/core/spec/models/spree/permission_sets/product_management_spec.rb b/spree/core/spec/models/spree/permission_sets/product_management_spec.rb
index 0f63a38764..6b64724c36 100644
--- a/spree/core/spec/models/spree/permission_sets/product_management_spec.rb
+++ b/spree/core/spec/models/spree/permission_sets/product_management_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Spree::PermissionSets::ProductManagement do
end
it 'does not grant manage access to User' do
- expect(ability.can?(:manage, Spree.user_class)).to be false
+ expect(ability.can?(:manage, Spree.customer_class)).to be false
end
end
end
diff --git a/spree/core/spec/models/spree/promotion/rules/customer_group_spec.rb b/spree/core/spec/models/spree/promotion/rules/customer_group_spec.rb
index d2e1441674..851bf300bb 100644
--- a/spree/core/spec/models/spree/promotion/rules/customer_group_spec.rb
+++ b/spree/core/spec/models/spree/promotion/rules/customer_group_spec.rb
@@ -19,7 +19,7 @@ describe Spree::Promotion::Rules::CustomerGroup, type: :model do
end
describe '#eligible?' do
- let(:order) { build(:order, user: user) }
+ let(:order) { build(:order, customer: user) }
context 'when no customer groups are configured' do
before { rule.preferred_customer_group_ids = [] }
@@ -30,7 +30,7 @@ describe Spree::Promotion::Rules::CustomerGroup, type: :model do
end
context 'when order has no user' do
- let(:order) { build(:order, user: nil) }
+ let(:order) { build(:order, customer: nil) }
before { rule.preferred_customer_group_ids = [customer_group.id] }
diff --git a/spree/core/spec/models/spree/promotion/rules/first_order_spec.rb b/spree/core/spec/models/spree/promotion/rules/first_order_spec.rb
index e1fced8443..2c3f51fe49 100644
--- a/spree/core/spec/models/spree/promotion/rules/first_order_spec.rb
+++ b/spree/core/spec/models/spree/promotion/rules/first_order_spec.rb
@@ -6,7 +6,7 @@ describe Spree::Promotion::Rules::FirstOrder, type: :model do
let(:user) { create(:user) }
context 'without a user or email' do
- let(:order) { create(:order, store: store, email: nil, user: nil) }
+ let(:order) { create(:order, store: store, email: nil, customer: nil) }
it { expect(rule).not_to be_eligible(order) }
@@ -19,7 +19,7 @@ describe Spree::Promotion::Rules::FirstOrder, type: :model do
context 'first order' do
context 'for a signed user' do
- let(:order) { create(:order, store: store, user: user) }
+ let(:order) { create(:order, store: store, customer: user) }
context 'with no completed orders' do
specify do
@@ -33,7 +33,7 @@ describe Spree::Promotion::Rules::FirstOrder, type: :model do
end
context 'with completed orders' do
- let(:order) { create(:completed_order_with_totals, store: store, user: user) }
+ let(:order) { create(:completed_order_with_totals, store: store, customer: user) }
it 'is eligible when checked against first completed order' do
expect(rule).to be_eligible(order)
@@ -41,7 +41,7 @@ describe Spree::Promotion::Rules::FirstOrder, type: :model do
context 'with another order' do
before do
- create(:completed_order_with_totals, user: user, store: store)
+ create(:completed_order_with_totals, customer: user, store: store)
end
it { expect(rule).not_to be_eligible(order) }
@@ -58,14 +58,14 @@ describe Spree::Promotion::Rules::FirstOrder, type: :model do
context 'for a guest user' do
let(:email) { '[email protected]' }
- let(:order) { create(:order, store: store, email: email, user: nil) }
+ let(:order) { create(:order, store: store, email: email, customer: nil) }
context 'with no other orders' do
it { expect(rule).to be_eligible(order) }
end
context 'with another order' do
- before { create(:completed_order_with_totals, email: email, store: store, user: nil) }
+ before { create(:completed_order_with_totals, email: email, store: store, customer: nil) }
it { expect(rule).not_to be_eligible(order) }
diff --git a/spree/core/spec/models/spree/promotion/rules/user_spec.rb b/spree/core/spec/models/spree/promotion/rules/user_spec.rb
index 5a1ac30740..6f6dead992 100644
--- a/spree/core/spec/models/spree/promotion/rules/user_spec.rb
+++ b/spree/core/spec/models/spree/promotion/rules/user_spec.rb
@@ -6,7 +6,7 @@ describe Spree::Promotion::Rules::User, type: :model do
let(:user_placing_order) { create :user }
describe '#eligible?' do
- let(:order) { build(:order, user: user_placing_order) }
+ let(:order) { build(:order, customer: user_placing_order) }
it 'is not eligible if users are not provided' do
expect(rule).not_to be_eligible(order)
diff --git a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
index 62f9372b9f..a8af27c46b 100644
--- a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
@@ -311,7 +311,7 @@ module Spree
let(:calculator) { create(:flat_rate_calculator) }
let(:flat_percent_calculator) { create(:flat_percent_item_total_calculator, preferred_flat_percent: 10) }
let(:order) do
- create(:order_with_line_items, line_items_count: 3, user: user, store: store)
+ create(:order_with_line_items, line_items_count: 3, customer: user, store: store)
end
let!(:promotion) { create(:promotion, name: 'promo', code: nil, multi_codes: true, number_of_codes: 1) }
let!(:coupon_code) { promotion.coupon_codes.first }
@@ -383,7 +383,7 @@ module Spree
context 'number of usages for' do
let!(:user) { create(:user) }
let(:calculator) { create(:flat_rate_calculator) }
- let(:order) { create(:order_with_line_items, line_items_count: 3, user: user, store: store) }
+ let(:order) { create(:order_with_line_items, line_items_count: 3, customer: user, store: store) }
subject { Spree::PromotionHandler::Coupon.new(order) }
context 'one common promotion code' do
@@ -392,7 +392,7 @@ module Spree
Spree::Promotion::Actions::CreateItemAdjustments.create(promotion: promotion,
calculator: calculator)
end
- let!(:order_2) { create(:order_with_line_items, line_items_count: 3, user: user) }
+ let!(:order_2) { create(:order_with_line_items, line_items_count: 3, customer: user) }
let!(:subject_2) { Spree::PromotionHandler::Coupon.new(order_2) }
before do
@@ -410,7 +410,7 @@ module Spree
end
context 'one-time unique promotion codes' do
- let!(:order_2) { create(:order_with_line_items, line_items_count: 3, user: user) }
+ let!(:order_2) { create(:order_with_line_items, line_items_count: 3, customer: user) }
let!(:subject_2) { Spree::PromotionHandler::Coupon.new(order_2) }
let!(:promotion) do
create(
diff --git a/spree/core/spec/models/spree/promotion_spec.rb b/spree/core/spec/models/spree/promotion_spec.rb
index 97b31aeedc..d2d8a802b7 100644
--- a/spree/core/spec/models/spree/promotion_spec.rb
+++ b/spree/core/spec/models/spree/promotion_spec.rb
@@ -259,7 +259,7 @@ describe Spree::Promotion, type: :model do
let(:action1) { Spree::Promotion::Actions::CreateAdjustment.create!(promotion: promotion) }
let(:action2) { Spree::Promotion::Actions::CreateAdjustment.create!(promotion: promotion) }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user) }
+ let(:order) { create(:order, customer: user) }
let(:payload) { { order: order, user: user } }
before do
@@ -799,8 +799,8 @@ describe Spree::Promotion, type: :model do
let(:promotion) { create :promotion, :with_order_adjustment, kind: :automatic }
let(:user) { create :user }
- let(:order) { create :order_with_line_items, user: user }
- let(:excluded_order) { create :order_with_line_items, user: user }
+ let(:order) { create :order_with_line_items, customer: user }
+ let(:excluded_order) { create :order_with_line_items, customer: user }
before do
order.user_id = user.id
@@ -837,7 +837,7 @@ describe Spree::Promotion, type: :model do
end
context 'when the order is not complete' do
- let(:order) { create :order, user: user }
+ let(:order) { create :order, customer: user }
it { is_expected.to be false }
end
diff --git a/spree/core/spec/models/spree/store_credit_spec.rb b/spree/core/spec/models/spree/store_credit_spec.rb
index 7d86ad810a..66617ffac3 100644
--- a/spree/core/spec/models/spree/store_credit_spec.rb
+++ b/spree/core/spec/models/spree/store_credit_spec.rb
@@ -742,13 +742,13 @@ describe Spree::StoreCredit, type: :model do
end
context 'user has multiple store credits' do
- subject { create(:store_credit, user: user, amount: additional_store_credit_amount, store: store) }
+ subject { create(:store_credit, customer: user, amount: additional_store_credit_amount, store: store) }
let(:store_credit_amount) { 100.0 }
let(:additional_store_credit_amount) { 200.0 }
let(:user) { create(:user) }
- let!(:store_credit) { create(:store_credit, user: user, amount: store_credit_amount, store: store) }
+ let!(:store_credit) { create(:store_credit, customer: user, amount: store_credit_amount, store: store) }
it "saves the user's total store credit in the event" do
amount = store_credit_amount + additional_store_credit_amount
diff --git a/spree/core/spec/models/spree/user_identity_spec.rb b/spree/core/spec/models/spree/user_identity_spec.rb
index 598f3a3ef2..c47a9a30b6 100644
--- a/spree/core/spec/models/spree/user_identity_spec.rb
+++ b/spree/core/spec/models/spree/user_identity_spec.rb
@@ -38,7 +38,7 @@ describe Spree::UserIdentity, type: :model do
end
it 'allows same uid for different user types' do
- stub_const('Spree::AdminUser', Class.new(Spree.user_class))
+ stub_const('Spree::AdminUser', Class.new(Spree.customer_class))
different_user_type = build(:user_identity, user_type: 'Spree::AdminUser', user_id: user.id, provider: 'email', uid: '12345')
expect(different_user_type).to be_valid
@@ -73,7 +73,7 @@ describe Spree::UserIdentity, type: :model do
info: info,
tokens: tokens
)
- end.to change(Spree.user_class, :count).by(1)
+ end.to change(Spree.customer_class, :count).by(1)
.and change(described_class, :count).by(1)
end
@@ -151,7 +151,7 @@ describe Spree::UserIdentity, type: :model do
info: info,
tokens: tokens
)
- end.not_to change(Spree.user_class, :count)
+ end.not_to change(Spree.customer_class, :count)
end
it 'returns the existing user' do
@@ -201,7 +201,7 @@ describe Spree::UserIdentity, type: :model do
before do
allow(described_class).to receive(:find_by).and_call_original
allow(described_class).to receive(:find_by)
- .with(provider: provider, uid: uid, user_type: Spree.user_class.name)
+ .with(provider: provider, uid: uid, user_type: Spree.customer_class.name)
.and_return(nil)
allow(described_class).to receive(:create_user_from_oauth)
.and_raise(ActiveRecord::RecordNotUnique)
@@ -248,14 +248,14 @@ describe Spree::UserIdentity, type: :model do
end
before do
- allow_any_instance_of(Spree.user_class).to receive(:identities)
+ allow_any_instance_of(Spree.customer_class).to receive(:identities)
.and_raise(ActiveRecord::RecordNotUnique)
end
it 'rolls back the user' do
expect do
expect { subject }.to raise_error(ActiveRecord::RecordNotUnique)
- end.not_to change(Spree.user_class, :count)
+ end.not_to change(Spree.customer_class, :count)
end
end
end
diff --git a/spree/core/spec/models/spree/user_spec.rb b/spree/core/spec/models/spree/user_spec.rb
index 3faa1dd989..81bbaa0c82 100644
--- a/spree/core/spec/models/spree/user_spec.rb
+++ b/spree/core/spec/models/spree/user_spec.rb
@@ -45,9 +45,9 @@ describe Spree::LegacyUser, type: :model do # rubocop:disable RSpec/MultipleDesc
let(:store) { @default_store }
let(:admin_user) { create(:admin_user) }
- let(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: admin_user, store: store) }
- let(:order_2) { create(:order, user: user, created_by: admin_user, store: store) }
- let(:order_3) { create(:order, user: user, created_by: create(:admin_user), store: store) }
+ let(:order_1) { create(:order, created_at: 1.day.ago, customer: user, created_by: admin_user, store: store) }
+ let(:order_2) { create(:order, customer: user, created_by: admin_user, store: store) }
+ let(:order_3) { create(:order, customer: user, created_by: create(:admin_user), store: store) }
it 'returns correct order' do
Timecop.scale(3600) do
@@ -105,11 +105,11 @@ describe Spree::LegacyUser, type: :model do # rubocop:disable RSpec/MultipleDesc
end
end
-describe Spree.user_class, type: :model do
+describe Spree.customer_class, type: :model do
subject { create(:user) }
context 'reporting' do
- let!(:orders) { create_list(:order, order_count, user: subject, store: store, total: order_value, completed_at: Date.today, currency: currency) }
+ let!(:orders) { create_list(:order, order_count, customer: subject, store: store, total: order_value, completed_at: Date.today, currency: currency) }
let(:currency) { 'USD' }
let(:store) { @default_store }
let(:order_value) { BigDecimal('80.94') }
@@ -174,7 +174,7 @@ describe Spree.user_class, type: :model do
let(:eur_order_count) { 2 }
before do
- create_list(:order, eur_order_count, user: subject, store: store, total: eur_order_value, completed_at: Date.today, currency: eur_currency)
+ create_list(:order, eur_order_count, customer: subject, store: store, total: eur_order_value, completed_at: Date.today, currency: eur_currency)
end
context 'lifetime_value' do
@@ -212,8 +212,8 @@ describe Spree.user_class, type: :model do
let!(:user) { create(:user) }
let(:amount) { 120.25 }
let(:additional_amount) { 55.75 }
- let!(:store_credit) { create(:store_credit, user: user, amount: amount, amount_used: 0.0, store: store) }
- let!(:additional_store_credit) { create(:store_credit, user: user, amount: additional_amount, amount_used: 0.0, store: store) }
+ let!(:store_credit) { create(:store_credit, customer: user, amount: amount, amount_used: 0.0, store: store) }
+ let!(:additional_store_credit) { create(:store_credit, customer: user, amount: additional_amount, amount_used: 0.0, store: store) }
context 'part of the store credit has been used' do
let(:amount_used) { 35.00 }
@@ -266,9 +266,9 @@ describe Spree.user_class, type: :model do
# the in-memory branch must match the query branch — filtered by store
# and currency, gift cards excluded.
context 'when the store_credits association is preloaded' do
- let!(:eur_credit) { create(:store_credit, user: user, amount: 40, amount_used: 0.0, currency: 'EUR', store: store) }
+ let!(:eur_credit) { create(:store_credit, customer: user, amount: 40, amount_used: 0.0, currency: 'EUR', store: store) }
let(:other_store) { create(:store) }
- let!(:other_store_credit) { create(:store_credit, user: user, amount: 99, amount_used: 0.0, store: other_store) }
+ let!(:other_store_credit) { create(:store_credit, customer: user, amount: 99, amount_used: 0.0, store: other_store) }
before { user.store_credits.load }
@@ -298,7 +298,7 @@ describe Spree.user_class, type: :model do
let(:user) { create(:user) }
let(:usd_amount) { 120.25 }
let(:additional_amount) { 55.75 }
- let(:store_credit) { create(:store_credit, user: user, amount: usd_amount, amount_used: 0.0, store: store) }
+ let(:store_credit) { create(:store_credit, customer: user, amount: usd_amount, amount_used: 0.0, store: store) }
context 'store credits have never been used' do
it 'returns store credit amount' do
@@ -311,8 +311,8 @@ describe Spree.user_class, type: :model do
let(:eur_amount) { '321.31' }
before do
- create(:store_credit, user: user, amount: gbp_amount, amount_used: 0.0, store: store, currency: 'GBP')
- create(:store_credit, user: user, amount: eur_amount, amount_used: 0.0, store: store, currency: 'EUR')
+ create(:store_credit, customer: user, amount: gbp_amount, amount_used: 0.0, store: store, currency: 'GBP')
+ create(:store_credit, customer: user, amount: eur_amount, amount_used: 0.0, store: store, currency: 'EUR')
end
it 'returns sum of amounts' do
@@ -351,8 +351,8 @@ describe Spree.user_class, type: :model do
let!(:user) { create(:user_with_addresses) }
let!(:other_user) { create(:user_with_addresses) }
- let(:bill_address) { create(:address, user: assigned_user) }
- let(:ship_address) { create(:address, user: assigned_user) }
+ let(:bill_address) { create(:address, customer: assigned_user) }
+ let(:ship_address) { create(:address, customer: assigned_user) }
shared_examples 'invalid' do
it 'is invalid' do
@@ -418,7 +418,7 @@ describe Spree.user_class, type: :model do
subject { user }
let!(:user) { create(:user_with_addresses) }
- let(:address) { create(:address, user: user) }
+ let(:address) { create(:address, customer: user) }
shared_examples 'invalid' do
it 'is invalid' do
@@ -431,19 +431,19 @@ describe Spree.user_class, type: :model do
before { subject.update(bill_address: address) }
context 'when default bill address is not associated to completed order' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user) }
it_behaves_like 'valid'
end
context 'when default bill address is associated to uncompleted order' do
- let!(:uncompleted_order) { create(:order, user: user, bill_address: address, ship_address: address) }
+ let!(:uncompleted_order) { create(:order, customer: user, bill_address: address, ship_address: address) }
it_behaves_like 'valid'
end
context 'when default bill address is associated to completed order' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user, bill_address: address, ship_address: address) }
context 'when default bill address is the same as associated to order' do
it { expect(user.addresses).to include(address) }
@@ -470,19 +470,19 @@ describe Spree.user_class, type: :model do
before { subject.update(ship_address: address) }
context 'when default ship address is not associated to completed order' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user) }
it_behaves_like 'valid'
end
context 'when default ship address is associated to uncompleted order' do
- let!(:uncompleted_order) { create(:order, user: user, ship_address: address) }
+ let!(:uncompleted_order) { create(:order, customer: user, ship_address: address) }
it_behaves_like 'valid'
end
context 'when default ship address is associated to completed order' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user, bill_address: address, ship_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user, bill_address: address, ship_address: address) }
context 'when default ship address is the same as associated to order' do
it { expect(user.addresses).to include(address) }
diff --git a/spree/core/spec/models/spree/wishlist_spec.rb b/spree/core/spec/models/spree/wishlist_spec.rb
index 4e2a01088c..d0c48fd156 100644
--- a/spree/core/spec/models/spree/wishlist_spec.rb
+++ b/spree/core/spec/models/spree/wishlist_spec.rb
@@ -6,14 +6,14 @@ describe Spree::Wishlist, type: :model do
let(:user) { create(:user) }
let(:other_user) { create(:user) }
- let(:wishlist) { create(:wishlist, user: user, name: 'My Wishlist', store: store, is_default: true) }
- let(:wishlist_belonging_to_other_store) { create(:wishlist, user: user, name: 'My Wishlist', store: other_store, is_default: true) }
- let(:wishlist_belonging_to_other_user) { create(:wishlist, user: other_user, name: 'My Wishlist', store: store, is_default: true) }
+ let(:wishlist) { create(:wishlist, customer: user, name: 'My Wishlist', store: store, is_default: true) }
+ let(:wishlist_belonging_to_other_store) { create(:wishlist, customer: user, name: 'My Wishlist', store: other_store, is_default: true) }
+ let(:wishlist_belonging_to_other_user) { create(:wishlist, customer: other_user, name: 'My Wishlist', store: store, is_default: true) }
describe 'lifecycle events', events: true do
describe 'wishlist.created' do
it 'publishes created event when record is created' do
- record = build(:wishlist, user: user, store: store)
+ record = build(:wishlist, customer: user, store: store)
expect(record).to receive(:publish_event).with('wishlist.created')
allow(record).to receive(:publish_event).with(anything)
@@ -34,7 +34,7 @@ describe Spree::Wishlist, type: :model do
describe 'wishlist.deleted' do
it 'publishes deleted event when record is destroyed' do
- record = create(:wishlist, user: user, store: store)
+ record = create(:wishlist, customer: user, store: store)
expect(record).to receive(:publish_event).with('wishlist.deleted', kind_of(Hash))
allow(record).to receive(:publish_event).with(anything)
@@ -45,7 +45,7 @@ describe Spree::Wishlist, type: :model do
describe '.ensure_default_exists_and_is_unique' do
context 'when user creates a new default store' do
- let(:new_wl) { create(:wishlist, name: 'My New WishList', user: user, store: store, is_default: true) }
+ let(:new_wl) { create(:wishlist, name: 'My New WishList', customer: user, store: store, is_default: true) }
before do
wishlist
diff --git a/spree/core/spec/presenters/spree/csv/customer_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/customer_presenter_spec.rb
index 442cbd6761..8eb27b66b6 100644
--- a/spree/core/spec/presenters/spree/csv/customer_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/customer_presenter_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Spree::CSV::CustomerPresenter do
ship_address: address,
tag_list: ['premium', 'vip'])
end
- let!(:orders) { create_list(:completed_order_with_totals, 3, user: customer, store: store) }
+ let!(:orders) { create_list(:completed_order_with_totals, 3, customer: customer, store: store) }
let(:presenter) { described_class.new(customer) }
before do
diff --git a/spree/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb
index 94db222b3f..46434800f5 100644
--- a/spree/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Spree::CSV::GiftCardPresenter, type: :model do
end
context 'when gift card has no user' do
- let(:gift_card) { create(:gift_card, user: nil, store: store) }
+ let(:gift_card) { create(:gift_card, customer: nil, store: store) }
it 'returns nil for customer fields' do
expect(subject[7]).to be_nil # Customer Email
diff --git a/spree/core/spec/presenters/spree/csv/newsletter_subscriber_presenter_spec.rb b/spree/core/spec/presenters/spree/csv/newsletter_subscriber_presenter_spec.rb
index ad38607ef2..b089311ae5 100644
--- a/spree/core/spec/presenters/spree/csv/newsletter_subscriber_presenter_spec.rb
+++ b/spree/core/spec/presenters/spree/csv/newsletter_subscriber_presenter_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Spree::CSV::NewsletterSubscriberPresenter do
create(
:newsletter_subscriber,
- user: user,
+ customer: user,
user_id: user.id,
verified_at: Time.current.change(usec: 0),
created_at: 2.days.ago.change(usec: 0),
@@ -51,7 +51,7 @@ RSpec.describe Spree::CSV::NewsletterSubscriberPresenter do
create(
:newsletter_subscriber,
- user: nil,
+ customer: nil,
user_id: nil,
verified_at: nil,
created_at: 3.days.ago.change(usec: 0),
diff --git a/spree/core/spec/services/spree/account/addresses/create_spec.rb b/spree/core/spec/services/spree/account/addresses/create_spec.rb
index 0034555f39..b8013ec9c6 100644
--- a/spree/core/spec/services/spree/account/addresses/create_spec.rb
+++ b/spree/core/spec/services/spree/account/addresses/create_spec.rb
@@ -52,7 +52,7 @@ module Spree
end
context 'when user has some address already' do
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
context 'with default bill and ship address' do
before do
@@ -87,8 +87,8 @@ module Spree
context 'when order is passed' do
let(:result) { subject.call(user: user, address_params: address_params, order: order) }
- let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
- let(:address) { create(:address, user: user) }
+ let(:order) { create(:order, customer: user, state: 'delivery', ship_address: address, bill_address: address) }
+ let(:address) { create(:address, customer: user) }
it 'assigns a new ship address to the order' do
result
@@ -106,7 +106,7 @@ module Spree
let(:result) { subject.call(user: user, address_params: address_params, default_billing: true) }
let!(:user) { create(:user) }
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
before { user.update!(bill_address: address) }
@@ -120,7 +120,7 @@ module Spree
let(:result) { subject.call(user: user, address_params: address_params, default_shipping: true) }
let!(:user) { create(:user) }
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
before { user.update!(ship_address: address) }
diff --git a/spree/core/spec/services/spree/account/addresses/update_spec.rb b/spree/core/spec/services/spree/account/addresses/update_spec.rb
index 97d1f69fad..8ecfb25478 100644
--- a/spree/core/spec/services/spree/account/addresses/update_spec.rb
+++ b/spree/core/spec/services/spree/account/addresses/update_spec.rb
@@ -7,7 +7,7 @@ module Spree
let(:user) { create(:user) }
let(:country) { create(:country) }
let(:state) { create(:state, country: country) }
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
let(:result) { subject.call(address: address, address_params: new_address_params) }
let(:value) { result.value }
diff --git a/spree/core/spec/services/spree/account/create_spec.rb b/spree/core/spec/services/spree/account/create_spec.rb
index fb2d8a01c3..61aaa80ee1 100644
--- a/spree/core/spec/services/spree/account/create_spec.rb
+++ b/spree/core/spec/services/spree/account/create_spec.rb
@@ -18,7 +18,7 @@ module Spree
end
it 'creates new user' do
- expect { result }.to change(Spree.user_class, :count)
+ expect { result }.to change(Spree.customer_class, :count)
end
it 'creates user with given params' do
diff --git a/spree/core/spec/services/spree/account/update_spec.rb b/spree/core/spec/services/spree/account/update_spec.rb
index b4f102a75d..f3a5e5ba8d 100644
--- a/spree/core/spec/services/spree/account/update_spec.rb
+++ b/spree/core/spec/services/spree/account/update_spec.rb
@@ -6,13 +6,13 @@ module Spree
let!(:user) { create(:user_with_addresses) }
let(:result) { subject.call(user: user, user_params: user_params) }
- let!(:new_default_ship_address) { create(:address, user: user) }
- let!(:new_default_bill_address) { create(:address, user: user) }
+ let!(:new_default_ship_address) { create(:address, customer: user) }
+ let!(:new_default_bill_address) { create(:address, customer: user) }
let(:value) { result.value }
shared_examples 'user not created' do
it 'does not create new user' do
- expect { result }.not_to change(Spree.user_class, :count)
+ expect { result }.not_to change(Spree.customer_class, :count)
end
end
diff --git a/spree/core/spec/services/spree/addresses/update_spec.rb b/spree/core/spec/services/spree/addresses/update_spec.rb
index 5d2804fd40..ccf3a7445b 100644
--- a/spree/core/spec/services/spree/addresses/update_spec.rb
+++ b/spree/core/spec/services/spree/addresses/update_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Spree::Addresses::Update do
let(:user) { create(:user) }
let(:country) { create(:country) }
let(:state) { create(:state, country: country) }
- let!(:address) { create(:address, user: user) }
+ let!(:address) { create(:address, customer: user) }
let(:result) { subject.call(address: address, address_params: new_address_params, order: order) }
let(:value) { result.value }
let(:order) { nil }
@@ -61,7 +61,7 @@ RSpec.describe Spree::Addresses::Update do
context 'when user only sets the address as default shipping' do
let(:result) { subject.call(address: address, address_params: {}, order: order, default_shipping: true) }
- let!(:previous_address) { create(:address, user: user) }
+ let!(:previous_address) { create(:address, customer: user) }
before { user.reload.update(ship_address: previous_address) }
@@ -74,7 +74,7 @@ RSpec.describe Spree::Addresses::Update do
context 'when user only sets the address as default billing' do
let(:result) { subject.call(address: address, address_params: {}, order: order, default_billing: true) }
- let!(:previous_address) { create(:address, user: user) }
+ let!(:previous_address) { create(:address, customer: user) }
before { user.reload.update(bill_address: previous_address) }
@@ -97,7 +97,7 @@ RSpec.describe Spree::Addresses::Update do
context 'when user sets address as default shipping' do
let(:result) { subject.call(address: address, address_params: new_address_params, order: order, default_shipping: true) }
- let!(:previous_address) { create(:address, user: user) }
+ let!(:previous_address) { create(:address, customer: user) }
before { user.reload.update(ship_address: previous_address) }
@@ -110,7 +110,7 @@ RSpec.describe Spree::Addresses::Update do
context 'when user sets address as default billing' do
let(:result) { subject.call(address: address, address_params: new_address_params, order: order, default_billing: true) }
- let!(:previous_address) { create(:address, user: user) }
+ let!(:previous_address) { create(:address, customer: user) }
before { user.reload.update(bill_address: previous_address) }
@@ -122,7 +122,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when order is passed' do
- let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
+ let(:order) { create(:order, customer: user, state: 'delivery', ship_address: address, bill_address: address) }
it 'updates order to address state' do
expect { result }.to change { order.reload.state }.from('delivery').to('address')
@@ -133,7 +133,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when address is uneditable' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user, ship_address: address, bill_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user, ship_address: address, bill_address: address) }
context 'when there have been created same address with new params' do
let!(:same_address) { user.addresses.create(new_address_params.except(:country_iso).merge(country: country, state: state)) }
@@ -167,7 +167,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when the old address was set as default billing' do
- let(:other_address) { create(:address, user: user) }
+ let(:other_address) { create(:address, customer: user) }
before { user.update!(bill_address: address, ship_address: other_address) }
@@ -182,7 +182,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when the old address was set as default shipping' do
- let(:other_address) { create(:address, user: user) }
+ let(:other_address) { create(:address, customer: user) }
before { user.update!(bill_address: other_address, ship_address: address) }
@@ -224,7 +224,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when order with deleted address is passed' do
- let(:order) { create(:order, user: user, state: 'delivery', ship_address: address, bill_address: address) }
+ let(:order) { create(:order, customer: user, state: 'delivery', ship_address: address, bill_address: address) }
it 'updates order to address state' do
expect { result }.to change { order.reload.state }.from('delivery').to('address')
@@ -242,7 +242,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when a separate incomplete order shares the address' do
- let!(:incomplete_order) { create(:order, user: user, ship_address: address, bill_address: address) }
+ let!(:incomplete_order) { create(:order, customer: user, ship_address: address, bill_address: address) }
it 'repoints the incomplete order to the new address and moves it to the address step' do
result
@@ -261,7 +261,7 @@ RSpec.describe Spree::Addresses::Update do
end
it "does not repoint another user's order sharing the address" do
- other_order = create(:order, user: create(:user), ship_address: address, bill_address: address, state: 'delivery')
+ other_order = create(:order, customer: create(:user), ship_address: address, bill_address: address, state: 'delivery')
result
@@ -289,11 +289,11 @@ RSpec.describe Spree::Addresses::Update do
context 'when a guest cart shares an immutable address' do
let(:address) { create(:address) }
let!(:completed_guest_order) do
- create(:order, user: nil, email: '[email protected]', completed_at: Time.current,
+ create(:order, customer: nil, email: '[email protected]', completed_at: Time.current,
ship_address: address, bill_address: address)
end
let!(:guest_cart) do
- create(:order, user: nil, email: '[email protected]', ship_address: address, bill_address: address)
+ create(:order, customer: nil, email: '[email protected]', ship_address: address, bill_address: address)
end
it 'repoints the guest cart to the copy and keeps the completed order on the original' do
@@ -327,7 +327,7 @@ RSpec.describe Spree::Addresses::Update do
end
context 'when the address is uneditable' do
- let!(:completed_order) { create(:completed_order_with_totals, user: user, ship_address: address, bill_address: address) }
+ let!(:completed_order) { create(:completed_order_with_totals, customer: user, ship_address: address, bill_address: address) }
it 'returns a failure and leaves the original address intact' do
expect { result }.not_to change(Spree::Address, :count)
diff --git a/spree/core/spec/services/spree/cart/associate_spec.rb b/spree/core/spec/services/spree/cart/associate_spec.rb
index 56e256efa8..e25bf22e6d 100644
--- a/spree/core/spec/services/spree/cart/associate_spec.rb
+++ b/spree/core/spec/services/spree/cart/associate_spec.rb
@@ -6,7 +6,7 @@ module Spree
let(:user) { create(:user) }
context 'when guest order is given' do
- let(:order) { create(:order, user: nil) }
+ let(:order) { create(:order, customer: nil) }
it 'assigns order to user' do
expect(subject).to be_success
@@ -16,7 +16,7 @@ module Spree
context 'when already assigned order is given' do
let(:assigned_user) { create(:user) }
- let(:order) { create(:order, user: assigned_user) }
+ let(:order) { create(:order, customer: assigned_user) }
it 'reassigns order to new user' do
expect(subject).to be_success
diff --git a/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb b/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb
index c76395677f..fd360702f8 100644
--- a/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb
+++ b/spree/core/spec/services/spree/cart/remove_out_of_stock_items_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Cart::RemoveOutOfStockItems do
let(:store) { @default_store }
let(:user) { create(:user) }
- let(:order) { create(:order_with_totals, store: store, user: user) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
let(:product) { order.products.first }
let(:variant) { order.variants.first }
let(:execute) { subject.call(order: order) }
diff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rb
index cca4da892e..3ec108cd84 100644
--- a/spree/core/spec/services/spree/carts/update_spec.rb
+++ b/spree/core/spec/services/spree/carts/update_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe Carts::Update do
let(:store) { create(:store, supported_currencies: 'USD,EUR,GBP') }
let(:user) { create(:user) }
- let(:order) { create(:order_with_line_items, user: user, store: store, currency: 'USD') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, currency: 'USD') }
describe '#call' do
subject { described_class.call(cart: order, params: params) }
@@ -27,7 +27,7 @@ module Spree
end
context 'when clearing customer_note' do
- let(:order) { create(:order_with_line_items, user: user, store: store, special_instructions: 'Existing instructions') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, special_instructions: 'Existing instructions') }
it 'clears with empty string' do
result = described_class.call(cart: order, params: { customer_note: '' })
@@ -77,7 +77,7 @@ module Spree
let(:de_country) { create(:country, iso: 'DE', name: 'Germany') }
let!(:us_market) { create(:market, store: store, countries: [us_country]) }
let!(:eu_market) { create(:market, :eu, store: store, countries: [de_country]) }
- let(:order) { create(:order_with_line_items, user: user, store: store, market: us_market, currency: 'USD') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, market: us_market, currency: 'USD') }
it 'switches market when currency changes' do
result = described_class.call(cart: order, params: { currency: 'EUR' })
@@ -137,7 +137,7 @@ module Spree
context 'when shipping address country is not in the new market' do
let!(:us_state) { us_country.states.find_by(abbr: 'NY') || create(:state, country: us_country, abbr: 'NY', name: 'New York') }
let(:us_address) { create(:address, country: us_country, state: us_state) }
- let(:order) { create(:order_with_line_items, user: user, store: store, market: us_market, ship_address: us_address, state: 'delivery') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, market: us_market, ship_address: us_address, state: 'delivery') }
let(:params) { { market_id: eu_market.prefixed_id } }
it 'clears the shipping address' do
@@ -156,7 +156,7 @@ module Spree
context 'when shipping address country is in the new market' do
let(:de_address) { create(:address, country: de_country) }
- let(:order) { create(:order_with_line_items, user: user, store: store, market: us_market, ship_address: de_address) }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, market: us_market, ship_address: de_address) }
let(:params) { { market_id: eu_market.prefixed_id } }
it 'keeps the shipping address' do
@@ -203,7 +203,7 @@ module Spree
end
context 'when order has address checkout step and is past address state' do
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'delivery') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'delivery') }
it 'reverts to address then auto-advances to payment' do
expect(subject).to be_success
@@ -212,7 +212,7 @@ module Spree
end
context 'when order is in cart state' do
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'cart') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'cart') }
it 'auto-advances to payment' do
expect(subject).to be_success
@@ -221,7 +221,7 @@ module Spree
end
context 'when order is fully covered by store credit payment' do
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'cart') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'cart') }
before do
create(:store_credit_payment, order: order, amount: order.total)
@@ -242,7 +242,7 @@ module Spree
end
context 'with existing address by nested id' do
- let(:existing_address) { create(:address, user: user) }
+ let(:existing_address) { create(:address, customer: user) }
let(:params) { { address_key => { id: existing_address.prefixed_id } } }
it 'uses the existing address' do
@@ -252,7 +252,7 @@ module Spree
end
context 'with top-level address_id parameter' do
- let(:existing_address) { create(:address, user: user) }
+ let(:existing_address) { create(:address, customer: user) }
let(:params) { { address_id_key => existing_address.prefixed_id } }
it 'uses the existing address' do
@@ -274,7 +274,7 @@ module Spree
describe 'billing address does not reset checkout state' do
let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
let!(:state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
- let(:order) { create(:order_with_line_items, user: user, store: store, state: 'delivery') }
+ let(:order) { create(:order_with_line_items, customer: user, store: store, state: 'delivery') }
let(:params) do
{
@@ -362,7 +362,7 @@ module Spree
describe 'address ownership' do
let(:other_user) { create(:user) }
- let(:other_users_address) { create(:address, user: other_user) }
+ let(:other_users_address) { create(:address, customer: other_user) }
shared_examples 'ignores other users address' do |address_type|
context "when using another user's address for #{address_type}" do
@@ -392,7 +392,7 @@ module Spree
include_examples 'ignores other users address', :billing_address
context 'when order has no user (guest order)' do
- let(:order) { create(:order_with_line_items, user: nil, store: store) }
+ let(:order) { create(:order_with_line_items, customer: nil, store: store) }
let(:params) { { shipping_address_id: other_users_address.prefixed_id } }
it 'ignores address_id params and keeps existing address' do
@@ -628,7 +628,7 @@ module Spree
end
describe 'when the cart cannot be delivered' do
- let!(:order) { create(:order_with_line_items, user: user, store: store, state: 'address') }
+ let!(:order) { create(:order_with_line_items, customer: user, store: store, state: 'address') }
let(:params) { { email: '[email protected]' } }
let(:unserved_category) { create(:shipping_category, name: 'Unserved') }
diff --git a/spree/core/spec/services/spree/carts/upsert_items_spec.rb b/spree/core/spec/services/spree/carts/upsert_items_spec.rb
index 9004925379..5fb5bd4a05 100644
--- a/spree/core/spec/services/spree/carts/upsert_items_spec.rb
+++ b/spree/core/spec/services/spree/carts/upsert_items_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe Carts::UpsertItems do
let(:store) { create(:store) }
let(:user) { create(:user) }
- let(:cart) { create(:cart, user: user, store: store) }
+ let(:cart) { create(:cart, customer: user, store: store) }
let(:variant) { create(:variant) }
let(:variant2) { create(:variant) }
@@ -146,7 +146,7 @@ module Spree
end
context 'with variant not available in cart currency' do
- let(:cart) { create(:cart, user: user, store: store, currency: 'GBP') }
+ let(:cart) { create(:cart, customer: user, store: store, currency: 'GBP') }
let(:items) { [{ variant_id: variant.prefixed_id, quantity: 1 }] }
it 'returns failure with message' do
diff --git a/spree/core/spec/services/spree/checkout/add_store_credit_spec.rb b/spree/core/spec/services/spree/checkout/add_store_credit_spec.rb
index 214ff1a5e3..f9f4ab3ef3 100644
--- a/spree/core/spec/services/spree/checkout/add_store_credit_spec.rb
+++ b/spree/core/spec/services/spree/checkout/add_store_credit_spec.rb
@@ -39,7 +39,7 @@ describe Spree::Checkout::AddStoreCredit, type: :service do
subject { described_class.call(order: order, amount: requested_amount) }
let(:store_credit) { create(:store_credit, amount: order_total, store: store) }
- let(:order) { create(:order, user: store_credit.user, total: order_total, store: store) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total, store: store) }
context 'with no amount specified' do
let(:requested_amount) { nil }
@@ -74,7 +74,7 @@ describe Spree::Checkout::AddStoreCredit, type: :service do
let(:expected_cc_total) { 100.0 }
let(:store_credit_total) { order_total - expected_cc_total }
let(:store_credit) { create(:store_credit, amount: store_credit_total, store: store) }
- let(:order) { create(:order, user: store_credit.user, total: order_total, store: store) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total, store: store) }
let!(:store_credit_2) { create(:store_credit, amount: 10) }
before do
@@ -96,7 +96,7 @@ describe Spree::Checkout::AddStoreCredit, type: :service do
context 'when called again with an existing checkout store credit payment' do
let(:store_credit) { create(:store_credit, amount: 500, store: store) }
- let(:order) { create(:order, user: store_credit.user, total: order_total, store: store) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total, store: store) }
before do
order.update_column(:total, order_total)
@@ -139,10 +139,10 @@ describe Spree::Checkout::AddStoreCredit, type: :service do
let(:amount_difference) { 100 }
let!(:primary_store_credit) { create(:store_credit, amount: (order_total - amount_difference), store: store) }
let!(:secondary_store_credit) do
- create(:store_credit, amount: order_total, user: primary_store_credit.user,
+ create(:store_credit, amount: order_total, customer: primary_store_credit.user,
credit_type: create(:secondary_credit_type), store: store)
end
- let(:order) { create(:order, user: primary_store_credit.user, total: order_total, store: store) }
+ let(:order) { create(:order, customer: primary_store_credit.user, total: order_total, store: store) }
before do
Timecop.scale(3600)
diff --git a/spree/core/spec/services/spree/checkout/remove_store_credit_spec.rb b/spree/core/spec/services/spree/checkout/remove_store_credit_spec.rb
index 26a337231e..81bb0ba625 100644
--- a/spree/core/spec/services/spree/checkout/remove_store_credit_spec.rb
+++ b/spree/core/spec/services/spree/checkout/remove_store_credit_spec.rb
@@ -6,7 +6,7 @@ describe Spree::Checkout::RemoveStoreCredit, type: :service do
let(:store) { @default_store }
let(:order_total) { 500.00 }
- let(:order) { create(:order, user: store_credit.user, total: order_total, store: store) }
+ let(:order) { create(:order, customer: store_credit.user, total: order_total, store: store) }
context 'when order is not complete' do
let(:store_credit) { create(:store_credit, amount: order_total - 1, store: store) }
diff --git a/spree/core/spec/services/spree/checkout/update_spec.rb b/spree/core/spec/services/spree/checkout/update_spec.rb
index 52be391475..9866ed670c 100644
--- a/spree/core/spec/services/spree/checkout/update_spec.rb
+++ b/spree/core/spec/services/spree/checkout/update_spec.rb
@@ -63,7 +63,7 @@ describe Spree::Checkout::Update, type: :service do
describe 'update address' do
let(:user) { create(:user_with_addresses) }
- let(:order) { create(:order_with_line_items, user: user, bill_address: user.bill_address, ship_address: user.ship_address, state: order_state) }
+ let(:order) { create(:order_with_line_items, customer: user, bill_address: user.bill_address, ship_address: user.ship_address, state: order_state) }
let(:state) { create(:state) }
let(:country) { state.country }
let(:update_service) { described_class.call(order: order, params: order_params, permitted_attributes: permitted_attributes, request_env: nil) }
@@ -128,7 +128,7 @@ describe Spree::Checkout::Update, type: :service do
let(:ship_address_id) { order.ship_address_id }
let(:bill_address_id) { order.bill_address_id }
let(:address_attributes) { nil }
- let(:address) { create(:address, user: user) }
+ let(:address) { create(:address, customer: user) }
shared_examples 'user default addresses did not change' do
it 'does not change user default addresses' do
@@ -206,7 +206,7 @@ describe Spree::Checkout::Update, type: :service do
describe 'address ownership validation' do
let(:user) { create(:user_with_addresses) }
let(:other_user) { create(:user_with_addresses) }
- let(:order) { create(:order_with_line_items, user: user, state: 'address') }
+ let(:order) { create(:order_with_line_items, customer: user, state: 'address') }
let(:permitted_attributes) do
Spree::PermittedAttributes.checkout_attributes + [
bill_address_attributes: Spree::PermittedAttributes.address_attributes,
@@ -257,7 +257,7 @@ describe Spree::Checkout::Update, type: :service do
end
context 'when address_attributes contains id of the same user address' do
- let(:user_address) { create(:address, user: user) }
+ let(:user_address) { create(:address, customer: user) }
let(:order_params) do
ActionController::Parameters.new(
order: {
@@ -273,7 +273,7 @@ describe Spree::Checkout::Update, type: :service do
end
context 'when address_attributes contains id of address with no user' do
- let(:guest_address) { create(:address, user: nil) }
+ let(:guest_address) { create(:address, customer: nil) }
let(:order_params) do
ActionController::Parameters.new(
order: {
diff --git a/spree/core/spec/services/spree/gift_cards/apply_spec.rb b/spree/core/spec/services/spree/gift_cards/apply_spec.rb
index 50bb8e183d..59e49c4bea 100644
--- a/spree/core/spec/services/spree/gift_cards/apply_spec.rb
+++ b/spree/core/spec/services/spree/gift_cards/apply_spec.rb
@@ -4,10 +4,10 @@ RSpec.describe Spree::GiftCards::Apply do
subject { described_class.call(gift_card: gift_card, order: order) }
let(:store) { Spree::Store.default }
- let(:order) { create(:order, store: store, user: order_user) }
+ let(:order) { create(:order, store: store, customer: order_user) }
let(:order_user) { create(:user) }
- let(:gift_card) { create(:gift_card, amount: 50, store: store, user: gift_card_user) }
+ let(:gift_card) { create(:gift_card, amount: 50, store: store, customer: gift_card_user) }
let(:gift_card_user) { nil }
let(:store_credit_payment) { order.payments.store_credits.last }
let(:store_credit) { store_credit_payment.source }
@@ -43,7 +43,7 @@ RSpec.describe Spree::GiftCards::Apply do
context 'when the order has applied store credit' do
let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
- let!(:store_credit) { create(:store_credit, user: order.user, amount: 10, store: store) }
+ let!(:store_credit) { create(:store_credit, customer: order.user, amount: 10, store: store) }
before do
order.add_store_credit_payments
@@ -62,8 +62,8 @@ RSpec.describe Spree::GiftCards::Apply do
end
context 'when the gift card has a different currency' do
- let(:gift_card) { create(:gift_card, amount: 50, store: store, user: gift_card_user, currency: 'USD') }
- let(:order) { create(:order, store: store, user: order_user, currency: 'EUR') }
+ let(:gift_card) { create(:gift_card, amount: 50, store: store, customer: gift_card_user, currency: 'USD') }
+ let(:order) { create(:order, store: store, customer: order_user, currency: 'EUR') }
it 'responds with an error' do
expect(subject).to be_failure
@@ -110,7 +110,7 @@ RSpec.describe Spree::GiftCards::Apply do
let(:users) { Array.new(5) { create(:user) } }
let(:orders) do
users.map do |user|
- order = create(:order, store: store, user: user)
+ order = create(:order, store: store, customer: user)
order.update_columns(total: 80, item_total: 80)
order
end
@@ -149,8 +149,8 @@ RSpec.describe Spree::GiftCards::Apply do
context 'when the order belongs to a non-default store' do
let(:other_store) { create(:store, default: false) }
- let(:order) { create(:order, store: other_store, user: order_user) }
- let(:gift_card) { create(:gift_card, amount: 50, store: other_store, user: gift_card_user) }
+ let(:order) { create(:order, store: other_store, customer: order_user) }
+ let(:gift_card) { create(:gift_card, amount: 50, store: other_store, customer: gift_card_user) }
it 'applies the gift card to the order' do
expect { subject }.to change(Spree::StoreCredit, :count).by(1)
diff --git a/spree/core/spec/services/spree/imports/row_processors/customer_spec.rb b/spree/core/spec/services/spree/imports/row_processors/customer_spec.rb
index 07be00521b..5c2e39d785 100644
--- a/spree/core/spec/services/spree/imports/row_processors/customer_spec.rb
+++ b/spree/core/spec/services/spree/imports/row_processors/customer_spec.rb
@@ -84,7 +84,7 @@ RSpec.describe Spree::Imports::RowProcessors::Customer, type: :service do
it 'generates a random password for new users' do
user = subject.process!
- expect(user.encrypted_password).to be_present
+ expect(user.password_digest).to be_present
end
end
@@ -133,11 +133,11 @@ RSpec.describe Spree::Imports::RowProcessors::Customer, type: :service do
end
it 'does not overwrite the password' do
- original_password = existing_user.encrypted_password
+ original_password = existing_user.password_digest
subject.process!
- expect(existing_user.reload.encrypted_password).to eq original_password
+ expect(existing_user.reload.password_digest).to eq original_password
end
end
diff --git a/spree/core/spec/services/spree/newsletter/verify_spec.rb b/spree/core/spec/services/spree/newsletter/verify_spec.rb
index 08ed914f28..23755e66b8 100644
--- a/spree/core/spec/services/spree/newsletter/verify_spec.rb
+++ b/spree/core/spec/services/spree/newsletter/verify_spec.rb
@@ -10,7 +10,7 @@ module Spree
}
end
- let(:subscriber) { create(:newsletter_subscriber, :unverified, user: user) }
+ let(:subscriber) { create(:newsletter_subscriber, :unverified, customer: user) }
around do |example|
Timecop.freeze('2137-01-01') { example.run }
diff --git a/spree/core/spec/services/spree/orders/create_user_account_spec.rb b/spree/core/spec/services/spree/orders/create_user_account_spec.rb
index 3d8131226d..1e3d767fec 100644
--- a/spree/core/spec/services/spree/orders/create_user_account_spec.rb
+++ b/spree/core/spec/services/spree/orders/create_user_account_spec.rb
@@ -7,14 +7,14 @@ describe Spree::Orders::CreateUserAccount do
let(:store) { @default_store }
let(:address) { create(:address, country: store.default_country, firstname: 'John', lastname: 'Snow') }
let(:order) do
- create(:completed_order_with_totals, bill_address: address, ship_address: address, store: store, user: nil, email: '[email protected]')
+ create(:completed_order_with_totals, bill_address: address, ship_address: address, store: store, customer: nil, email: '[email protected]')
end
context 'when order has no user' do
- let(:new_user) { Spree.user_class.find_by!(email: order.email) }
+ let(:new_user) { Spree.customer_class.find_by!(email: order.email) }
it 'creates a new user' do
- expect { subject }.to change { Spree.user_class.count }.by(1)
+ expect { subject }.to change { Spree.customer_class.count }.by(1)
expect(new_user.email).to eq(order.email)
expect(new_user.first_name).to eq(order.bill_address.firstname)
@@ -33,8 +33,8 @@ describe Spree::Orders::CreateUserAccount do
it 'assigns the user to the order' do
subject
- expect(order.reload.user).to be_present
- expect(order.user).to eq(new_user)
+ expect(order.reload.customer).to be_present
+ expect(order.customer).to eq(new_user)
end
end
@@ -42,12 +42,12 @@ describe Spree::Orders::CreateUserAccount do
let!(:user) { create(:user, email: '[email protected]') }
it 'does not create a new user' do
- expect { subject }.to change { Spree.user_class.count }.by(0)
+ expect { subject }.to change { Spree.customer_class.count }.by(0)
end
it 'assigns the user to the order' do
subject
- expect(order.reload.user).to eq(user)
+ expect(order.reload.customer).to eq(user)
end
it 'returns success with the user' do
diff --git a/spree/core/spec/services/spree/orders/update_spec.rb b/spree/core/spec/services/spree/orders/update_spec.rb
index 8142bc9a27..e9d9df53f0 100644
--- a/spree/core/spec/services/spree/orders/update_spec.rb
+++ b/spree/core/spec/services/spree/orders/update_spec.rb
@@ -25,7 +25,7 @@ module Spree
end
let!(:stock_location) { Spree::StockLocation.first || create(:stock_location, country: country, state: state) }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
describe '#call' do
subject { described_class.call(order: order, params: params) }
@@ -78,7 +78,7 @@ module Spree
end
context 'with item that fails (currency mismatch)' do
- let(:order) { create(:order, user: user, store: store, currency: 'GBP') }
+ let(:order) { create(:order, customer: user, store: store, currency: 'GBP') }
let(:params) do
{
@@ -145,7 +145,7 @@ module Spree
# Order seeded with a shipping address + line item + an initial shipment.
let(:initial_address) { create(:address, country: country, state: state) }
let(:order) do
- o = create(:order, user: user, store: store, ship_address: initial_address)
+ o = create(:order, customer: user, store: store, ship_address: initial_address)
described_class.call(order: o, params: { items: [{ variant_id: variant.prefixed_id, quantity: 1 }] })
o.reload
end
@@ -229,7 +229,7 @@ module Spree
describe 'with an automatic free-shipping promotion' do
let!(:promotion) { create(:free_shipping_promotion, kind: :automatic) }
let(:initial_address) { create(:address, country: country, state: state) }
- let(:order) { create(:order, user: user, store: store, ship_address: initial_address) }
+ let(:order) { create(:order, customer: user, store: store, ship_address: initial_address) }
it 'applies the promo when items are added so delivery cost nets to zero' do
described_class.call(order: order, params: { items: [{ variant_id: variant.prefixed_id, quantity: 1 }] })
diff --git a/spree/core/spec/services/spree/orders/upsert_items_spec.rb b/spree/core/spec/services/spree/orders/upsert_items_spec.rb
index 17223ae49b..ddf0282ce2 100644
--- a/spree/core/spec/services/spree/orders/upsert_items_spec.rb
+++ b/spree/core/spec/services/spree/orders/upsert_items_spec.rb
@@ -4,7 +4,7 @@ module Spree
RSpec.describe Orders::UpsertItems do
let(:store) { create(:store) }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user, store: store) }
+ let(:order) { create(:order, customer: user, store: store) }
let(:variant) { create(:variant) }
let(:variant2) { create(:variant) }
@@ -162,7 +162,7 @@ module Spree
end
context 'with variant not available in order currency' do
- let(:order) { create(:order, user: user, store: store, currency: 'GBP') }
+ let(:order) { create(:order, customer: user, store: store, currency: 'GBP') }
let(:items) { [{ variant_id: variant.prefixed_id, quantity: 1 }] }
it 'returns failure with descriptive message' do
diff --git a/spree/core/spec/services/spree/payments/create_spec.rb b/spree/core/spec/services/spree/payments/create_spec.rb
index cfd9e40d65..83949fc72a 100644
--- a/spree/core/spec/services/spree/payments/create_spec.rb
+++ b/spree/core/spec/services/spree/payments/create_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:store) { @default_store }
- let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
+ let(:order) { create(:order_with_totals, store: store, customer: nil, email: '[email protected]') }
let(:execute) { subject.call(order: order, params: params) }
let(:value) { execute.value }
@@ -53,7 +53,7 @@ module Spree
context 'with user' do
let(:user) { create(:user) }
- let(:order) { create(:order_with_totals, store: store, user: user) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
include_context 'creates a payment'
include_context 'creates a payment source'
@@ -77,8 +77,8 @@ module Spree
context 'valid source' do
let(:user) { create(:user) }
- let(:order) { create(:order_with_totals, store: store, user: user) }
- let!(:payment_source) { create(:credit_card, payment_method: payment_method, user: user) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
+ let!(:payment_source) { create(:credit_card, payment_method: payment_method, customer: user) }
include_context 'creates a payment'
@@ -87,8 +87,8 @@ module Spree
context 'source assigned to a different user' do
let(:user) { create(:user) }
- let(:order) { create(:order_with_totals, store: store, user: user) }
- let!(:payment_source) { create(:credit_card, payment_method: payment_method, user: create(:user)) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
+ let!(:payment_source) { create(:credit_card, payment_method: payment_method, customer: create(:user)) }
it { expect(execute.success?).to eq(false) }
it { expect(execute.error.to_s).to eq('source_not_found') }
@@ -105,7 +105,7 @@ module Spree
end
let(:user) { create(:user) }
- let(:order) { create(:order_with_totals, store: store, user: user) }
+ let(:order) { create(:order_with_totals, store: store, customer: user) }
it { expect(execute.success?).to eq(false) }
it { expect(execute.error.to_s).to eq('source_not_found') }
diff --git a/spree/core/spec/services/spree/sample_data/loader_spec.rb b/spree/core/spec/services/spree/sample_data/loader_spec.rb
index 4f60bd7f32..7264322662 100644
--- a/spree/core/spec/services/spree/sample_data/loader_spec.rb
+++ b/spree/core/spec/services/spree/sample_data/loader_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Spree::SampleData::Loader, type: :service, without_global_store:
end
it 'creates customers' do
- expect(Spree.user_class.where.not(email: '[email protected]').count).to be > 5
+ expect(Spree.customer_class.where.not(email: '[email protected]').count).to be > 5
end
it 'creates completed orders' do
@@ -40,7 +40,7 @@ RSpec.describe Spree::SampleData::Loader, type: :service, without_global_store:
end
it 'creates an approved wholesale buyer' do
- buyer = Spree.user_class.find_by(email: '[email protected]')
+ buyer = Spree.customer_class.find_by(email: '[email protected]')
group = store.customer_groups.find_by(name: 'Wholesale')
expect(buyer).to be_present
diff --git a/spree/core/spec/services/spree/shipments/add_item_spec.rb b/spree/core/spec/services/spree/shipments/add_item_spec.rb
index 07d0d9a0ac..1ab4fcbddb 100644
--- a/spree/core/spec/services/spree/shipments/add_item_spec.rb
+++ b/spree/core/spec/services/spree/shipments/add_item_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:store) { @default_store }
- let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
+ let(:order) { create(:order_with_totals, store: store, customer: nil, email: '[email protected]') }
let(:product) { create(:product_in_stock) }
let(:variant) { product.default_variant }
diff --git a/spree/core/spec/services/spree/shipments/create_spec.rb b/spree/core/spec/services/spree/shipments/create_spec.rb
index 4fa7597007..5c232b2d3d 100644
--- a/spree/core/spec/services/spree/shipments/create_spec.rb
+++ b/spree/core/spec/services/spree/shipments/create_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:store) { @default_store }
- let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
+ let(:order) { create(:order_with_totals, store: store, customer: nil, email: '[email protected]') }
let(:product) { create(:product_in_stock) }
let(:variant) { product.default_variant }
let(:stock_location) { product.stock_items.first.stock_location }
diff --git a/spree/core/spec/services/spree/shipments/remove_item_spec.rb b/spree/core/spec/services/spree/shipments/remove_item_spec.rb
index 6ea6ce7676..4bcb54250c 100644
--- a/spree/core/spec/services/spree/shipments/remove_item_spec.rb
+++ b/spree/core/spec/services/spree/shipments/remove_item_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:store) { @default_store }
- let(:order) { create(:order_ready_to_ship, store: store, user: nil, email: '[email protected]') }
+ let(:order) { create(:order_ready_to_ship, store: store, customer: nil, email: '[email protected]') }
let(:variant) { shipment.line_items.first.variant }
let(:shipment) { order.shipments.first }
let(:line_item) { shipment.line_items.last }
diff --git a/spree/core/spec/subscribers/spree/report_subscriber_spec.rb b/spree/core/spec/subscribers/spree/report_subscriber_spec.rb
index 53667518a4..b8cf8395da 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,
- user: user,
+ customer: user,
date_from: 1.month.ago,
date_to: Time.current,
currency: store.default_currency