solidus_core 3.4.2 → 4.1.0

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

data/lib/spree/testing_support/factories/stock_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/stock_location_factory'
-  require 'spree/testing_support/factories/variant_factory'
-end
-
 FactoryBot.define do
   factory :stock_item, class: 'Spree::StockItem' do
     backorderable { true }

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

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,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/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
     association :user, strategy: :create

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

data/lib/spree/testing_support/factories/taxon_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/taxonomy_factory'
-end
-
 FactoryBot.define do
   factory :taxon, class: 'Spree::Taxon' do
     name { 'Ruby on Rails' }

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

data/lib/spree/testing_support/factories/user_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/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
     email { generate(:email) }

data/lib/spree/testing_support/factories/variant_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/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,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/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
     variant_property_rule

data/lib/spree/testing_support/factories/variant_property_rule_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/product_factory'
-  require 'spree/testing_support/factories/property_factory'
-  require 'spree/testing_support/factories/option_value_factory'
-end
-
 FactoryBot.define do
   factory :variant_property_rule, class: 'Spree::VariantPropertyRule' do
     product

data/lib/spree/testing_support/factories/variant_property_rule_value_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/variant_property_rule_factory'
-  require 'spree/testing_support/factories/property_factory'
-end
-
 FactoryBot.define do
   factory :variant_property_rule_value, class: 'Spree::VariantPropertyRuleValue' do
     variant_property_rule

data/lib/spree/testing_support/factories/zone_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/country_factory'
-end
-
 FactoryBot.define do
   factory :global_zone, class: 'Spree::Zone' do
     initialize_with { Spree::Zone.find_or_initialize_by(name: 'GlobalZone') }

data/lib/spree/testing_support/factory_bot.rb

@@ -17,30 +17,6 @@ module Spree
         @paths ||= PATHS.map { |path| path.sub(/.rb\z/, '') }
       end
 
-      def self.when_cherry_picked
-        callsites = caller
-
-        # All good if the factory is being loaded by FactoryBot or from `testing_support/factories.rb`.
-        return if callsites.find do |line|
-          line.include?("/factory_bot/find_definitions.rb") ||
-          line.include?("/spree/testing_support/factories.rb")
-        end
-
-        yield
-      end
-
-      def self.deprecate_cherry_picking
-        callsites = caller
-        core_root = Spree::Core::Engine.root.to_s
-        index = callsites.index { |line| !line.start_with? core_root }
-
-        Spree::Deprecation.warn(
-          "Please do not cherry-pick factories, this is not well supported by FactoryBot, " \
-          'follow the changelog instructions on how to migrate your current setup.',
-          callsites[index..]
-        )
-      end
-
       def self.check_version
         require "factory_bot/version"
 
@@ -48,10 +24,10 @@ module Spree
         version = Gem::Version.new(::FactoryBot::VERSION)
 
         unless requirement.satisfied_by? version
-          Spree::Deprecation.warn(
-            "Please be aware that the supported version of FactoryBot is #{requirement}, " \
-            "using version #{version} could lead to factory loading issues.", caller(2)
-          )
+          raise <<~MSG
+            Please be aware that the supported version of FactoryBot is #{requirement},
+            using version #{version} could lead to factory loading issues.
+          MSG
         end
       end
       deprecate :check_version, deprecator: Spree::Deprecation

data/lib/spree/testing_support/sequences.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
   sequence(:sku) { |n| "SKU-#{n}" }
   sequence(:email) { |n| "email#{n}@example.com" }

data/solidus_core.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.0.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 6.0', '< 7.1.x']
+    s.add_dependency rails_dep, ['>= 7.0', '< 7.1']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
@@ -65,7 +65,7 @@ $ bin/rails g solidus:update
 Please, don't forget to look at the CHANGELOG to see what has changed and
 whether you need to perform other tasks.
 
-https://github.com/solidusio/solidus/blob/master/CHANGELOG.md
+https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
 
 Please report any issues at:
 - https://github.com/solidusio/solidus/issues