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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
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.rbindex a7e2fef4ae..86aa0b8b7c 100644--- a/spree/core/app/models/spree/customer.rb+++ b/spree/core/app/models/spree/customer.rb@@ -16,7 +16,7 @@ module Spreeinclude Spree::AccountLockoutinclude 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: falsediff --git a/spree/core/spec/models/spree/customer_spec.rb b/spree/core/spec/models/spree/customer_spec.rbindex 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 doendend+ 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' doit 'round-trips through find_by_password_reset_token' dotoken = customer.generate_token_for(:password_reset)