solidus_core 2.11.1 → 3.0.0.rc2

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

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,8 +1,13 @@
 # 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

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

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

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/stock_location_factory'
-require 'spree/testing_support/factories/shipping_method_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/shipping_method_factory'
+end
+
 
 FactoryBot.define do
   factory :shipment, class: 'Spree::Shipment' do

data/lib/spree/testing_support/factories/shipping_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 :shipping_category, class: 'Spree::ShippingCategory' do
     sequence(:name) { |n| "ShippingCategory ##{n}" }

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

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/calculator_factory'
-require 'spree/testing_support/factories/shipping_category_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/calculator_factory'
+  require 'spree/testing_support/factories/shipping_category_factory'
+  require 'spree/testing_support/factories/zone_factory'
+end
 
 FactoryBot.define do
   factory(

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/shipping_method_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/shipping_method_factory'
+  require 'spree/testing_support/factories/shipment_factory'
+end
 
 FactoryBot.define do
   factory :shipping_rate, class: 'Spree::ShippingRate' do

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

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
-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/country_factory'
+end
+
 
 FactoryBot.define do
   factory :state, class: 'Spree::State' do

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_location_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/stock_location_factory'
+  require 'spree/testing_support/factories/variant_factory'
+end
 
 FactoryBot.define do
   factory :stock_item, class: 'Spree::StockItem' do

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

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/country_factory'
-require 'spree/testing_support/factories/state_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/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

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

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_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_item_factory'
+end
 
 FactoryBot.define do
   factory :stock_movement, class: 'Spree::StockMovement' do

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/inventory_unit_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/inventory_unit_factory'
+  require 'spree/testing_support/factories/variant_factory'
+end
 
 FactoryBot.define do
   factory :stock_package, class: 'Spree::Stock::Package' do

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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/store_credit_factory'
-require 'spree/testing_support/factories/store_credit_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/store_credit_factory'
+  require 'spree/testing_support/factories/store_credit_reason_factory'
+end
 
 FactoryBot.define do
   factory :store_credit_event, class: 'Spree::StoreCreditEvent' do

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

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

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

data/lib/spree/testing_support/factories/store_credit_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 :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,15 @@
 # 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}" }
     sequence(:name) { |i| "Spree Test Store #{i}" }
     sequence(:url) { |i| "www.example#{i}.com" }
-    mail_from_address { 'spree@example.org' }
+    mail_from_address { 'solidus@example.org' }
   end
 end

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

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

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

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/calculator_factory'
-require 'spree/testing_support/factories/tax_category_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/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

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

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/taxonomy_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/taxonomy_factory'
+end
 
 FactoryBot.define do
   factory :taxon, class: 'Spree::Taxon' do

data/lib/spree/testing_support/factories/taxonomy_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 :taxonomy, class: 'Spree::Taxonomy' do
     name { 'Brand' }

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

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/role_factory'
-require 'spree/testing_support/factories/address_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/role_factory'
+  require 'spree/testing_support/factories/address_factory'
+end
 
 FactoryBot.define do
   factory :user, class: Spree::UserClassHandle.new do

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

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/option_value_factory'
-require 'spree/testing_support/factories/option_type_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/sequences'
+  require 'spree/testing_support/factories/option_value_factory'
+  require 'spree/testing_support/factories/option_type_factory'
+  require 'spree/testing_support/factories/product_factory'
+end
 
 FactoryBot.define do
   sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/option_value_factory'
-require 'spree/testing_support/factories/variant_property_rule_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/option_value_factory'
+  require 'spree/testing_support/factories/variant_property_rule_factory'
+end
 
 FactoryBot.define do
   factory :variant_property_rule_condition, class: 'Spree::VariantPropertyRuleCondition' do