solidus_core 4.7.2 → 4.8.0

data/app/models/spree/product_option_type.rb

@@ -5,5 +5,7 @@ module Spree
     belongs_to :product, class_name: "Spree::Product", inverse_of: :product_option_types, touch: true
     belongs_to :option_type, class_name: "Spree::OptionType", inverse_of: :product_option_types
     acts_as_list scope: :product
+
+    delegate :name, :presentation, :option_values, to: :option_type
   end
 end

data/app/models/spree/refund.rb

@@ -15,6 +15,7 @@ module Spree
     validates :amount, presence: true, numericality: {greater_than: 0}
 
     validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create
+    validate :payment_is_in_refundable_state, on: :create
 
     attr_reader :perform_response
 
@@ -91,6 +92,22 @@ module Spree
       end
     end
 
+    def payment_is_in_refundable_state
+      return if payment.nil? || Spree::Config.refundable_payment_states.include?(payment.state)
+
+      if Spree::Config.require_refundable_payment_state
+        errors.add(:payment, :not_refundable)
+      else
+        Spree.deprecator.warn(
+          "Creating a refund for a payment in the '#{payment.state}' state is deprecated " \
+          "and will become a validation error in Solidus 5.0. Refunds should only be created " \
+          "for payments in one of these states: #{Spree::Config.refundable_payment_states.join(", ")}. " \
+          "Set `Spree::Config.require_refundable_payment_state = true` to adopt the new " \
+          "behavior early."
+        )
+      end
+    end
+
     def update_order
       payment.order.recalculate
     end

data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb

@@ -5,7 +5,7 @@ module Spree
     module EligibilityValidator
       class TimeSincePurchase < Spree::ReturnItem::EligibilityValidator::BaseValidator
         def eligible_for_return?
