spree_core 5.5.3 → 5.6.0.rc1

data/db/migrate/20260613000001_add_store_id_to_spree_role_users.rb

@@ -0,0 +1,10 @@
+class AddStoreIdToSpreeRoleUsers < ActiveRecord::Migration[7.2]
+  def change
+    # Denormalizes the store a role assignment applies within, so role
+    # resolution (Spree::Ability) can scope by store without depending on the
+    # polymorphic resource. Kept null: true here; existing rows are backfilled
+    # by `spree:role_users:backfill_store_ids` and presence is enforced
+    # on the model.
+    add_reference :spree_role_users, :store, null: true
+  end
+end

data/db/migrate/20260626000001_add_store_id_to_spree_taxons.rb

@@ -0,0 +1,11 @@
+class AddStoreIdToSpreeTaxons < ActiveRecord::Migration[7.2]
+  # NOTE: After running this migration, existing taxons have +store_id IS NULL+
+  # and keep resolving their store through their taxonomy (Taxon.for_store falls
+  # back to the taxonomy join). Run the backfill to populate +store_id+ directly,
+  # which is what taxonomy-less categories (Spree::Category) rely on:
+  #
+  #   bundle exec rake spree:taxons:backfill_store_id
+  def change
+    add_reference :spree_taxons, :store, null: true, if_not_exists: true
+  end
+end

data/db/migrate/20260627000001_add_products_count_to_spree_taxons.rb

@@ -0,0 +1,6 @@
+class AddProductsCountToSpreeTaxons < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_taxons, :products_count, :integer, default: 0, null: false, if_not_exists: true
+    add_index :spree_taxons, :products_count, if_not_exists: true
+  end
+end

data/db/migrate/20260628000001_add_store_id_to_spree_promotions.rb

@@ -0,0 +1,10 @@
+class AddStoreIdToSpreePromotions < ActiveRecord::Migration[7.2]
+  # NOTE: After running this migration, existing promotions have +store_id IS NULL+
+  # and are invisible to +Promotion.for_store+. Run the backfill immediately to
+  # copy ownership from the legacy +spree_promotions_stores+ join table:
+  #
+  #   bundle exec rake spree:upgrade:populate_single_store_associations
+  def change
+    add_reference :spree_promotions, :store, null: true, if_not_exists: true
+  end
+end

data/db/migrate/20260628000002_add_store_id_to_spree_payment_methods.rb

@@ -0,0 +1,11 @@
+class AddStoreIdToSpreePaymentMethods < ActiveRecord::Migration[7.2]
+  # NOTE: After running this migration, existing payment methods have
+  # +store_id IS NULL+ and are invisible to +PaymentMethod.for_store+. Run the
+  # backfill immediately to copy ownership from the legacy
+  # +spree_payment_methods_stores+ join table:
+  #
+  #   bundle exec rake spree:upgrade:populate_single_store_associations
+  def change
+    add_reference :spree_payment_methods, :store, null: true, if_not_exists: true
+  end
+end

data/db/migrate/20260630000001_add_preorder_fields_to_spree_variants.rb

@@ -0,0 +1,7 @@
+class AddPreorderFieldsToSpreeVariants < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_variants, :preorderable, :boolean
+    add_column :spree_variants, :preorder_ships_at, :datetime
+    add_column :spree_variants, :backorder_limit, :integer
+  end
+end

data/db/migrate/20260707000001_add_fingerprint_to_spree_credit_cards.rb

