solidus_core 3.4.2 → 4.1.0

data/lib/spree/preferences/preferable_class_methods.rb

@@ -29,31 +29,7 @@ module Spree::Preferences
 
       default = begin
                   given = options[:default]
-                  if ancestors.include?(Spree::Preferences::Configuration) &&
-                     given.is_a?(Proc) &&
-                     given.lambda? &&
-                     given.arity.zero?
-                    Spree::Deprecation.warn <<~MSG
-                      The arity of a proc given as the default for a preference
-                      has changed from 0 to 1 on Solidus 3.1. The Solidus
-                      version for the loaded preference defaults is given as the
-                      proc's argument from this point on.
-
-                      If you don't need to return a different default value
-                      depending on the loaded Solidus version, you can change
-                      the proc so that it doesn't have lambda semantics (lambdas
-                      raise when extra arguments are supplied, while raw procs
-                      don't). E.g.:
-
-                      preference :foo, :string, default: proc { true }
-
-                      If you want to branch on the provided Solidus version, you can do like the following:
-
-                      versioned_preference :foo, :string, initial_value: true, boundaries: { "3.2.0" => false }
-
-                    MSG
-                    ->(_default_context) { given.call }
-                  elsif given.is_a?(Proc)
+                  if given.is_a?(Proc)
                     given
                   else
                     proc { given }

data/lib/spree/testing_support/common_rake.rb

@@ -24,7 +24,7 @@ class CommonRakeTasks
         # While the dummy app is generated the current directory
         # within ruby is changed to that of the dummy app.
         sh({
-          'FRONTEND' => ENV['FRONTEND'] || 'classic',
+          'FRONTEND' => ENV['FRONTEND'] || 'none',
         }, [
           'bin/rails',
           'generate',
@@ -40,6 +40,10 @@ class CommonRakeTasks
           "--quiet",
         ].shelljoin)
 
+        if Bundler.locked_gems.dependencies['solidus_frontend']
+          sh "bin/rails g solidus_frontend:install --auto-accept"
+        end
+
         puts "Setting up dummy database..."
 
         sh "bin/rails db:environment:set RAILS_ENV=test"

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -38,14 +38,10 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      if Rails.gem_version >= Gem::Version.new('6.0.0')
-        ActiveRecord::MigrationContext.new(
-          [path],
-          ActiveRecord::SchemaMigration
-        ).migrate
-      else
-        ActiveRecord::MigrationContext.new([path]).migrate
-      end
+      ActiveRecord::MigrationContext.new(
+        [path],
+        ActiveRecord::SchemaMigration
+      ).migrate
     end
 
     ActiveRecord::Base.clear_cache!

data/lib/spree/testing_support/dummy_app.rb

@@ -13,8 +13,6 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
-RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
-
 # @private
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
@@ -86,7 +84,6 @@ module DummyApp
     # Set the preview path within the dummy app:
     config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
 
-    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
     config.active_record.dump_schema_after_migration = false
 
     # Configure active storage to use storage within tmp folder
@@ -99,7 +96,7 @@ module DummyApp
           }
         }
         config.active_storage.service = :test
-        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', Spree::RailsCompatibility.variant_processor).to_sym
+        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :vips).to_sym
       end
     end
 
@@ -122,7 +119,6 @@ module DummyApp
     config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
 
     config.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
-    config.paths['app/views'] = File.expand_path('dummy_app/views', __dir__)
     config.paths['config/routes.rb'] = File.expand_path('dummy_app/routes.rb', __dir__)
 
     ActionMailer::Base.default from: "store@example.com"
@@ -138,8 +134,6 @@ end
 Spree.user_class = 'Spree::LegacyUser'
 Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
-  config.use_legacy_events = (ENV['USE_LEGACY_EVENTS'] == 'true')
-
   if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/state_factory'
-  require 'spree/testing_support/factories/country_factory'
-end
 FactoryBot.define do
   factory :address, class: 'Spree::Address' do
     transient do

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

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/line_item_factory'
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/tax_category_factory'
-  require 'spree/testing_support/factories/tax_rate_factory'
-  require 'spree/testing_support/factories/zone_factory'
-end
-
 FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do
     order

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :adjustment_reason, class: 'Spree::AdjustmentReason' do
     sequence(:name) { |n| "Refund for return ##{n}" }

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
     preferred_amount { 10.0 }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/shipment_factory'
-  require 'spree/testing_support/factories/inventory_unit_factory'
-end
-
 FactoryBot.define do
   factory :carton, class: 'Spree::Carton' do
     address

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 require 'carmen'
 
 FactoryBot.define do

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :credit_card, class: 'Spree::CreditCard' do
     verification_value { 123 }

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

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/stock_location_factory'
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/return_item_factory'
-end
-
 FactoryBot.define do
   factory :customer_return, class: 'Spree::CustomerReturn' do
     association(:stock_location, factory: :stock_location)

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
     attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }

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

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/line_item_factory'
-  require 'spree/testing_support/factories/variant_factory'
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/shipment_factory'
-end
-
 FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/product_factory'
