solidus_core 2.11.1 → 3.0.0.rc2

data/lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class TestMailerPreview < ActionMailer::Preview
+end

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

@@ -27,9 +27,6 @@ module DummyApp
         ActiveRecord::Base.remove_connection
 
         sh 'rake db:reset VERBOSE=false'
-        if ENV['ENABLE_ACTIVE_STORAGE']
-          sh 'rake active_storage:install db:migrate VERBOSE=false'
-        end
 
         # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection

data/lib/spree/testing_support/factories.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require 'spree/testing_support/factory_bot'
 
-Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
-  require File.expand_path(f)
-end
+Spree::Deprecation.warn(
+  "Please do not try to load factories directly. " \
+  'Use factory_bot_rails and rely on the default configuration instead.', caller(1)
+)
+
+Spree::TestingSupport::FactoryBot.check_version
+Spree::TestingSupport::FactoryBot::PATHS.each { |path| require path }

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

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,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 :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,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

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}" }
@@ -13,7 +18,6 @@ FactoryBot.define do
 
     amount { 100.00 }
     transaction_id { generate(:refund_transaction_id) }
-    perform_after_create { false }
     payment do
       association(:payment, state: 'completed', amount: payment_amount)
     end