@@ -0,0 +1,39 @@
+class AddFingerprintToSpreeCreditCards < ActiveRecord::Migration[7.2]
+  INDEX_NAME = 'index_spree_credit_cards_unique_fingerprint'.freeze
+
+  def up
+    add_column :spree_credit_cards, :fingerprint, :string
+
+    # Prevent duplicate saved cards (same gateway fingerprint + expiry) per user
+    # and payment method at the database level, backing the application-level
+    # check against concurrent writes. Only active, fingerprinted cards are
+    # constrained, so legacy/non-gateway cards (NULL fingerprint) and
+    # soft-deleted rows are left untouched.
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      # MySQL has no partial indexes, but treats NULL as distinct in unique
+      # indexes, so NULL fingerprints are naturally allowed. COALESCE on
+      # deleted_at keeps soft-deleted rows from colliding with active ones.
+      execute <<-SQL
+        CREATE UNIQUE INDEX #{INDEX_NAME}
+        ON spree_credit_cards(
+          user_id,
+          payment_method_id,
+          fingerprint,
+          month,
+          year,
+          (COALESCE(deleted_at, CAST('1970-01-01' AS DATETIME)))
+        )
+      SQL
+    else
+      add_index :spree_credit_cards, [:user_id, :payment_method_id, :fingerprint, :month, :year],
+                unique: true,
+                where: 'fingerprint IS NOT NULL AND deleted_at IS NULL',
+                name: INDEX_NAME
+    end
+  end
+
+  def down
+    remove_index :spree_credit_cards, name: INDEX_NAME
+    remove_column :spree_credit_cards, :fingerprint
+  end
+end

data/db/migrate/20260710000001_add_import_id_status_index_to_spree_import_rows.rb

@@ -0,0 +1,7 @@
+class AddImportIdStatusIndexToSpreeImportRows < ActiveRecord::Migration[7.2]
+  def change
+    # Powers the Admin API's per-poll grouped status counts and the
+    # failed-rows listing without a full scan on large imports.
+    add_index :spree_import_rows, [:import_id, :status]
+  end
+end

data/db/migrate/20260711000001_add_preferences_to_spree_exports.rb

@@ -0,0 +1,7 @@
+class AddPreferencesToSpreeExports < ActiveRecord::Migration[7.2]
+  def change
+    # Same serialized preferences store spree_imports already has — first
+    # consumer is the `results_url` the export-done email links back to.
+    add_column :spree_exports, :preferences, :text
+  end
+end

data/db/sample_data/promotions.rb

@@ -2,7 +2,7 @@ promotion = Spree::Promotion.where(
   name: 'Free Shipping',
   code: 'FREESHIP'
 ).first_or_create! do |promo|
-  promo.stores = Spree::Store.all
+  promo.store = Spree::Store.default
 end
 
 Spree::Promotion::Actions::FreeShipping.where(promotion: promotion).first_or_create!

data/lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt

@@ -2,7 +2,6 @@ class CreateSpreeAdminUsers < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :spree_admin_users do |t|
       t.string :encrypted_password, limit: 128
-      t.string :password_salt, limit: 128
       t.string :email
       t.string :remember_token
       t.string :persistence_token

data/lib/mobility/plugins/store_based_fallbacks.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'concurrent'
 require 'mobility'
 
 # The default implementation in the Mobility gem requires fallbacks to be defined when booting the application.
@@ -8,15 +7,18 @@ require 'mobility'
 # The implementation is based on the default fallbacks plugin, with some changes around fetching the list of fallbacks to be used.
 # https://github.com/shioyama/mobility/blob/master/lib/mobility/plugins/fallbacks.rb
 module Mobility
-  @store_based_fallbacks = Concurrent::ThreadLocalVar.new(I18n::Locale::Fallbacks.new)
-
   class << self
+    # Request-scoped via RequestStore (like Mobility.locale), so one request's
+    # store fallbacks can't leak into the next request served by the same
+    # thread. Outside a request RequestStore degrades to plain per-thread
+    # storage; Spree::BaseMailer#with_store_locale restores the previous value
+    # around mail rendering.
     def store_based_fallbacks
-      @store_based_fallbacks.value
+      RequestStore.store[:mobility_store_based_fallbacks] ||= I18n::Locale::Fallbacks.new
     end
 
     def store_based_fallbacks=(value)
-      @store_based_fallbacks.value = value
+      RequestStore.store[:mobility_store_based_fallbacks] = value
     end
   end
 

data/lib/spree/core/configuration.rb

@@ -118,6 +118,7 @@ module Spree
       preference :coupon_codes_total_limit, :integer, default: 5000 # the maximum number of coupon codes to be generated
 
       # password reset