-end
-
 FactoryBot.define do
   factory :line_item, class: 'Spree::LineItem' do
     quantity { 1 }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/product_factory'
-  require 'spree/testing_support/factories/option_type_factory'
-end
-
 FactoryBot.define do
   factory :option_type, class: 'Spree::OptionType' do
     sequence(:name) { |n| "foo-size-#{n}" }

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :option_value, class: 'Spree::OptionValue' do
     sequence(:name) { |n| "Size-#{n}" }

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

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/address_factory'
-  require 'spree/testing_support/factories/shipment_factory'
-  require 'spree/testing_support/factories/store_factory'
-  require 'spree/testing_support/factories/user_factory'
-  require 'spree/testing_support/factories/line_item_factory'
-  require 'spree/testing_support/factories/payment_factory'
-end
-
 FactoryBot.define do
   factory :order, class: 'Spree::Order' do
     user

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/promotion_factory'
-end
-
 FactoryBot.define do
   factory :order_promotion, class: 'Spree::OrderPromotion' do
     association :order

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

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/payment_method_factory'
-  require 'spree/testing_support/factories/credit_card_factory'
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/store_credit_factory'
-end
-
 FactoryBot.define do
   factory :payment, aliases: [:credit_card_payment], class: 'Spree::Payment' do
     association(:payment_method, factory: :credit_card_payment_method)

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :payment_method, aliases: [:credit_card_payment_method], class: 'Spree::PaymentMethod::BogusCreditCard' do
     name { 'Credit Card' }

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/variant_factory'
-end
-
 FactoryBot.define do
   factory :price, class: 'Spree::Price' do
     variant

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

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/sequences'
-  require 'spree/testing_support/factories/shipping_category_factory'
-  require 'spree/testing_support/factories/stock_location_factory'
-  require 'spree/testing_support/factories/tax_category_factory'
-  require 'spree/testing_support/factories/product_option_type_factory'
-end
-
 FactoryBot.define do
   factory :base_product, class: 'Spree::Product' do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/product_factory'
-  require 'spree/testing_support/factories/option_type_factory'
-end
-
 FactoryBot.define do
   factory :product_option_type, class: 'Spree::ProductOptionType' do
     product

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/product_factory'
-  require 'spree/testing_support/factories/property_factory'
-end
-
 FactoryBot.define do
   factory :product_property, class: 'Spree::ProductProperty' do
     product

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :promotion_category, class: 'Spree::PromotionCategory' do
     name { 'Promotion Category' }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/sequences'
-  require 'spree/testing_support/factories/promotion_factory'
-end
-
 FactoryBot.define do
   factory :promotion_code, class: 'Spree::PromotionCode' do
     promotion

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/promotion_code_factory'
-  require 'spree/testing_support/factories/variant_factory'
-end
-
 FactoryBot.define do
   factory :promotion, class: 'Spree::Promotion' do
     name { 'Promo' }

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :property, class: 'Spree::Property' do
     name { 'baseball_cap_color' }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/payment_factory'
-  require 'spree/testing_support/factories/refund_reason_factory'
-end
-
 FactoryBot.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :refund_reason, class: 'Spree::RefundReason' do
     sequence(:name) { |n| "Refund for return ##{n}" }

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/customer_return_factory'
-end
-
 FactoryBot.define do
   factory :reimbursement, class: 'Spree::Reimbursement' do
     transient do

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :reimbursement_type, class: 'Spree::ReimbursementType' do
     sequence(:name) { |n| "Reimbursement Type #{n}" }

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

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/stock_location_factory'
-  require 'spree/testing_support/factories/return_reason_factory'
-end
-
 FactoryBot.define do
   factory :return_authorization, class: 'Spree::ReturnAuthorization' do
     association(:order, factory: :shipped_order)

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

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/inventory_unit_factory'
-  require 'spree/testing_support/factories/return_reason_factory'
-  require 'spree/testing_support/factories/return_authorization_factory'
-end
-
 FactoryBot.define do
   factory :return_item, class: 'Spree::ReturnItem' do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :return_reason, class: 'Spree::ReturnReason' do
     sequence(:name) { |n| "Defect ##{n}" }

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :role, class: 'Spree::Role' do
     sequence(:name) { |n| "Role ##{n}" }

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

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/stock_location_factory'
-  require 'spree/testing_support/factories/shipping_method_factory'
-end
-
-
 FactoryBot.define do
   factory :shipment, class: 'Spree::Shipment' do
     tracking { 'U10000' }

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :shipping_category, class: 'Spree::ShippingCategory' do
     sequence(:name) { |n| "ShippingCategory ##{n}" }

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

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/calculator_factory'
-  require 'spree/testing_support/factories/shipping_category_factory'
-  require 'spree/testing_support/factories/zone_factory'
-end
-
 FactoryBot.define do
   factory(
     :shipping_method,

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/shipping_method_factory'
-  require 'spree/testing_support/factories/shipment_factory'
-end
-
 FactoryBot.define do
   factory :shipping_rate, class: 'Spree::ShippingRate' do
     shipping_method