solidus_core 3.0.0 → 4.5.1

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
@@ -19,7 +7,7 @@ FactoryBot.define do
     ship_address
     completed_at { nil }
     email { user.try(:email) }
-    store
+    association :store, strategy: :create
 
     transient do
       line_items_price { BigDecimal(10) }
@@ -55,35 +43,25 @@ FactoryBot.define do
         evaluator.stock_location # must evaluate before creating line items
 
         evaluator.line_items_attributes.each do |attributes|
-          attributes = { order: order, price: evaluator.line_items_price }.merge(attributes)
+          attributes = { order:, price: evaluator.line_items_price }.merge(attributes).tap do |attrs|
+            tax_category = attributes.delete(:tax_category)
+            if attrs[:variant] && tax_category
+              attrs[:variant].update(tax_category: )
+            elsif tax_category
+              attrs[:variant] = create(:variant, tax_category: )
+            end
+          end
+
           create(:line_item, attributes)
         end
         order.line_items.reload
 
-        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, stock_location: evaluator.stock_location)
+        create(:shipment, order:, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, stock_location: evaluator.stock_location)
         order.shipments.reload
 
         order.recalculate
       end
 
-      factory :completed_order_with_promotion do
-        transient do
-          promotion { nil }
-        end
-
-        after(:create) do |order, evaluator|
-          promotion = evaluator.promotion || create(:promotion, code: "test")
-          promotion_code = promotion.codes.first || create(:promotion_code, promotion: promotion)
-
-          promotion.activate(order: order, promotion_code: promotion_code)
-          order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
-
-          # Complete the order after the promotion has been activated
-          order.update_column(:completed_at, Time.current)
-          order.update_column(:state, "complete")
-        end
-      end
-
       factory :order_ready_to_complete do
         state { 'confirm' }
         payment_state { 'checkout' }
@@ -95,7 +73,7 @@ FactoryBot.define do
         after(:create) do |order, evaluator|
           create(evaluator.payment_type, {
             amount: order.total,
-            order: order,
+            order:,
             state: order.payment_state
           })
 
@@ -104,18 +82,21 @@ FactoryBot.define do
       end
 
       factory :completed_order_with_totals do
+        transient do
+          completed_at { Time.current }
+        end
         state { 'complete' }
 
-        after(:create) do |order|
+        after(:create) do |order, evaluator|
           order.shipments.each do |shipment|
             shipment.inventory_units.update_all state: 'on_hand', pending: false
           end
-          order.update_column(:completed_at, Time.current)
+          order.update_column(:completed_at, evaluator.completed_at)
         end
 
         factory :completed_order_with_pending_payment do
           after(:create) do |order|
-            create(:payment, amount: order.total, order: order, state: 'pending')
+            create(:payment, amount: order.total, order:, state: 'pending')
           end
         end
 
@@ -128,7 +109,7 @@ FactoryBot.define do
           end
 
           after(:create) do |order, evaluator|
-            create(evaluator.payment_type, amount: order.total, order: order, state: 'completed')
+            create(evaluator.payment_type, amount: order.total, order:, state: 'completed')
             order.shipments.each do |shipment|
               shipment.update_column('state', 'ready')
             end

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)}" }
@@ -20,7 +9,10 @@ FactoryBot.define do
     sku { generate(:sku) }
     available_on { 1.year.ago }
     deleted_at { nil }
-    shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
+    shipping_category do |r|
+      Spree::ShippingCategory.first ||
+        r.association(:shipping_category, strategy: :create)
+    end
 
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
@@ -48,7 +40,7 @@ FactoryBot.define do
       end
 
       factory :product_with_option_types do
-        after(:create) { |product| create(:product_option_type, product: product) }
+        after(:create) { |product| create(:product_option_type, product:) }
       end
     end
   end

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/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' }
@@ -25,7 +15,7 @@ FactoryBot.define do
     after(:create) do |shipment, evaluator|
       shipping_method = evaluator.shipping_method || create(:shipping_method, cost: evaluator.cost)
       shipment.shipping_rates.create!(
-        shipping_method: shipping_method,
+        shipping_method:,
         cost: evaluator.cost,
         selected: true
       )

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

data/lib/spree/testing_support/factories/state_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/country_factory'
-end
-
-
 FactoryBot.define do
   factory :state, class: 'Spree::State' do
     transient do
@@ -17,9 +9,15 @@ FactoryBot.define do
       carmen_subregion do
         carmen_country = Carmen::Country.coded(country.iso)
 
