solidus_core 2.10.5 → 3.0.8

data/lib/spree/testing_support/dummy_app.rb

@@ -7,19 +7,17 @@ require 'rails'
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'active_storage/engine'
 
 Rails.env = 'test'
 
 require 'solidus_core'
 
-RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
-RAILS_6_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('6.0')
+RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
-  unless RAILS_52_OR_ABOVE
-    protect_from_forgery with: :exception
-  end
+  protect_from_forgery with: :exception
 end
 
 # @private
@@ -48,25 +46,39 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.eager_load                                 = false
-    config.cache_classes                              = true
-    config.cache_store                                = :memory_store
-    config.serve_static_assets                        = true
-    config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
-    config.whiny_nils                                 = true
-    config.consider_all_requests_local                = true
-    config.action_controller.allow_forgery_protection = true
-    config.action_controller.perform_caching          = false
-    config.action_dispatch.show_exceptions            = false
-    config.active_support.deprecation                 = :stderr
-    config.action_mailer.delivery_method              = :test
-    config.active_support.deprecation                 = :stderr
-    config.secret_key_base                            = 'SECRET_TOKEN'
-
-    if RAILS_52_OR_ABOVE
-      config.action_controller.default_protect_from_forgery = true
-      unless RAILS_6_OR_ABOVE
-        config.active_record.sqlite3.represent_boolean_as_integer = true
+    config.has_many_inverse = true
+    config.eager_load = false
+    config.cache_classes = true
+    config.cache_store = :memory_store
+    config.serve_static_assets = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+    config.whiny_nils = true
+    config.consider_all_requests_local = true
+    config.action_controller.allow_forgery_protection = false
+    config.action_controller.default_protect_from_forgery = false
+    config.action_controller.perform_caching = false
+    config.action_dispatch.show_exceptions = false
+    config.active_support.deprecation = :stderr
+    config.action_mailer.delivery_method = :test
+    config.active_support.deprecation = :stderr
+    config.secret_key_base = 'SECRET_TOKEN'
+
+    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    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.storage_path = Rails.root.join('tmp', 'storage')
+
+    unless ENV['DISABLE_ACTIVE_STORAGE']
+      initializer 'solidus.active_storage' do
+        config.active_storage.service_configurations = {
+          test: {
+            service: 'Disk',
+            root: config.storage_path
+          }
+        }
+        config.active_storage.service = :test
+        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :mini_magick).to_sym
       end
     end
 
@@ -108,6 +120,11 @@ end
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
   config.mails_from = "store@example.com"
+
+  if ENV['DISABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
+  end
 end
 
 # Raise on deprecation warnings

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

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/state_factory'
-require 'spree/testing_support/factories/country_factory'
+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
@@ -11,8 +15,7 @@ FactoryBot.define do
       state_code { 'AL' }
     end
 
-    firstname { 'John' }
-    lastname { nil }
+    name { 'John Von Doe' }
     company { 'Company' }
     address1 { '10 Lovely Street' }
     address2 { 'Northwest' }

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

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-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'
+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

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

@@ -1,5 +1,10 @@
 # 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,5 +1,10 @@
 # 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,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/shipment_factory'
-require 'spree/testing_support/factories/inventory_unit_factory'
+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

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

@@ -1,5 +1,10 @@
 # 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,5 +1,10 @@
 # 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,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_location_factory'
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/return_item_factory'
+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

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

@@ -1,7 +1,12 @@
 # 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 { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') }
+    attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
   end
 end

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

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
-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'
+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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/product_factory'
+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

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

@@ -1,5 +1,13 @@
 # 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,5 +1,10 @@
 # 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,11 +1,16 @@
 # frozen_string_literal: true
 
-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'
+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
@@ -25,7 +30,6 @@ FactoryBot.define do
       after(:build) do |order, evaluator|
         order.line_items << build(
           :line_item,
-          order: order,
           price: evaluator.line_items_price
         )
       end

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/promotion_factory'
+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

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

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
-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'
+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

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

@@ -1,5 +1,10 @@
 # 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,6 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/variant_factory'
+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

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

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-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'
+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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/option_type_factory'
+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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/property_factory'
+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

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

@@ -1,5 +1,10 @@
 # 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,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/promotion_factory'
+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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/promotion_code_factory'
-require 'spree/testing_support/factories/variant_factory'
+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
@@ -16,6 +21,12 @@ FactoryBot.define do
       end
     end
 
+    trait :with_action do
+      after(:create) do |promotion, _evaluator|
+        promotion.actions << Spree::Promotion::Actions::CreateAdjustment.new
+      end
+    end
+
     trait :with_line_item_adjustment do
       transient do
         adjustment_rate { 10 }

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

@@ -1,5 +1,10 @@
 # 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,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/payment_factory'
-require 'spree/testing_support/factories/refund_reason_factory'
+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,5 +1,10 @@
 # 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,6 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/customer_return_factory'
+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
@@ -15,7 +20,7 @@ FactoryBot.define do
       if reimbursement.return_items.empty?
         reimbursement.return_items = reimbursement.customer_return.return_items
       end
-      reimbursement.total = reimbursement.return_items.map { |ri| ri.amount }.sum
+      reimbursement.total = reimbursement.return_items.sum(&:amount)
     end
   end
 end

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

@@ -1,5 +1,10 @@
 # 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,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/stock_location_factory'
-require 'spree/testing_support/factories/return_reason_factory'
+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

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/inventory_unit_factory'
-require 'spree/testing_support/factories/return_reason_factory'
-require 'spree/testing_support/factories/return_authorization_factory'
+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
-    skip_customer_return_processing { true }
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_reason, factory: :return_reason)
     return_authorization do |_return_item|

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

@@ -1,5 +1,10 @@
 # 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,5 +1,10 @@
 # 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}" }