+      preference :admin_password_reset_expires_in, :integer, default: 15 # admin password reset token expiration time in minutes
       preference :customer_password_reset_expires_in, :integer, default: 15 # password reset token expiration time in minutes
 
       # gift cards

data/lib/spree/core/controller_helpers/locale.rb

@@ -19,7 +19,10 @@ module Spree
         end
 
         def set_locale
-          I18n.default_locale = default_locale unless Spree.always_use_translations?
+          # Request-local content locale — the fallback for storeless hosts
+          # lives in the Spree::Current#content_locale reader; never write the
+          # process-global I18n.default_locale, which all threads share.
+          Spree::Current.content_locale = current_store&.default_locale
           I18n.locale = current_locale
         end
 

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -33,6 +33,7 @@ module Spree
 
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
+            removed_variant_ids: [],
             variants_attributes: permitted_variant_attributes + ['id', :_destroy],
             master_attributes: permitted_variant_attributes + ['id']
           ]

data/lib/spree/core/dependencies.rb

@@ -49,6 +49,9 @@ module Spree
         order_update_service: 'Spree::Orders::Update',
         order_updater: 'Spree::OrderUpdater',
 
+        # fulfillment
+        fulfillment_create_service: 'Spree::Fulfillments::Create',
+
         # shipment
         shipment_change_state_service: 'Spree::Shipments::ChangeState',
         shipment_create_service: 'Spree::Shipments::Create',

data/lib/spree/core/engine.rb

@@ -46,6 +46,14 @@ module Spree
       # Add app/subscribers to autoload paths
       config.paths.add 'app/subscribers', eager_load: true
 
+      # Register bundled ActionMailer previews so they show up at /rails/mailers
+      # without the host app having to copy any files.
+      initializer 'spree.mailer_previews' do |app|
+        if app.config.action_mailer.show_previews
+          app.config.action_mailer.preview_paths << File.expand_path('previews', __dir__)
+        end
+      end
+
       initializer 'spree.environment', before: :load_config_initializers do |app|
         app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
 
@@ -57,6 +65,18 @@ module Spree
         Spree::Deprecation = ActiveSupport::Deprecation.new('6.0', 'Spree')
       end
 
+      # I18n's config lives in fiber/thread-local storage that survives across
+      # requests on reused server threads, so a request that never assigns its
+      # own locale would render in whatever locale the previous request on the
+      # same thread set. The i18n gem ships a middleware that resets it after
+      # every request; Rails does not install it by default. Mobility's request
+      # state needs no counterpart here — Mobility.locale and Spree's
+      # Mobility.store_based_fallbacks live in RequestStore, which is cleared
+      # per request by request_store's own middleware.
+      initializer 'spree.locale_state_reset' do |app|
+        app.middleware.use ::I18n::Middleware
+      end
+
       initializer 'spree.register.subscribers', before: :load_config_initializers do |app|
         # Initialize subscribers array early so engines can add subscribers via initializers
         app.config.spree.subscribers = []
@@ -179,6 +199,8 @@ module Spree
         Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::Currency,
           Spree::Promotion::Rules::Country,
+          Spree::Promotion::Rules::Channel,
+          Spree::Promotion::Rules::Market,
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,
@@ -245,6 +267,7 @@ module Spree
 
         Rails.application.config.spree.translatable_resources = [
           Spree::OptionType,
+          Spree::OptionValue,
           Spree::Product,
           Spree::Taxon,
           Spree::Taxonomy,
@@ -345,6 +368,7 @@ module Spree
           Spree::ExportSubscriber,
           Spree::ReportSubscriber,
           Spree::InvitationEmailSubscriber,
+          Spree::AdminUserEmailSubscriber,
           Spree::ProductMetricsSubscriber
         ]
 

data/lib/spree/core/preferences/preferable.rb

@@ -135,7 +135,12 @@ module Spree::Preferences::Preferable
       int_value ||= 0 unless nullable
       int_value.present? ? int_value.to_i : int_value
     when :boolean
