Skip to content

armgit / spree

Public Imported from GitHub
0

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

Changed customer email uniqueness to use the base uniqueness scope (#14960)

Damian Legawiec892f386dddd7
diff --git a/spree/core/app/models/spree/customer.rb b/spree/core/app/models/spree/customer.rb
index a7e2fef4ae..86aa0b8b7c 100644
--- a/spree/core/app/models/spree/customer.rb
+++ b/spree/core/app/models/spree/customer.rb
@@ -16,7 +16,7 @@ module Spree
include Spree::AccountLockout
include Spree::PasswordPolicy
- validates :email, presence: true, uniqueness: { case_sensitive: false }
+ validates :email, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
attribute :accepts_email_marketing, :boolean, default: false
diff --git a/spree/core/spec/models/spree/customer_spec.rb b/spree/core/spec/models/spree/customer_spec.rb
index 4207013298..e51504e3b0 100644
--- a/spree/core/spec/models/spree/customer_spec.rb
+++ b/spree/core/spec/models/spree/customer_spec.rb
@@ -14,6 +14,14 @@ describe Spree::Customer, type: :model do
end
end
+ describe 'email' do
+ it 'is unique within the base uniqueness scope' do
+ validator = described_class.validators_on(:email).find { |candidate| candidate.kind == :uniqueness }
+
+ expect(validator.options).to include(case_sensitive: false, scope: described_class.spree_base_uniqueness_scope)
+ end
+ end
+
describe 'password reset tokens' do
it 'round-trips through find_by_password_reset_token' do
token = customer.generate_token_for(:password_reset)