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
Made per-store name uniqueness one declaration (V-3633) (#14647)
Damian Legawiecaa774ce16b58
diff --git a/spree/core/app/models/concerns/spree/named_type.rb b/spree/core/app/models/concerns/spree/named_type.rbindex 6c1190c9a8..a5b71afb07 100644--- a/spree/core/app/models/concerns/spree/named_type.rb+++ b/spree/core/app/models/concerns/spree/named_type.rb@@ -1,30 +1,22 @@module Spree# Shared behaviour for the reason vocabularies — return, claim, refund and- # order cancellation.- #- # All of them are store-owned, so the scoping lives here rather than being- # repeated per model. `UniqueName` stays the general concern for globally- # unique named records (Role, OptionType, Zone); this one narrows it to- # per-store names.+ # order cancellation. They are store-owned, listed alphabetically, and+ # filtered on `active`, so the scoping lives here rather than being+ # repeated per model.module NamedTypeextend ActiveSupport::Concernincluded do+ include Spree::SingleStoreResource+scope :active, -> { where(active: true) }default_scope { order(name: :asc) }- include Spree::SingleStoreResource-normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }+ validates :name, presence: true# Per store, not global: two stores can each have their own "Damaged".- # Backed by a unique (store_id, name) index on each table.- validates :name, presence: true,- uniqueness: {- case_sensitive: false,- allow_blank: true,- scope: [:store_id, *spree_base_uniqueness_scope]- }+ validates_store_uniqueness :nameendendenddiff --git a/spree/core/app/models/concerns/spree/unique_name.rb b/spree/core/app/models/concerns/spree/unique_name.rbdeleted file mode 100644index 6c99b24c11..0000000000--- a/spree/core/app/models/concerns/spree/unique_name.rb+++ /dev/null@@ -1,12 +0,0 @@-module Spree- module UniqueName- extend ActiveSupport::Concern-- included do- normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }-- validates :name, presence: true,- uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }- end- end-enddiff --git a/spree/core/app/models/concerns/spree/validates_store_uniqueness.rb b/spree/core/app/models/concerns/spree/validates_store_uniqueness.rbnew file mode 100644index 0000000000..f09e119e65--- /dev/null+++ b/spree/core/app/models/concerns/spree/validates_store_uniqueness.rb@@ -0,0 +1,53 @@+module Spree+ # Declares an attribute unique within its store, ignoring rows that are gone.+ # Included in {Spree::Base}, so any model can declare one directly:+ #+ # validates_store_uniqueness :name+ # validates_store_uniqueness :name, scope: [:seller_id]+ # validates_store_uniqueness :name, soft_delete_column: :revoked_at+ #+ # Nothing here resolves a record from a string — finding one by a slug or+ # permalink is FriendlyId's job.+ module ValidatesStoreUniqueness+ extend ActiveSupport::Concern++ class_methods do+ # @param attribute [Symbol] the column to keep unique+ # @param soft_delete_column [Symbol] the column a removed row is stamped+ # with, so removed rows free their value. Defaults to `deleted_at`;+ # a model without that column simply has none, and every row counts.+ # @param scope [Array<Symbol>] extra columns the value is unique within,+ # e.g. `:seller_id` on a table sellers share with the operator+ def validates_store_uniqueness(attribute, soft_delete_column: :deleted_at, scope: [])+ # Resolved inside the lambda, not here: reading `column_names` while+ # the class body runs would hit the database during boot.+ conditions = lambda do+ klass = respond_to?(:klass) ? self.klass : self+ if klass.column_names.include?(soft_delete_column.to_s)+ where(soft_delete_column => nil)+ else+ all+ end+ end++ uniqueness_scope = [*spree_base_uniqueness_scope, :store_id, *scope]++ validates attribute,+ uniqueness: { case_sensitive: false,+ scope: uniqueness_scope,+ conditions: conditions },+ # Checked only when the value or the scope it is unique+ # within changes — moving a delivery method to another+ # seller has to be checked too. A row that already shares+ # its value with another (from before this rule) stays+ # saveable until the follow-up adds the unique index and+ # renames existing duplicates.+ if: lambda { |record|+ [attribute, *uniqueness_scope].any? do |column|+ record.will_save_change_to_attribute?(column)+ end+ }+ end+ end+ end+enddiff --git a/spree/core/app/models/spree/api_key.rb b/spree/core/app/models/spree/api_key.rbindex c154bc5c3d..3cafc724b8 100644--- a/spree/core/app/models/spree/api_key.rb+++ b/spree/core/app/models/spree/api_key.rb@@ -53,6 +53,7 @@ module Spreebelongs_to :revoked_by, polymorphic: true, optional: truevalidates :name, presence: true+ validates_store_uniqueness :name, soft_delete_column: :revoked_atvalidates :key_type, presence: true, inclusion: { in: KEY_TYPES }validates :token, presence: true, uniqueness: { scope: spree_base_uniqueness_scope }, if: :publishable?validates :token_digest, presence: true, uniqueness: true, if: :secret?diff --git a/spree/core/app/models/spree/base.rb b/spree/core/app/models/spree/base.rbindex 9b3d940a96..0a031e7624 100644--- a/spree/core/app/models/spree/base.rb+++ b/spree/core/app/models/spree/base.rb@@ -9,6 +9,7 @@ class Spree::Base < ApplicationRecordinclude Spree::HasNumberinclude Spree::HasIsoGeographyinclude Spree::TypedAssociations+ include Spree::ValidatesStoreUniqueness# Extra writable attributes contributed by extensions, appended to the v3# controller allowlist for this resource. Core attributes belong in thediff --git a/spree/core/app/models/spree/delivery_method.rb b/spree/core/app/models/spree/delivery_method.rbindex 4dc5676f2a..149def8ebb 100644--- a/spree/core/app/models/spree/delivery_method.rb+++ b/spree/core/app/models/spree/delivery_method.rb@@ -119,6 +119,7 @@ module Spreeself.whitelisted_ransackable_associations = %w[seller]validates :name, presence: true+ validates_store_uniqueness :name, scope: [:seller_id]validates :storefront_visible, inclusion: { in: [true, false] }validate :delivery_zone_must_belong_to_profile,if: -> { delivery_zone_id_changed? || delivery_profile_id_changed? }diff --git a/spree/core/app/models/spree/option_type.rb b/spree/core/app/models/spree/option_type.rbindex e864ddf00b..2f4108a8fe 100644--- a/spree/core/app/models/spree/option_type.rb+++ b/spree/core/app/models/spree/option_type.rb@@ -5,7 +5,7 @@ module SpreeKINDS = %w[dropdown color_swatch buttons].freezeinclude Spree::ParameterizableName- include Spree::UniqueName+ include Spree::SingleStoreResourceinclude Spree::HasCustomFieldsinclude Spree::Metadatainclude Spree::LabelTranslatable@@ -24,8 +24,13 @@ module Spreeself.whitelisted_ransackable_scopes = %w[search_by_name]# `label` is what admin surfaces display, so it has to be filterable —# matching Spree::OptionValue, which already allows it.- self.whitelisted_ransackable_attributes = %w[label]- acts_as_list+ self.whitelisted_ransackable_attributes = %w[label name]++ normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }++ validates :name, presence: true+ validates_store_uniqueness :name+ acts_as_list scope: :store_id## Associationsdiff --git a/spree/core/app/models/spree/payment_method.rb b/spree/core/app/models/spree/payment_method.rbindex 74079431e4..867104e926 100644--- a/spree/core/app/models/spree/payment_method.rb+++ b/spree/core/app/models/spree/payment_method.rb@@ -52,6 +52,7 @@ module Spreeafter_initialize :set_name, if: :new_record?validates :name, presence: true+ validates_store_uniqueness :namevalidates :store, presence: truevalidates :storefront_visible, inclusion: { in: [true, false] }normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }diff --git a/spree/core/app/models/spree/price_list.rb b/spree/core/app/models/spree/price_list.rbindex a3d112b737..33ca67240f 100644--- a/spree/core/app/models/spree/price_list.rb+++ b/spree/core/app/models/spree/price_list.rb@@ -75,6 +75,7 @@ module Spreeendvalidates :name, presence: true+ validates_store_uniqueness :namevalidates :match_policy, presence: true, inclusion: { in: MATCH_POLICIES }# One live list per catalog; soft-deleted lists release the slot. Backed# by a unique index on every adapter — partial on PostgreSQL and SQLite,diff --git a/spree/core/app/models/spree/role.rb b/spree/core/app/models/spree/role.rbindex 04f7685597..a98229ad07 100644--- a/spree/core/app/models/spree/role.rb+++ b/spree/core/app/models/spree/role.rb@@ -2,7 +2,7 @@ module Spreeclass Role < Spree.base_classhas_prefix_id :role- # Deliberately NOT Spree::UniqueName: its uniqueness is global, while a+ # Deliberately NOT validates_store_uniqueness: a role's uniqueness is per owner, while a# role is unique within the resource that owns it (see the name validation# below). The normalization it applies is kept verbatim.normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }diff --git a/spree/core/app/models/spree/stock_location.rb b/spree/core/app/models/spree/stock_location.rbindex 2215cc7e24..76221e3adf 100644--- a/spree/core/app/models/spree/stock_location.rb+++ b/spree/core/app/models/spree/stock_location.rb@@ -31,7 +31,7 @@ module Spree# that is not a marketplace.belongs_to :seller, class_name: 'Spree::Seller', optional: true, inverse_of: :stock_locations- # Per owner rather than per store, which is why UniqueName is not included+ # Per owner rather than per store, which is why validates_store_uniqueness is not used# here: an operator and each of their sellers may each have a "Warehouse",# which is what a marketplace looks like.normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }diff --git a/spree/core/app/models/spree/tax_rate.rb b/spree/core/app/models/spree/tax_rate.rbindex 0284231150..ba1a55db17 100644--- a/spree/core/app/models/spree/tax_rate.rb+++ b/spree/core/app/models/spree/tax_rate.rb@@ -23,10 +23,11 @@ module Spreehas_many :tax_lines, class_name: 'Spree::TaxLine', dependent: :nullify- with_options presence: true do- validates :amount, numericality: { allow_nil: true }- validates :name- end+ validates :amount, presence: true, numericality: { allow_nil: true }+ # Per store, so a config file can address a rate by name; a soft-deleted+ # rate frees its name.+ validates :name, presence: true+ validates_store_uniqueness :name# The jurisdiction this rate applies in, held as codes: a blank country_code# means everywhere, and a country with no state_code means the wholediff --git a/spree/core/app/models/spree/variant.rb b/spree/core/app/models/spree/variant.rbindex adb1087c08..b01381c7b7 100644--- a/spree/core/app/models/spree/variant.rb+++ b/spree/core/app/models/spree/variant.rb@@ -248,7 +248,12 @@ module Spree}scope :with_option_value, lambda { |option_name, option_value|- option_type_ids = OptionType.where(name: option_name).ids+ # Option types are per store, so two stores may each define `size`;+ # narrow to the store in context so a filter never matches another+ # store's values.+ option_types = OptionType.where(name: option_name)+ option_types = option_types.where(store_id: Spree::Current.store.id) if Spree::Current.store+ option_type_ids = option_types.idsreturn none if option_type_ids.empty?joins(:option_values).where(Spree::OptionValue.table_name => { name: option_value, option_type_id: option_type_ids })diff --git a/spree/core/app/models/spree/webhook_endpoint.rb b/spree/core/app/models/spree/webhook_endpoint.rbindex 305dfb36eb..28d8278920 100644--- a/spree/core/app/models/spree/webhook_endpoint.rb+++ b/spree/core/app/models/spree/webhook_endpoint.rb@@ -17,6 +17,7 @@ module Spreehas_many :webhook_deliveries, class_name: 'Spree::WebhookDelivery', dependent: :destroy_asyncvalidates :url, presence: true+ validates_store_uniqueness :urlvalidates :url, format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), message: :invalid_url }validates :active, inclusion: { in: [true, false] }validate :url_must_not_resolve_to_private_ip, if: -> { !Rails.env.development? && url.present? && url_changed? }diff --git a/spree/core/app/models/spree/zone.rb b/spree/core/app/models/spree/zone.rbindex d3faa84d3c..7e02384b11 100644--- a/spree/core/app/models/spree/zone.rb+++ b/spree/core/app/models/spree/zone.rb@@ -6,8 +6,6 @@ module Spreeclass Zone < Spree.base_classhas_prefix_id :zone- include Spree::UniqueName-has_many :zone_members, class_name: 'Spree::ZoneMember', dependent: :destroy, inverse_of: :zonealias members zone_membersdiff --git a/spree/core/db/migrate/20260914230000_add_store_to_spree_option_types.rb b/spree/core/db/migrate/20260914230000_add_store_to_spree_option_types.rbnew file mode 100644index 0000000000..d125ec05f8--- /dev/null+++ b/spree/core/db/migrate/20260914230000_add_store_to_spree_option_types.rb@@ -0,0 +1,46 @@+class AddStoreToSpreeOptionTypes < ActiveRecord::Migration[8.1]+ def up+ add_reference :spree_option_types, :store, null: true, index: true++ # Existing option types were installation-wide, so they belong to the+ # store that has been using them. Left nullable: a fresh install has no+ # store yet, and the association enforces presence from the model side.+ default_store = Spree::Store.where(default: true).first || Spree::Store.first+ Spree::OptionType.update_all(store_id: default_store.id) if default_store++ # Names are unique within a store now, so two stores may each define `size`.+ remove_index :spree_option_types, :name, unique: true, if_exists: true+ add_index :spree_option_types, %i[store_id name], unique: true+ end++ def down+ remove_index :spree_option_types, %i[store_id name]++ # Two stores may each hold a `size` by now, which the global index would+ # refuse. Rolling back means going back to installation-wide option+ # types, so the duplicates are suffixed rather than dropped: no row is+ # lost, and the operator can see what to reconcile. Written in SQL+ # because a migration must not depend on model scopes or callbacks.+ execute(<<~SQL.squish)+ UPDATE spree_option_types+ SET name = #{concat_sql}+ WHERE id NOT IN (+ SELECT MIN(id) FROM spree_option_types GROUP BY name+ )+ SQL++ add_index :spree_option_types, :name, unique: true+ remove_reference :spree_option_types, :store+ end++ private++ # MySQL has no `||` string operator under its default SQL mode.+ def concat_sql+ if connection.adapter_name.downcase.include?('mysql')+ "CONCAT(name, '-', id)"+ else+ "name || '-' || id"+ end+ end+enddiff --git a/spree/core/lib/spree/testing_support/factories/api_key_factory.rb b/spree/core/lib/spree/testing_support/factories/api_key_factory.rbindex 7f1c0aec36..023cdbf9a2 100644--- a/spree/core/lib/spree/testing_support/factories/api_key_factory.rb+++ b/spree/core/lib/spree/testing_support/factories/api_key_factory.rb@@ -1,6 +1,6 @@FactoryBot.define dofactory :api_key, class: Spree::ApiKey do- name { FFaker::Lorem.word }+ sequence(:name) { |n| "API key #{n}" }key_type { 'publishable' }storediff --git a/spree/core/lib/spree/testing_support/factories/delivery_method_factory.rb b/spree/core/lib/spree/testing_support/factories/delivery_method_factory.rbindex c7699711a3..728203868b 100644--- a/spree/core/lib/spree/testing_support/factories/delivery_method_factory.rb+++ b/spree/core/lib/spree/testing_support/factories/delivery_method_factory.rb@@ -2,8 +2,8 @@ FactoryBot.define do# Delivery methods are worldwide by default — geographic restriction is# opt-in via an explicit :delivery_zone (empty zone list = no restriction).factory :base_delivery_method, aliases: [:base_shipping_method], class: Spree::DeliveryMethod do- name { 'UPS Ground' }- code { 'UPS_GROUND' }+ sequence(:name) { |n| "UPS Ground #{n}" }+ sequence(:code) { |n| "UPS_GROUND_#{n}" }store { Spree::Store.find_by(default: true) || association(:store) }delivery_profile { store.default_delivery_profile || association(:delivery_profile, store: store) }@@ -25,15 +25,15 @@ FactoryBot.define doendfactory :pickup_delivery_method, class: Spree::DeliveryMethod do- name { 'Store pickup' }- code { 'PICKUP' }+ sequence(:name) { |n| "Store pickup #{n}" }+ sequence(:code) { |n| "PICKUP_#{n}" }fulfillment_provider { 'Spree::FulfillmentProvider::Pickup' }association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)endfactory :pickup_point_delivery_method, class: Spree::DeliveryMethod do- name { 'Parcel locker' }- code { 'PICKUP_POINT' }+ sequence(:name) { |n| "Parcel locker #{n}" }+ sequence(:code) { |n| "PICKUP_POINT_#{n}" }fulfillment_provider { 'Spree::FulfillmentProvider::PickupPoint' }association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)enddiff --git a/spree/core/lib/spree/testing_support/factories/payment_method_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_method_factory.rbindex 777767bfc8..7e4db58f4f 100644--- a/spree/core/lib/spree/testing_support/factories/payment_method_factory.rb+++ b/spree/core/lib/spree/testing_support/factories/payment_method_factory.rb@@ -1,25 +1,25 @@FactoryBot.define dofactory :payment_method, class: Spree::PaymentMethod dotype { 'Spree::PaymentMethod' }- name { 'Test' }+ sequence(:name) { |n| "Test #{n}" }store { Spree::Store.find_by(default: true) || association(:store) }endfactory :check_payment_method, parent: :payment_method, class: Spree::PaymentMethod::Check dotype { 'Spree::PaymentMethod::Check' }- name { 'Check' }+ sequence(:name) { |n| "Check #{n}" }endfactory :credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::Bogus dotype { 'Spree::Gateway::Bogus' }- name { 'Credit Card' }+ sequence(:name) { |n| "Credit Card #{n}" }endfactory :simple_credit_card_payment_method, parent: :credit_card_payment_methodfactory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit dotype { 'Spree::PaymentMethod::StoreCredit' }- name { 'Store Credit' }+ sequence(:name) { |n| "Store Credit #{n}" }description { 'Store Credit' }active { true }auto_capture { true }@@ -27,7 +27,7 @@ FactoryBot.define dofactory :custom_payment_method, parent: :payment_method, class: Spree::Gateway::CustomPaymentSourceMethod dotype { 'Spree::Gateway::CustomPaymentSourceMethod' }- name { 'Custom' }+ sequence(:name) { |n| "Custom #{n}" }endfactory :bogus_payment_method, parent: :credit_card_payment_methoddiff --git a/spree/core/lib/tasks/cli.rake b/spree/core/lib/tasks/cli.rakeindex 8d0b1a6689..ca5b0ebb34 100644--- a/spree/core/lib/tasks/cli.rake+++ b/spree/core/lib/tasks/cli.rake@@ -8,13 +8,20 @@ namespace :spree doprint key.plaintext_tokenend- desc 'Create an API key'+ desc 'Create an API key (REPLACE=true revokes active keys of the same name first)'task create_api_key: :environment doname = ENV.fetch('NAME')key_type = ENV.fetch('KEY_TYPE')scopes = ENV.fetch('SCOPES', '').split(',').map(&:strip).reject(&:empty?)store = Spree::Store.default- key = store.api_keys.create!(name: name, key_type: key_type, scopes: scopes)+ # Names are unique among a store's active keys, so a key the CLI mints+ # under a fixed name on every run supersedes the previous one. Both+ # steps in one transaction: a failed create must not leave the operator+ # with the old key revoked and no replacement.+ key = Spree::ApiKey.transaction do+ store.api_keys.active.where(name: name).find_each(&:revoke!) if ENV['REPLACE'] == 'true'+ store.api_keys.create!(name: name, key_type: key_type, scopes: scopes)+ endprint key.plaintext_tokenenddiff --git a/spree/core/spec/lib/tasks/cli_spec.rb b/spree/core/spec/lib/tasks/cli_spec.rbindex 19f31520de..3c210b9400 100644--- a/spree/core/spec/lib/tasks/cli_spec.rb+++ b/spree/core/spec/lib/tasks/cli_spec.rb@@ -35,6 +35,36 @@ describe 'spree:cli:create_api_key' doexpect(key.scopes).to eq(%w[read_orders write_promotions])end+ context 'when an active key already carries the name' do+ let!(:previous) { create(:api_key, :secret, name: 'CI key', store: store, scopes: %w[read_all]) }++ it 'refuses, since names are unique among a store\'s active keys' do+ expect { subject.invoke }.to raise_error(ActiveRecord::RecordInvalid, /Name/)+ end++ context 'with REPLACE=true' do+ let(:env) { super().merge('REPLACE' => 'true') }++ it 'leaves the previous key usable when the replacement cannot be created' do+ allow_any_instance_of(Spree::ApiKey).to receive(:save!).and_raise(+ ActiveRecord::RecordInvalid.new(Spree::ApiKey.new)+ )++ expect { subject.invoke }.to raise_error(ActiveRecord::RecordInvalid)+ # The revoke rolled back with the failed create, so the operator+ # still has a working key.+ expect(previous.reload.revoked_at).to be_nil+ end++ it 'revokes the previous key and mints the new one' do+ expect { subject.invoke }.to output(/\Ask_/).to_stdout++ expect(previous.reload.revoked_at).to be_present+ expect(store.api_keys.active.where(name: 'CI key').count).to eq(1)+ end+ end+ end+context 'without SCOPES' dolet(:env) { { 'NAME' => 'CI key', 'KEY_TYPE' => 'secret' } }diff --git a/spree/core/spec/models/spree/api_key_spec.rb b/spree/core/spec/models/spree/api_key_spec.rbindex aa6c2c2340..05081be4fc 100644--- a/spree/core/spec/models/spree/api_key_spec.rb+++ b/spree/core/spec/models/spree/api_key_spec.rb@@ -15,6 +15,27 @@ RSpec.describe Spree::ApiKey, type: :model doexpect(api_key.errors[:name]).to be_presentend+ it 'requires a name unique among the store\'s active keys' do+ store = create(:store)+ existing = create(:api_key, name: 'Storefront', store: store)++ expect(build(:api_key, name: 'Storefront', store: store)).not_to be_valid+ expect(build(:api_key, name: 'Storefront', store: create(:store))).to be_valid++ existing.revoke!+ expect(build(:api_key, name: 'Storefront', store: store)).to be_valid+ end++ it 'still saves a key that shared its name before the rule existed' do+ store = create(:store)+ create(:api_key, name: 'Storefront', store: store)+ older = create(:api_key, name: 'Storefront (old)', store: store)+ older.update_column(:name, 'Storefront')++ expect { older.revoke! }.not_to raise_error+ expect(older.reload.revoked_at).to be_present+ end+it 'requires a key_type' doapi_key.key_type = nilexpect(api_key).not_to be_validdiff --git a/spree/core/spec/models/spree/concerns/named_type_spec.rb b/spree/core/spec/models/spree/concerns/validates_store_uniqueness_spec.rbsimilarity index 76%rename from spree/core/spec/models/spree/concerns/named_type_spec.rbrename to spree/core/spec/models/spree/concerns/validates_store_uniqueness_spec.rbindex c837d5372e..d0a87b33ce 100644--- a/spree/core/spec/models/spree/concerns/named_type_spec.rb+++ b/spree/core/spec/models/spree/concerns/validates_store_uniqueness_spec.rb@@ -1,6 +1,6 @@require 'spec_helper'-RSpec.describe Spree::NamedType do+RSpec.describe Spree::ValidatesStoreUniqueness dodescribe 'name uniqueness' dolet!(:existing) { create(:return_reason, name: 'Wrong size') }@@ -22,6 +22,20 @@ RSpec.describe Spree::NamedType doendend+ describe 'the scope the value is unique within' do+ it 'checks a move between sellers, not only a rename' do+ seller = create(:seller)+ create(:delivery_method, name: 'Standard', seller: seller)+ other = create(:delivery_method, name: 'Standard', seller: create(:seller))++ # Same name, different seller until now: moving it collides.+ other.seller = seller++ expect(other).not_to be_valid+ expect(other.errors[:name]).to be_present+ end+ end+describe 'name normalization' doit 'squishes surrounding and repeated whitespace' doreason = create(:return_reason, name: ' Wrong size ')diff --git a/spree/core/spec/models/spree/delivery_method_spec.rb b/spree/core/spec/models/spree/delivery_method_spec.rbindex bd99d5959d..7c378f5fc6 100644--- a/spree/core/spec/models/spree/delivery_method_spec.rb+++ b/spree/core/spec/models/spree/delivery_method_spec.rb@@ -172,6 +172,15 @@ describe Spree::DeliveryMethod, type: :model doexpect(subject.errors.messages[:name].size).to eq(1)end+ it 'requires a name unique within the store and owner' do+ create(:delivery_method, name: 'Standard')++ expect(build(:delivery_method, name: 'Standard')).not_to be_valid+ expect(build(:delivery_method, name: 'Standard', store: create(:store))).to be_valid+ # A seller's own method shares the table and may reuse the operator's name.+ expect(build(:delivery_method, name: 'Standard', seller: create(:seller))).to be_valid+ end+it 'defaults to storefront visible and rejects a blank value' doexpect(subject.storefront_visible).to be truediff --git a/spree/core/spec/models/spree/payment_method_spec.rb b/spree/core/spec/models/spree/payment_method_spec.rbindex 9c732d4fc5..95260081ab 100644--- a/spree/core/spec/models/spree/payment_method_spec.rb+++ b/spree/core/spec/models/spree/payment_method_spec.rb@@ -17,6 +17,21 @@ describe Spree::PaymentMethod, type: :model doSpree.payment_methods.replace(original)end+ describe 'validations' do+ it 'requires a name unique within the store' do+ create(:check_payment_method, name: 'Check', store: store)++ expect(build(:check_payment_method, name: 'Check', store: store)).not_to be_valid+ expect(build(:check_payment_method, name: 'Check', store: create(:store))).to be_valid+ end++ it 'frees the name of a soft-deleted method' do+ create(:check_payment_method, name: 'Check', store: store).destroy++ expect(build(:check_payment_method, name: 'Check', store: store)).to be_valid+ end+ end+context 'visibility scopes' dolet!(:visible_method) dostore.payment_methods.create!(diff --git a/spree/core/spec/models/spree/price_list_spec.rb b/spree/core/spec/models/spree/price_list_spec.rbindex 1dfdb589c2..f7a7f1ba9b 100644--- a/spree/core/spec/models/spree/price_list_spec.rb+++ b/spree/core/spec/models/spree/price_list_spec.rb@@ -2,6 +2,13 @@ require 'spec_helper'describe Spree::PriceList, type: :model dodescribe 'Validations' do+ it 'requires a name unique within the store' do+ create(:price_list, name: 'Trade')++ expect(build(:price_list, name: 'Trade')).not_to be_valid+ expect(build(:price_list, name: 'Trade', store: create(:store))).to be_valid+ end+context 'date range validation' dolet(:price_list) { build(:price_list, starts_at: 2.days.from_now, ends_at: 1.day.from_now) }diff --git a/spree/core/spec/models/spree/tax_rate_spec.rb b/spree/core/spec/models/spree/tax_rate_spec.rbindex d120f60bbe..6660f5c4e4 100644--- a/spree/core/spec/models/spree/tax_rate_spec.rb+++ b/spree/core/spec/models/spree/tax_rate_spec.rb@@ -359,6 +359,19 @@ describe Spree::TaxRate, type: :model doexpect(create(:tax_rate, store: other_store).store).to eq(other_store)end+ it 'requires a name unique within the store' do+ create(:tax_rate, name: 'VAT')++ expect(build(:tax_rate, name: 'VAT')).not_to be_valid+ expect(build(:tax_rate, name: 'VAT', store: create(:store))).to be_valid+ end++ it 'frees the name of a soft-deleted rate' do+ create(:tax_rate, name: 'VAT').destroy++ expect(build(:tax_rate, name: 'VAT')).to be_valid+ end+it 'only returns rates of the given store' doother_store = create(:store)own_rate = create(:tax_rate)diff --git a/spree/core/spec/models/spree/translations/batch_spec.rb b/spree/core/spec/models/spree/translations/batch_spec.rbindex 5c1f901b6a..284ea2e13e 100644--- a/spree/core/spec/models/spree/translations/batch_spec.rb+++ b/spree/core/spec/models/spree/translations/batch_spec.rb@@ -2,11 +2,14 @@ require 'spec_helper'RSpec.describe Spree::Translations::Batch dolet(:store) { @default_store }- let!(:option_type) { create(:option_type, name: 'size', label: 'Size') }+ let!(:option_type) do+ store.default_market.update!(supported_locales: 'en,de,fr')+ store.reload+ create(:option_type, name: 'size', label: 'Size', store: store)+ endlet!(:option_value) { create(:option_value, name: 'small', label: 'Small', option_type: option_type) }before do- store.update!(supported_locales: 'en,de,fr')allow(Spree::Current).to receive(:store).and_return(store)enddiff --git a/spree/core/spec/models/spree/webhook_endpoint_spec.rb b/spree/core/spec/models/spree/webhook_endpoint_spec.rbindex b0a17b4c05..ffdb0d7634 100644--- a/spree/core/spec/models/spree/webhook_endpoint_spec.rb+++ b/spree/core/spec/models/spree/webhook_endpoint_spec.rb@@ -7,6 +7,14 @@ describe Spree::WebhookEndpoint, type: :model dolet(:webhook_endpoint) { build(:webhook_endpoint, store: store) }describe 'validations' do+ it 'requires a url unique within the store' do+ store = create(:store)+ create(:webhook_endpoint, url: 'https://example.com/hook', store: store)++ expect(build(:webhook_endpoint, url: 'https://example.com/hook', store: store)).not_to be_valid+ expect(build(:webhook_endpoint, url: 'https://example.com/hook', store: create(:store))).to be_valid+ end+describe 'url format' doit 'accepts valid https urls' dowebhook_endpoint.url = 'https://example.com/webhooks'diff --git a/spree/providers/stripe/lib/spree_stripe/testing_support/factories/gateway_factory.rb b/spree/providers/stripe/lib/spree_stripe/testing_support/factories/gateway_factory.rbindex 64b2cdddd1..ac623afe4d 100644--- a/spree/providers/stripe/lib/spree_stripe/testing_support/factories/gateway_factory.rb+++ b/spree/providers/stripe/lib/spree_stripe/testing_support/factories/gateway_factory.rb@@ -1,6 +1,6 @@FactoryBot.define dofactory :stripe_gateway, parent: :payment_method, class: 'SpreeStripe::Gateway' do- name { 'Stripe' }+ sequence(:name) { |n| "Stripe #{n}" }type { 'SpreeStripe::Gateway' }preferences do