Remove deprecated factories usage

Ref #3907

core/lib/spree/testing_support.rb

@@ -5,27 +5,7 @@
 module Spree
   module TestingSupport
     autoload :FactoryBot, "spree/testing_support/factory_bot"
-
     autoload :SEQUENCES, "spree/testing_support/factory_bot"
     autoload :FACTORIES, "spree/testing_support/factory_bot"
-
-    def factory_bot_paths
-      Spree::TestingSupport::FactoryBot.definition_file_paths
-    end
-
-    def check_factory_bot_version
-      Spree::TestingSupport::FactoryBot.check_version
-    end
-
-    def load_all_factories
-      Spree::TestingSupport::FactoryBot.add_paths_and_load!
-    end
-
-    deprecate(
-      factory_bot_paths: "Spree::TestingSupport::FactoryBot.definition_file_paths",
-      check_factory_bot_version: "Spree::TestingSupport::FactoryBot.check_version",
-      load_all_factories: "Spree::TestingSupport::FactoryBot.add_paths_and_load!",
-      deprecator: Spree::Deprecation
-    )
   end
 end

core/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

core/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

core/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}" }

core/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 }

core/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

core/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

core/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 }

core/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)

core/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 }

core/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

core/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 }

core/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}" }

core/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}" }

core/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

core/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

core/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)

core/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' }

core/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

core/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)}" }

core/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

core/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

core/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' }

core/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

core/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' }

core/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' }

core/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}" }