-      if value.is_a?(FalseClass) ||
+      # A nullable boolean keeps "unset" (nil / empty string) as nil so it can
+      # fall back to another value, instead of collapsing it to false. An
+      # explicit false is preserved (it is neither nil nor empty).
+      if nullable && (value.nil? || (value.respond_to?(:empty?) && value.empty?))
+        nil
+      elsif value.is_a?(FalseClass) ||
           value.nil? ||
           value == 0 ||
           value&.to_s =~ /^(f|false|0)$/i ||

data/lib/spree/core/previews/admin_user_preview.rb

@@ -0,0 +1,22 @@
+require_relative 'preview_data'
+
+# Preview Spree admin user auth emails at /rails/mailers/spree/admin_user
+class Spree::AdminUserPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def password_reset_email
+    Spree::AdminUserMailer.password_reset_email(
+      Spree::PreviewData.admin_user,
+      'preview-token',
+      Spree::PreviewData.store(locale)
+    )
+  end
+
+  def confirmation_email
+    Spree::AdminUserMailer.confirmation_email(
+      Spree::PreviewData.admin_user,
+      'preview-token',
+      Spree::PreviewData.store(locale)
+    )
+  end
+end

data/lib/spree/core/previews/export_preview.rb

@@ -0,0 +1,37 @@
+require_relative 'preview_data'
+
+# Preview Spree export emails at /rails/mailers/spree/export
+class Spree::ExportPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def export_done
+    Spree::ExportMailer.export_done(export)
+  end
+
+  private
+
+  # Reuse the most recent export, or build an in-memory example so the preview
+  # works on a database that has never run an export. When the preview toolbar
+  # requests a locale, always use the example so its store carries that locale.
+  # The example is never saved, so no `export.created` side effects fire.
+  def export
+    return example_export if locale.present?
+
+    Spree::Export.last || example_export
+  end
+
+  def example_export
+    export = Spree::Exports::Products.new(
+      id: 0,
+      store: Spree::PreviewData.store(locale),
+      user: Spree::PreviewData.admin_user,
+      format: :csv
+    )
+    export.attachment.attach(
+      io: StringIO.new("id,name,price\n1,Example Product,19.99\n"),
+      filename: 'products-export.csv',
+      content_type: 'text/csv'
+    )
+    export
+  end
+end

data/lib/spree/core/previews/invitation_preview.rb

@@ -0,0 +1,47 @@
+require_relative 'preview_data'
+
+# Preview Spree invitation emails at /rails/mailers/spree/invitation
+class Spree::InvitationPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def invitation_email
+    Spree::InvitationMailer.invitation_email(pending_invitation)
+  end
+
+  def invitation_accepted
+    Spree::InvitationMailer.invitation_accepted(accepted_invitation)
+  end
+
+  private
+
+  def pending_invitation
+    return example_invitation if locale.present?
+
+    Spree::Invitation.pending.last || example_invitation
+  end
+
+  def accepted_invitation
+    return example_invitation(accepted: true) if locale.present?
+
+    Spree::Invitation.accepted.last || example_invitation(accepted: true)
+  end
+
+  # Build an in-memory invitation so the preview works on a database with no
+  # invitations. When the preview toolbar requests a locale, its store carries
+  # that locale. Never saved, so no records are created.
+  def example_invitation(accepted: false)
+    store = Spree::PreviewData.store(locale)
+    admin = Spree::PreviewData.admin_user
+    Spree::Invitation.new(
+      id: 0,
+      email: 'invitee@example.com',
+      resource: store,
+      inviter: admin,
+      invitee: accepted ? admin : nil,
+      role: Spree::Role.first || Spree::Role.new(name: 'admin'),
+      token: 'preview-token',
+      status: accepted ? 'accepted' : 'pending',
+      expires_at: 7.days.from_now
+    )
+  end
+end

data/lib/spree/core/previews/preview_data.rb