-          if (@return_item.inventory_unit.order.completed_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.current
+          if (@return_item.inventory_unit.order.completed_at + Spree::Config.return_eligibility_number_of_days.days) > Time.current
             true
           else
             add_error(:number_of_days, I18n.t("spree.return_item_time_period_ineligible"))

data/app/models/spree/return_item.rb

@@ -180,7 +180,7 @@ module Spree
     end
 
     def currency
-      return_authorization.try(:currency) || Spree::Config[:currency]
+      return_authorization.try(:currency) || Spree::Config.currency
     end
 
     private

data/app/models/spree/shipment.rb

@@ -55,7 +55,7 @@ module Spree
     def can_transition_from_pending_to_ready?
       order.can_ship? &&
         inventory_units.all? { |iu| iu.shipped? || iu.allow_ship? || iu.canceled? } &&
-        (order.paid? || !Spree::Config[:require_payment_to_ship])
+        (order.paid? || !Spree::Config.require_payment_to_ship)
     end
 
     def can_transition_from_canceled_to_ready?
@@ -83,7 +83,7 @@ module Spree
     end
 
     def currency
-      order ? order.currency : Spree::Config[:currency]
+      order ? order.currency : Spree::Config.currency
     end
 
     # @return [BigDecimal] the amount of this shipment, taking into
@@ -229,6 +229,8 @@ module Spree
       self.state =
         if shipped?
           "shipped"
+        elsif inventory_units.none?
+          "pending"
         elsif order.canceled? || inventory_units.all?(&:canceled?)
           "canceled"
         elsif !order.can_ship?
@@ -267,7 +269,7 @@ module Spree
     def to_package
       package = Stock::Package.new(stock_location)
       package.shipment = self
-      inventory_units.includes(variant: :product).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
+      inventory_units.not_canceled.includes(variant: :product).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
         package.add_multiple state_inventory_units, state.to_sym
       end
       package

data/app/models/spree/stock/inventory_unit_builder.rb

@@ -8,6 +8,7 @@ module Spree
       end
 
       def units
+        ActiveRecord::Associations::Preloader.new(records: @order.line_items, associations: {variant: :product}).call
         @order.line_items.flat_map do |line_item|
           build_units(line_item, line_item.quantity)
         end

data/app/models/spree/stock/simple_coordinator.rb

@@ -12,7 +12,7 @@ module Spree
     #   * Combine allocated and on hand inventory into a single shipment per-location
     #
     # Allocation logic can be changed using a custom class (as
-    # configured in Spree::Config::stock_allocator_class )
+    # configured in Spree::Config.stock.allocator_class)
     #
     # After allocation, splitters are run on each Package (as configured in
     # Spree::Config.environment.stock_splitters)
@@ -27,7 +27,14 @@ module Spree
         :filtered_stock_locations, :inventory_units_by_variant, :desired,
         :availability, :allocator, :packages
 
-      def initialize(order, inventory_units = nil)
+      def initialize(order, inventory_units_deprecated = nil, inventory_units: nil)
+        if inventory_units_deprecated
+          Spree.deprecator.warn "Using the `inventory_units` positional " \
+            "argument is deprecated in favor of using the keyword argument. "
+
+          inventory_units ||= inventory_units_deprecated
+        end
+
         @order = order
         @inventory_units =
           inventory_units || Spree::Config.stock.inventory_unit_builder_class.new(order).units

data/app/models/spree/store.rb

@@ -17,6 +17,8 @@ module Spree
 
     has_many :orders, class_name: "Spree::Order"
 
+    belongs_to :address, class_name: "Spree::Address", optional: true, validate: true
+
     validates :code, presence: true, uniqueness: {allow_blank: true, case_sensitive: true}
     validates :name, presence: true
     validates :url, presence: true
@@ -25,7 +27,7 @@ module Spree
     self.allowed_ransackable_attributes = %w[name url code]
 
     before_save :ensure_default_exists_and_is_unique
-    before_destroy :validate_not_default
+    before_destroy :validate_not_default, prepend: true
 
     enum :reverse_charge_status, {
       disabled: 0,
@@ -51,6 +53,10 @@ module Spree
       end
     end
 
+    def address_attributes=(attributes)
+      self.address = Spree::Address.immutable_merge(address, attributes)
+    end
+
     def self.default
       where(default: true).first || new
     end
@@ -73,6 +79,7 @@ module Spree
     def validate_not_default
       if default
         errors.add(:base, :cannot_destroy_default_store)
+        throw :abort
       end
     end
   end

data/app/models/spree/store_credit.rb

@@ -209,7 +209,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   def create_credit_record(amount, action_attributes = {})
     # Setting credit_to_new_allocation to true will create a new allocation anytime #credit is called
     # If it is not set, it will update the store credit's amount in place
-    credit = if Spree::Config[:credit_to_new_allocation]
+    credit = if Spree::Config.credit_to_new_allocation
       Spree::StoreCredit.new(create_credit_record_params(amount))
     else
       self.amount_used = amount_used - amount

data/app/models/spree/tax_calculator/default.rb

@@ -23,6 +23,8 @@ module Spree
       #
       # @return [Spree::Tax::OrderTax] the calculated taxes for the order
       def calculate
+        ActiveRecord::Associations::Preloader.new(records: order.line_items, associations: {variant: :product}).call
+
         Spree::Tax::OrderTax.new(
           order_id: order.id,
           order_taxes: order_rates,

data/app/models/spree/variant/pricing_options.rb

@@ -54,7 +54,7 @@ module Spree
       # @return [Spree::Variant::PricingOptions] pricing options for pricing a line item
       def self.from_context(context)
         new(
-          currency: context.current_store.try!(:default_currency).presence || Spree::Config[:currency],
+          currency: context.current_store.try!(:default_currency).presence || Spree::Config.currency,
           country_iso: context.current_store.try!(:cart_tax_country_iso).presence
         )
       end

data/app/models/spree/variant.rb

@@ -400,17 +400,17 @@ module Spree
 
     # Ensures a new variant takes the product master price when price is not supplied
     def set_price
-      self.price = product.master.price if price.nil? && Spree::Config[:require_master_price] && !is_master?
+      self.price = product.master.price if price.nil? && Spree::Config.require_master_price && !is_master?
     end
 
     def check_price
-      if price.nil? && Spree::Config[:require_master_price] && is_master?
+      if price.nil? && Spree::Config.require_master_price && is_master?
         errors.add :price, "Must supply price for variant or master.price for product."
       end
     end
 
     def set_cost_currency
-      self.cost_currency = Spree::Config[:currency] if cost_currency.blank?
+      self.cost_currency = Spree::Config.currency if cost_currency.blank?
     end
 
     def create_stock_items

data/config/locales/en.yml

@@ -158,6 +158,9 @@ en:
         display_on: Display
         name: Name
         preference_source: Preference Source
+        preferred_server: Server
+        preferred_test_mode: Test Mode
+        store_ids: Stores
         type: Type
       spree/price:
         amount: Price
@@ -191,6 +194,7 @@ en:
         sku: Master SKU
         slug: Slug
         tax_category: Tax Category
+        taxon_ids: Categories
         weight: Weight
         width: Width
       spree/product_property:
@@ -395,12 +399,15 @@ en:
         tax_code: Tax Code
       spree/tax_rate:
         amount: Rate
+        calculator_type: Calculator
         expires_at: Expiration Date
         included_in_price: Included in Price
+        level: Tax Rate Level
         name: Name
         show_rate_in_label: Show Rate in Label
         starts_at: Start Date
         tax_categories: Tax Categories
+        tax_category_ids: Tax Categories
       spree/taxon:
         description: Description
         icon: Icon
@@ -408,6 +415,7 @@ en:
         meta_keywords: Meta Keywords
         meta_title: Meta Title
         name: Name
+        parent_id: Parent Category
         permalink: Permalink
         position: Position
       spree/taxonomy:
@@ -495,6 +503,8 @@ en:
           attributes:
             amount:
               greater_than_allowed: is greater than the allowed amount.
+            payment:
+              not_refundable: cannot be refunded in its current state.
         spree/reimbursement:
           attributes:
             base:
@@ -1130,6 +1140,7 @@ en:
     choose_currency: Choose Currency
     choose_dashboard_locale: Choose Dashboard Locale
     choose_dashboard_theme: Choose Dashboard Theme
+    choose_dashboard_timezone: Choose Dashboard Timezone
     choose_location: Choose Location
     choose_reason: Choose Reason
     city: City
@@ -1942,6 +1953,7 @@ en:
     payment_could_not_be_created: Payment could not be created.
     payment_identifier: Payment Identifier
     payment_information: Payment Information
+    payment_is_not_refundable: This payment cannot be refunded in its current state.
     payment_method: Payment Method
     payment_method_not_supported: That payment method is unsupported. Please choose another one.
     payment_method_settings_warning: If you are changing the payment method type, you must save first before you can edit the payment method settings
@@ -2093,6 +2105,7 @@ en:
     return_items: Return Items
     return_items_cannot_be_associated_with_multiple_orders: Return items cannot be associated with multiple orders.
     return_items_cannot_be_created_for_inventory_units_that_are_already_awaiting_exchange: Return items cannot be created for inventory units that are already awaiting exchange.
+    return_items_must_have_shipped_inventory_units: Return items can only be created for shipped inventory units.
     return_number: Return Number
     return_quantity: Return Quantity
     return_reasons: Return Reasons

data/db/default/spree/states.rb

@@ -13,7 +13,7 @@ ActiveRecord::Base.transaction do
     carmen_country = Carmen::Country.coded(country.iso)
     next unless carmen_country.subregions?
 
-    if Spree::Config[:countries_that_use_nested_subregions].include? country.iso
+    if Spree::Config.countries_that_use_nested_subregions.include? country.iso
       create_states(carmen_country.subregions.flat_map(&:subregions), country)
     else
       create_states(carmen_country.subregions, country)

data/db/migrate/20260924120000_add_address_to_spree_stores.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddAddressToSpreeStores < ActiveRecord::Migration[7.0]
+  def change
+    change_table :spree_stores do |t|
+      t.references :address, type: :integer, foreign_key: {to_table: :spree_addresses}
+    end
+  end
+end

data/lib/generators/solidus/install/app_templates/authentication/existing.rb

@@ -4,9 +4,7 @@ begin
   user_class.classify.constantize
 rescue NameError
   say_status :error, "Can't find an existing user class named #{user_class.classify}, plese set up one before using this authentication option.", :red
-  # rubocop:disable Rails/Exit
   abort
-  # rubocop:enable Rails/Exit
 end
 
 generate "spree:custom_user #{user_class.shellescape}"

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1,19 @@
-apply "https://github.com/solidusio/solidus_starter_frontend/raw/v4.7/template.rb"
+# frozen_string_literal: true
+
+template =
+  ENV["SOLIDUS_STOREFRONT_TEMPLATE"] ||
+  begin
+    version = Spree.solidus_version if defined?(Spree) && Spree.respond_to?(:solidus_version)
+    gem_version = version ? Gem::Version.new(version) : nil
+
+    ref =
+      if gem_version && !gem_version.prerelease?
+        "v#{gem_version.segments[0, 2].join(".")}"
+      else
+        "main"
+      end
+
+    "https://github.com/solidusio/solidus/raw/#{ref}/storefront/template.rb"
+  end
+
+apply template

data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb

@@ -1,5 +1,6 @@
 unless Bundler.locked_gems.dependencies["solidus_paypal_commerce_platform"]
-  bundle_command "add solidus_paypal_commerce_platform --version='~> 1.0'"
+  # The released gem uses the old enum syntax and breaks on recent Ruby/Rails, so install from GitHub.
+  bundle_command "add solidus_paypal_commerce_platform --github solidusio/solidus_paypal_commerce_platform"
 end
 
 generate "solidus_paypal_commerce_platform:install --migrate=#{options[:migrate]}"

data/lib/generators/solidus/install/install_generator.rb

@@ -126,7 +126,7 @@ module Solidus
     def install_file_attachment
       if options[:active_storage]
         say_status :assets, "Active Storage", :green
-        rake "active_storage:install"
+        rake "active_storage:install", abort_on_failure: true
       else
         say_status :assets, "Paperclip", :green
         gsub_file "config/initializers/spree.rb", "::ActiveStorageAttachment", "::PaperclipAttachment"
@@ -158,19 +158,19 @@ module Solidus
 
     def install_migrations
       say_status :copying, "migrations"
-      rake "railties:install:migrations"
+      rake "railties:install:migrations", abort_on_failure: true
     end
 
     def create_database
       say_status :creating, "database"
-      rake "db:create"
+      rake "db:create", abort_on_failure: true
     end
 
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
 
-        rake "db:migrate"
+        rake "db:migrate", abort_on_failure: true
       else
         say_status :skipping, "migrations (don't forget to run rake db:migrate)"
       end
@@ -178,8 +178,8 @@ module Solidus
 
     def install_subcomponents
       apply_template_for :authentication, @selected_authentication
-      apply_template_for :frontend, @selected_frontend
       apply_template_for :payment_method, @selected_payment_method
+      apply_template_for :frontend, @selected_frontend
     end
 
     def install_solidus_admin
@@ -200,7 +200,7 @@ module Solidus
         rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
         rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
 
-        rake("db:seed #{rake_options.join(" ")}")
+        rake("db:seed #{rake_options.join(" ")}", abort_on_failure: true)
       else
         say_status :skipping, "seed data (you can always run rake db:seed)"
       end
@@ -209,7 +209,7 @@ module Solidus
     def load_sample_data
       if @load_sample_data
         say_status :loading, "sample data"
-        rake "spree_sample:load"
+        rake "spree_sample:load", abort_on_failure: true
       else
         say_status :skipping, "sample data (you can always run rake spree_sample:load)"
       end

data/lib/spree/app_configuration.rb

@@ -70,11 +70,25 @@ module Spree
 
     # @!attribute [rw] allow_return_item_amount_editing
     #   @return [Boolean] Determines whether an admin is allowed to change a return item's pre-calculated amount (default: +false+)
+    #   @deprecated Unused since a6755a7f0f; remove it from your initializer.
     preference :allow_return_item_amount_editing, :boolean, default: false
+    msg = "`Spree::Config.allow_return_item_amount_editing` has had no effect since commit a6755a7f0f; remove it from your initializer."
+    deprecate(
+      allow_return_item_amount_editing: msg,
+      "allow_return_item_amount_editing=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] alternative_billing_phone
     #   @return [Boolean] Request an extra phone number for bill address (default: +false+)
+    #   @deprecated Unused since c40d4cbeef; remove it from your initializer.
     preference :alternative_billing_phone, :boolean, default: false
+    msg = "`Spree::Config.alternative_billing_phone` has had no effect since commit c40d4cbeef; remove it from your initializer."
+    deprecate(
+      alternative_billing_phone: msg,
+      "alternative_billing_phone=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] alternative_shipping_phone
     #   @return [Boolean] Request an extra phone number for shipping address (default: +false+)
@@ -94,7 +108,14 @@ module Spree
 
     # @!attribute [rw] auto_capture_exchanges
     #   @return [Boolean] Automatically capture the credit card (as opposed to just authorize and capture later) (default: +false+)
+    #   @deprecated Unused since ca63667027; remove it from your initializer.
     preference :auto_capture_exchanges, :boolean, default: false
+    msg = "`Spree::Config.auto_capture_exchanges` has had no effect since commit ca63667027; remove it from your initializer."
+    deprecate(
+      auto_capture_exchanges: msg,
+      "auto_capture_exchanges=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] automatic_default_address
     #   The default value of true preserves existing backwards compatible feature of
@@ -142,7 +163,14 @@ module Spree
 
     # @!attribute [rw] customer_returns_per_page
     #   @return [Integer] Customer returns to show per-page in the admin (default: +15+)
+    #   @deprecated Unused since 834a24a695; remove it from your initializer.
     preference :customer_returns_per_page, :integer, default: 15
+    msg = "`Spree::Config.customer_returns_per_page` has had no effect since commit 834a24a695; remove it from your initializer."
+    deprecate(
+      customer_returns_per_page: msg,
+      "customer_returns_per_page=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] default_country_iso
     #   Default customer country ISO code
@@ -207,7 +235,14 @@ module Spree
 
     # @!attribute [rw] order_capturing_time_window
     #   @return [Integer] the number of days to look back for fully-shipped/cancelled orders in order to charge for them
+    #   @deprecated Unused since 9c5107fcae; remove it from your initializer.
     preference :order_capturing_time_window, :integer, default: 14
+    msg = "`Spree::Config.order_capturing_time_window` has had no effect since commit 9c5107fcae; remove it from your initializer."
+    deprecate(
+      order_capturing_time_window: msg,
+      "order_capturing_time_window=": msg,
+      deprecator: Spree.deprecator
+    )
 
     # @!attribute [rw] order_mutex_max_age
     #   @return [Integer] Max age of {Spree::OrderMutex} in seconds (default: 2 minutes)
@@ -250,10 +285,18 @@ module Spree
     #   @return [Boolean] Whether to recalculate cart prices when recalculating (default: +false+)
     versioned_preference :recalculate_cart_prices, :boolean, initial_value: false, boundaries: {"5.0.0.alpha" => true}
 
+    # @!attribute [rw] refundable_payment_states
+    #   @return [Array<String>] Payment states in which refunds may be created (default: +["completed", "pending"]+)
+    preference :refundable_payment_states, :array, default: %w[completed pending]
+
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
 
+    # @!attribute [rw] require_refundable_payment_state
+    #   @return [Boolean] Whether creating a refund for a payment outside Spree::Config.refundable_payment_states is a validation error rather than a deprecation warning (default: +false+)
+    versioned_preference :require_refundable_payment_state, :boolean, initial_value: false, boundaries: {"5.0.0.alpha" => true}
+
     # @!attribute [rw] require_payment_to_ship
     #   @return [Boolean] Allows shipments to be ready to ship regardless of the order being paid if false (default: +true+)
     preference :require_payment_to_ship, :boolean, default: true # Allows shipments to be ready to ship regardless of the order being paid if false
@@ -354,7 +397,15 @@ module Spree
     #   Spree::Variant::VatPriceGenerator.
     class_name_attribute :variant_vat_prices_generator_class, default: "Spree::Variant::VatPriceGenerator"
 
+    # @!attribute [rw] allocator_class
+    #   @deprecated Never read; use Spree::Config.stock.allocator_class instead.
     class_name_attribute :allocator_class, default: "Spree::Stock::Allocator::OnHandFirst"
+    msg = "`Spree::Config.allocator_class` has never been read; the stock allocator is configured with `Spree::Config.stock.allocator_class`."
+    deprecate(
+      allocator_class: msg,
+      "allocator_class=": msg,
+      deprecator: Spree.deprecator
+    )
 
     class_name_attribute :shipping_rate_sorter_class, default: "Spree::Stock::ShippingRateSorter"
 

data/lib/spree/core/search/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "kaminari/activerecord"
+
 module Spree
   module Core
     module Search
@@ -93,7 +95,7 @@ module Spree
           @properties[:include_images] = params[:include_images]
 
           per_page = params[:per_page].to_i
-          @properties[:per_page] = (per_page > 0) ? per_page : Spree::Config[:products_per_page]
+          @properties[:per_page] = (per_page > 0) ? per_page : Spree::Config.products_per_page
           @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
         end
       end

data/lib/spree/core/version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.7.2"
+  VERSION = "4.8.0"
 
   def self.solidus_version = VERSION
 
   def self.minimum_required_rails_version = "7.2"
 
-  def self.previous_solidus_minor_version = "4.6"
+  def self.previous_solidus_minor_version = "4.7"
 
   def self.solidus_gem_version = Gem::Version.new(solidus_version)
 end

data/lib/spree/core.rb

@@ -16,7 +16,6 @@ require "acts_as_list"
 require "awesome_nested_set"
 require "cancan"
 require "friendly_id"
-require "kaminari/activerecord"
 require "monetize"
 require "paperclip"
 require "ransack"

data/lib/spree/permitted_attributes.rb

@@ -125,7 +125,8 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
       :meta_description, :default_currency,
       :mail_from_address, :cart_tax_country_iso,
-      :bcc_email, :reverse_charge_status]
+      :bcc_email, :reverse_charge_status,
+      address_attributes:]
 
     @@taxonomy_attributes = [:name]
 
@@ -138,7 +139,7 @@ module Spree
     # by changing a user with higher priveleges' email to one a lower-priveleged
     # admin owns. Creating a user with an email is handled separate at the
     # controller level.
-    @@user_attributes = [:password, :password_confirmation, customer_metadata: {}]
+    @@user_attributes = [:password, :password_confirmation, :timezone, customer_metadata: {}]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,

data/lib/spree/testing_support/capybara_ext.rb

@@ -118,16 +118,6 @@ module Spree
         # find the original.
         find("label:not(.select2-offscreen)", text: /#{Regexp.escape(text)}/i, match: :one)
       end
-
-      def dialog(parent: "body", **options)
-        within(parent) do
-          find("dialog", visible: :all, **options)
-        end
-      end
-
-      def turbo_frame_modal
-        dialog(parent: find("turbo-frame", visible: :all))
-      end
     end
   end
 end

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

@@ -22,4 +22,10 @@ FactoryBot.define do
   factory :shipping_no_amount_calculator, class: "Spree::Calculator::Shipping::FlatRate" do
     preferred_amount { 0 }
   end
+
+  factory :flexi_rate_calculator, class: "Spree::Calculator::Shipping::FlexiRate" do
+    preferred_first_item { 10.0 }
+    preferred_additional_item { 5.0 }
+    preferred_max_items { 100 }
+  end
 end

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

@@ -21,7 +21,7 @@ FactoryBot.define do
 
     transient do
       cost { 10.0 }
-      currency { Spree::Config[:currency] }
+      currency { Spree::Config.currency }
     end
 
     before(:create) do |shipping_method, _evaluator|

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

@@ -6,5 +6,9 @@ FactoryBot.define do
     sequence(:name) { |i| "Spree Test Store #{i}" }
     sequence(:url) { |i| "www.example#{i}.com" }
     mail_from_address { "solidus@example.org" }
+
+    trait :with_address do
+      address
+    end
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -18,7 +18,7 @@ module Spree
         # A shipping method must exist for rates to be displayed on checkout page
         ::FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
           sm.calculator.preferred_amount = 10
-          sm.calculator.preferred_currency = Spree::Config[:currency]
+          sm.calculator.preferred_currency = Spree::Config.currency
           sm.calculator.save
         end