-        carmen_country.subregions.coded(state_code) ||
-          carmen_country.subregions.sort_by(&:name).first ||
+        unless carmen_country.subregions?
           fail("Country #{country.iso} has no subregions")
+        end
+
+        carmen_regions = carmen_country.subregions
+        carmen_regions = carmen_regions.flat_map(&:subregions) if carmen_regions.first.subregions?
+        region_collection = Carmen::RegionCollection.new(carmen_regions)
+
+        region_collection.coded(state_code) || region_collection.sort_by(&:name).first
       end
     end
 

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

@@ -1,19 +1,15 @@
 # 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/variant_factory'
-end
-
 FactoryBot.define do
   factory :stock_item, class: 'Spree::StockItem' do
     backorderable { true }
     association :stock_location, factory: :stock_location_without_variant_propagation
     variant
 
-    after(:create) { |object| object.adjust_count_on_hand(10) }
+    transient do
+      on_hand { 10 }
+    end
+
+    after(:create) { |object, evaluator| object.adjust_count_on_hand(evaluator.on_hand) }
   end
 end

data/lib/spree/testing_support/factories/stock_location_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/country_factory'
-  require 'spree/testing_support/factories/state_factory'
-  require 'spree/testing_support/factories/product_factory'
-end
-
 FactoryBot.define do
   factory :stock_location, class: 'Spree::StockLocation' do
     name { 'NY Warehouse' }

data/lib/spree/testing_support/factories/stock_movement_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/stock_item_factory'
-end
-
 FactoryBot.define do
   factory :stock_movement, class: 'Spree::StockMovement' do
     quantity { 1 }

data/lib/spree/testing_support/factories/stock_package_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/inventory_unit_factory'
-  require 'spree/testing_support/factories/variant_factory'
-end
-
 FactoryBot.define do
   factory :stock_package, class: 'Spree::Stock::Package' do
     skip_create
@@ -22,7 +14,7 @@ FactoryBot.define do
 
     after(:build) do |package, evaluator|
       evaluator.variants_contents.each do |variant, count|
-        package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
+        package.add_multiple build_list(:inventory_unit, count, variant:, stock_location: evaluator.stock_location)
       end
     end
 

data/lib/spree/testing_support/factories/store_credit_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 :store_credit_category, class: 'Spree::StoreCreditCategory' do
     name { "Exchange" }

data/lib/spree/testing_support/factories/store_credit_event_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/store_credit_factory'
-  require 'spree/testing_support/factories/store_credit_reason_factory'
-end
-
 FactoryBot.define do
   factory :store_credit_event, class: 'Spree::StoreCreditEvent' do
     store_credit

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

@@ -1,21 +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
-
-  require 'spree/testing_support/factories/store_credit_category_factory'
-  require 'spree/testing_support/factories/store_credit_type_factory'
-  require 'spree/testing_support/factories/user_factory'
-end
-
 FactoryBot.define do
   factory :store_credit, class: 'Spree::StoreCredit' do
-    user
-    association :created_by, factory: :user
-    association :category, factory: :store_credit_category
+    association :user, strategy: :create
+    association :created_by, factory: :user, strategy: :create
+    association :category, factory: :store_credit_category, strategy: :create
     amount { 150.00 }
     currency { "USD" }
-    association :credit_type, factory: :primary_credit_type
+    association :credit_type, factory: :primary_credit_type, strategy: :create
   end
 end

data/lib/spree/testing_support/factories/store_credit_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 :store_credit_reason, class: 'Spree::StoreCreditReason' do
     sequence :name do |n|

data/lib/spree/testing_support/factories/store_credit_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 :primary_credit_type, class: 'Spree::StoreCreditType' do
     name      { Spree::StoreCreditType::DEFAULT_TYPE_NAME }

data/lib/spree/testing_support/factories/store_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 :store, class: 'Spree::Store' do
     sequence(:code) { |i| "spree_#{i}" }

data/lib/spree/testing_support/factories/tax_category_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'
-end
-
-
 FactoryBot.define do
   factory :tax_category, class: 'Spree::TaxCategory' do
     name { "TaxCategory - #{rand(999_999)}" }

data/lib/spree/testing_support/factories/tax_rate_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/tax_category_factory'
-  require 'spree/testing_support/factories/zone_factory'
-end
-
 FactoryBot.define do
   factory :tax_rate, class: 'Spree::TaxRate' do
     zone