@@ -0,0 +1,52 @@
+# Shared helpers for ActionMailer previews. Everything here is in-memory (never
+# saved) so opening a mailer preview stays read-only.
+module Spree
+  module PreviewData
+    # Include in ActionMailer::Preview subclasses to read the preview toolbar's
+    # locale dropdown (`?locale=`). The toolbar sends uppercase codes ("DE"),
+    # Spree locales are lowercase.
+    module LocaleParam
+      private
+
+      def locale
+        @params[:locale]&.downcase
+      end
+    end
+
+    module_function
+
+    # An admin user for previews that need `user.email` / `user.first_name`.
+    # Falls back to an unsaved instance when the database has no admin users.
+    def admin_user
+      Spree.admin_user_class.first ||
+        Spree.admin_user_class.new(email: 'admin@example.com', first_name: 'Alex', last_name: 'Doe')
+    end
+
+    # A customer for previews of customer-facing account emails. Falls back to
+    # an unsaved instance when the database has no users.
+    def customer
+      Spree.user_class.first ||
+        Spree.user_class.new(email: 'customer@example.com').tap do |user|
+          user.first_name = 'Alex' if user.respond_to?(:first_name=)
+        end
+    end
+
+    # The store previews render for. When the preview toolbar's locale dropdown
+    # sets `?locale=`, return an unsaved copy of the default store with that
+    # `default_locale`, so mailers that render in `store.default_locale` honour
+    # the toggle without mutating the real store.
+    #
+    # @param locale [String, Symbol, nil] the `?locale=` param
+    # @return [Spree::Store]
+    def store(locale = nil)
+      store = Spree::Store.default
+      return store if locale.blank? || store.nil?
+
+      dup = store.dup
+      dup.id = store.id # keep prefixed-id / URL helpers working
+      dup.default_locale = locale.to_s.downcase
+      dup.readonly!
+      dup
+    end
+  end
+end

data/lib/spree/core/previews/report_preview.rb

@@ -0,0 +1,40 @@
+require_relative 'preview_data'
+
+# Preview Spree report emails at /rails/mailers/spree/report
+class Spree::ReportPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def report_done
+    Spree::ReportMailer.report_done(report)
+  end
+
+  private
+
+  # Reuse the most recent report, or build an in-memory example so the preview
+  # works on a database that has never run a report. When the preview toolbar
+  # requests a locale, always use the example so its store carries that locale.
+  # The example is never saved, so no `report.created` side effects fire.
+  def report
+    return example_report if locale.present?
+
+    Spree::Report.last || example_report
+  end
+
+  def example_report
+    store = Spree::PreviewData.store(locale)
+    report = Spree::Reports::SalesTotal.new(
+      id: 0,
+      store: store,
+      user: Spree::PreviewData.admin_user,
+      date_from: 30.days.ago.to_date,
+      date_to: Date.current,
+      currency: store.default_currency
+    )
+    report.attachment.attach(
+      io: StringIO.new("date,total\n2026-01-01,1234.56\n"),
+      filename: 'sales-total.csv',
+      content_type: 'text/csv'
+    )
+    report
+  end
+end

data/lib/spree/core/previews/webhook_preview.rb

@@ -0,0 +1,34 @@
+require_relative 'preview_data'
+
+# Preview Spree webhook notification emails at /rails/mailers/spree/webhook
+class Spree::WebhookPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def endpoint_disabled
+    Spree::WebhookMailer.endpoint_disabled(webhook_endpoint)
+  end
+
+  private
+
+  # Reuse the most recent endpoint, or build an in-memory disabled example so the
+  # preview works on a database with no webhook endpoints. When the preview
+  # toolbar requests a locale, always use the example so its store carries that
+  # locale. Never saved, so the admin webhook list stays clean.
+  def webhook_endpoint
+    return example_endpoint if locale.present?
+
+    Spree::WebhookEndpoint.last || example_endpoint
+  end
+
+  def example_endpoint
+    Spree::WebhookEndpoint.new(
+      store: Spree::PreviewData.store(locale),
+      name: 'Example endpoint',
+      url: 'https://example.com/webhooks/spree',
+      active: false,
+      disabled_reason: 'Too many failed delivery attempts',
+      disabled_at: Time.current,
+      subscriptions: ['order.completed']
+    )
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.5.3'.freeze
+  VERSION = '5.6.0.rc1'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -165,7 +165,19 @@ module Spree
   end
 
   def self.use_translations?
-    Spree::Config.always_use_translations || I18n.default_locale != I18n.locale
+    Spree::Config.always_use_translations || Spree::Current.content_locale != I18n.locale.name
+  end
+
+  # Mobility +column_fallback+ option shared by every translatable model:
+  # read, write and query the base (untranslated) column when the target
+  # locale is the request's content locale — see Spree::Current#content_locale.
+  # Evaluated on every translated attribute read, so it must stay
+  # allocation-free and must not touch the database (Symbol#name returns the
+  # frozen interned string; Mobility always passes Symbol locales).
+  def self.mobility_column_fallback
+    return false if always_use_translations?
+
+    ->(locale) { locale.name == Spree::Current.content_locale }
   end
 
   # Used to configure Spree.
@@ -321,6 +333,14 @@ module Spree
     Rails.application.config.spree.reports = value
   end
 
+  # Registry of the Getting Started onboarding tasks shown on the admin
+  # dashboard. See {Spree::SetupTasks} for the extension API.
+  #
+  # @return [Spree::SetupTasks]
+  def self.store_setup_tasks
+    @store_setup_tasks ||= Spree::SetupTasks.new
+  end
+
   def self.translatable_resources
     Rails.application.config.spree.translatable_resources
   end
@@ -493,6 +513,7 @@ require 'spree/core/engine'
 
 require 'spree/i18n'
 require 'spree/localized_number'
+require 'spree/translations'
 require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'

data/lib/spree/permitted_attributes.rb

@@ -198,7 +198,7 @@ module Spree
     ]
 
     @@promotion_attributes = [:name, :description, :starts_at, :expires_at, :code, :usage_limit, :path, :match_policy,
-                              :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes, store_ids: []]
+                              :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes]
 
     @@promotion_rule_attributes = [:type, :preferred_match_policy, preferred_eligible_values: [], user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
 
@@ -240,7 +240,8 @@ module Spree
 
     @@shipping_category_attributes = [:name]
 
-    @@channel_attributes = [:name, :code, :active, :default, :preferred_order_routing_strategy]
+    @@channel_attributes = [:name, :code, :active, :default, :preferred_order_routing_strategy,
+                            :preferred_storefront_access, :preferred_guest_checkout]
 
     @@shipping_method_attributes = [:name, :admin_name, :code, :tracking_url, :tax_category_id, :display_on,
                                     :estimated_transit_business_days_min, :estimated_transit_business_days_max,
@@ -278,7 +279,7 @@ module Spree
                           :preferred_limit_digital_download_count, :preferred_limit_digital_download_days,
                           :preferred_digital_asset_link_expire_time,
                           :logo, :mailer_logo,
-                          :preferred_guest_checkout]
+                          :preferred_guest_checkout, :preferred_storefront_access]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
@@ -307,7 +308,7 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,
-      :position, :track_inventory, :tax_category_id,
+      :position, :track_inventory, :preorderable, :preorder_ships_at, :backorder_limit, :tax_category_id,
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,

data/lib/spree/testing_support/factories/export_factory.rb

@@ -16,5 +16,9 @@ FactoryBot.define do
     factory :customer_export, class: 'Spree::Exports::Customers', parent: :export do
       type { 'Spree::Exports::Customers' }
     end
+
+    factory :coupon_code_export, class: 'Spree::Exports::CouponCodes', parent: :export do
+      type { 'Spree::Exports::CouponCodes' }
+    end
   end
 end

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -2,15 +2,7 @@ FactoryBot.define do
   factory :payment_method, class: Spree::PaymentMethod do
     type { 'Spree::PaymentMethod' }
     name { 'Test' }
-
-    before(:create) do |payment_method|
-      if payment_method.stores.empty?
-        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
-        store = default_store || create(:store)
-
-        payment_method.stores << store
-      end
-    end
+    store { Spree::Store.find_by(default: true) || association(:store) }
   end
 
   factory :check_payment_method, parent: :payment_method, class: Spree::PaymentMethod::Check do