solidus_core 2.11.3 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5a7dfac7f187fbe6624df1401632e37756b522f7469284d2bd1d5a1b0e29c4
-  data.tar.gz: 259127616b27adb08f9fe570ea5151af7f1a7509cead4a52b95973eccb0bb441
+  metadata.gz: 7c2f2034c2f239923f522b08eeb9e6da4925058e86026d70d69cccf42ea975b9
+  data.tar.gz: c0f56fb7091eace3ef9a91a34846035a2f0bdffd248ad5ca9ae204a7d8faae68
 SHA512:
-  metadata.gz: b28c46974567eaf1ab5ce46fbbaa798500e1fac33a17535a6c8dd42bb81e1cfcdaa405c81db312e7ebac155ff191781c973cb755b40f055382b260375d997271
-  data.tar.gz: 80b28eefac466cfac4031401ca0bb8013d1094a1242b0a9c05dc97451630c4da2e901e5b4f886f2ca019024c835b7064ff3c56c7b6b56cd52c67dada159efae2
+  metadata.gz: a2e41a38b785af3e8da52ac03b86c9b1179cd2a92ec59a32c77ae6d54398115c99679ad8024b6f2988d95ddf515a9df2e0b118a687a239c2afb0920c17493b5f
+  data.tar.gz: d023f2e92ee65585e76103d5a8921f3525965480984fc9f0f48e7f69c76d5671d98bdc4d388112ee52c8b3f1f68a1ae51a215be903ef66ee1d5958c1a2c64009

data/app/models/spree/base.rb

@@ -3,8 +3,6 @@
 class Spree::Base < ActiveRecord::Base
   include Spree::Preferences::Preferable
   include Spree::Core::Permalinks
-  serialize :preferences, Hash
-
   include Spree::RansackableAttributes
 
   def initialize_preference_defaults
@@ -18,6 +16,7 @@ class Spree::Base < ActiveRecord::Base
   def self.preference(*args)
     # after_initialize can be called multiple times with the same symbol, it
     # will only be called once on initialization.
+    serialize :preferences, Hash
     after_initialize :initialize_preference_defaults
     super
   end

data/app/models/spree/calculator.rb

@@ -10,12 +10,12 @@ module Spree
     def compute(computable)
       # Spree::LineItem -> :compute_line_item
       computable_name = computable.class.name.demodulize.underscore
-      method = "compute_#{computable_name}".to_sym
+      method_name = "compute_#{computable_name}".to_sym
       calculator_class = self.class
-      if respond_to?(method)
-        send(method, computable)
+      if respond_to?(method_name)
+        send(method_name, computable)
       else
-        raise NotImplementedError, "Please implement '#{method}(#{computable_name})' in your calculator: #{calculator_class.name}"
+        raise NotImplementedError, "Please implement '#{method_name}(#{computable_name})' in your calculator: #{calculator_class.name}"
       end
     end
 

data/app/models/spree/calculator/free_shipping.rb

@@ -8,6 +8,7 @@ module Spree
   #   now a Promotion Action which deals with these types of promotions instead.
   class Calculator::FreeShipping < Calculator
     def compute(object)
+      Spree::Deprecation.warn('This method is deprecated, because it is no longer used')
       if object.is_a?(Array)
         return if object.empty?
         order = object.first.order

data/app/models/spree/calculator/percent_per_item.rb

@@ -15,6 +15,8 @@ module Spree
     preference :percent, :decimal, default: 0
 
     def compute(object = nil)
+      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
+
       return 0 if object.nil?
       object.line_items.sum { |line_item|
         value_for_line_item(line_item)

data/app/models/spree/calculator/price_sack.rb

@@ -11,6 +11,7 @@ module Spree
 
     # as object we always get line items, as calculable we have Coupon, ShippingMethod
     def compute(object)
+      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
       if object.is_a?(Array)
         base = object.sum { |element| element.respond_to?(:amount) ? element.amount : BigDecimal(element.to_s) }
       else

data/app/models/spree/order/payments.rb

@@ -37,14 +37,14 @@ module Spree
 
       private
 
-      def process_payments_with(method)
+      def process_payments_with(method_name)
         # Don't run if there is nothing to pay.
         return true if payment_total >= total
 
         unprocessed_payments.each do |payment|
           break if payment_total >= total
 
-          payment.public_send(method)
+          payment.public_send(method_name)
         end
       rescue Core::GatewayError => error
         result = !!Spree::Config[:allow_checkout_on_gateway_error]

data/app/models/spree/payment/cancellation.rb

@@ -26,16 +26,10 @@ module Spree
       # @param payment [Spree::Payment] - the payment that should be canceled
       #
       def cancel(payment)
-        # For payment methods already implemeting `try_void`
-        if try_void_available?(payment.payment_method)
-          if response = payment.payment_method.try_void(payment)
-            payment.handle_void_response(response)
-          else
-            payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
-          end
+        if response = payment.payment_method.try_void(payment)
+          payment.handle_void_response(response)
         else
-          # For payment methods not yet implemeting `try_void`
-          deprecated_behavior(payment)
+          payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
         end
       end
 
@@ -44,19 +38,6 @@ module Spree
       def refund_reason
         Spree::RefundReason.where(name: reason).first_or_create
       end
-
-      def try_void_available?(payment_method)
-        payment_method.respond_to?(:try_void) &&
-          payment_method.method(:try_void).owner != Spree::PaymentMethod
-      end
-
-      def deprecated_behavior(payment)
-        Spree::Deprecation.warn "#{payment.payment_method.class.name}#cancel is deprecated and will be removed. " \
-          'Please implement a `try_void` method instead that returns a response object if void succeeds ' \
-          'or `false|nil` if not. Solidus will refund the payment then.'
-        response = payment.payment_method.cancel(payment.response_code)
-        payment.handle_void_response(response)
-      end
     end
   end
 end

data/app/models/spree/payment_source.rb

@@ -23,9 +23,9 @@ module Spree
     end
 
     # @param payment [Spree::Payment] the payment we want to know if can be voided
-    # @return [Boolean] true when the payment is not failed or voided
+    # @return [Boolean] true when the payment is not failed, voided or invalid
     def can_void?(payment)
-      !payment.failed? && !payment.void?
+      payment.can_void?
     end
 
     # Indicates whether its possible to credit the payment.  Note that most

data/app/models/spree/product/scopes.rb

@@ -70,7 +70,6 @@ module Spree
           add_search_scope :in_taxon do |taxon|
             includes(:classifications)
               .where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id))
-              .select(Spree::Classification.arel_table[:position])
               .order(Spree::Classification.arel_table[:position].asc)
           end
 

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -24,7 +24,7 @@ Dummy::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  ActionMailer::Base.default from: "spree@example.com"
+  ActionMailer::Base.default from: "solidus@example.com"
 
   # Raise on deprecation warnings
   if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?

data/lib/spree/app_configuration.rb

@@ -190,7 +190,7 @@ module Spree
 
     # @!attribute [rw] mails_from
     #   @return [String] Email address used as +From:+ field in transactional emails.
-    preference :mails_from, :string, default: 'spree@example.com'
+    preference :mails_from, :string, default: 'solidus@example.com'
 
     # @!attribute [rw] max_level_in_taxons_menu
     #   @return [Integer] maximum nesting level in taxons menu (default: +1+)

data/lib/spree/core.rb

@@ -90,6 +90,7 @@ require 'spree/core/state_machines'
 require 'spree/core/stock_configuration'
 require 'spree/core/validators/email'
 require 'spree/permission_sets'
+require 'spree/user_class_handle'
 
 require 'spree/preferences/store'
 require 'spree/preferences/static_model_preferences'

data/lib/spree/core/engine.rb

@@ -86,7 +86,7 @@ module Spree
             Spree::Config.use_legacy_address_state_validator set to true has been
             deprecated and will be removed in Solidus 3.0. The Spree::Address state
             validation has been extracted into a configurable external class.
-            Switch Spree::Config.use_legacy_address_state_validator to true to start
+            Switch Spree::Config.use_legacy_address_state_validator to false to start
             using the external validation class.
           DEPRECATION
         end

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.3"
+  VERSION = "2.11.4"
 
   def self.solidus_version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -191,12 +191,12 @@ module Spree
 
     private
 
-    def inject_attributes_to_all_steps(attributes, method)
+    def inject_attributes_to_all_steps(attributes, method_name)
       attributes.each do |attribute|
-        PermittedAttributes.checkout_address_attributes.send(method, attribute)
-        PermittedAttributes.checkout_delivery_attributes.send(method, attribute)
-        PermittedAttributes.checkout_payment_attributes.send(method, attribute)
-        PermittedAttributes.checkout_confirm_attributes.send(method, attribute)
+        PermittedAttributes.checkout_address_attributes.send(method_name, attribute)
+        PermittedAttributes.checkout_delivery_attributes.send(method_name, attribute)
+        PermittedAttributes.checkout_payment_attributes.send(method_name, attribute)
+        PermittedAttributes.checkout_confirm_attributes.send(method_name, attribute)
       end
     end
   end

data/lib/spree/testing_support.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Spree
+  module TestingSupport
+    SEQUENCES = ["#{::Spree::Core::Engine.root}/lib/spree/testing_support/sequences.rb"]
+    FACTORIES = Dir["#{::Spree::Core::Engine.root}/lib/spree/testing_support/factories/**/*_factory.rb"]
+
+    def self.factory_bot_paths
+      @paths ||= (SEQUENCES + FACTORIES).sort.map { |path| path.sub(/.rb\z/, '') }
+    end
+
+    def self.deprecate_cherry_picking_factory_bot_files
+      # All good if the factory is being loaded by FactoryBot.
+      return if caller.find { |line| line.include? "/factory_bot/find_definitions.rb" }
+
+      Spree::Deprecation.warn(
+        "Please do not cherry-pick factories, this is not well supported by FactoryBot. " \
+        'Use `require "spree/testing_support/factories"` instead.', caller(2)
+      )
+    end
+
+    def self.load_all_factories
+      require 'factory_bot'
+      require 'factory_bot/version'
+
+      requirement = Gem::Requirement.new("~> 4.8")
+      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)
+        )
+      end
+
+      FactoryBot.definition_file_paths.concat(factory_bot_paths).uniq!
+      FactoryBot.reload
+    end
+  end
+end

data/lib/spree/testing_support/factories.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require 'spree/testing_support'
 
-Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
-  require File.expand_path(f)
-end
+Spree::TestingSupport.load_all_factories

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/state_factory'
-require 'spree/testing_support/factories/country_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :address, class: 'Spree::Address' do

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

@@ -1,10 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/shipment_factory'
-require 'spree/testing_support/factories/inventory_unit_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :carton, class: 'Spree::Carton' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 require 'carmen'
 
 FactoryBot.define do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :customer_return, class: 'Spree::CustomerReturn' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/product_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :line_item, class: 'Spree::LineItem' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :order, class: 'Spree::Order' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/promotion_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :order_promotion, class: 'Spree::OrderPromotion' do

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

@@ -1,9 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :price, class: 'Spree::Price' do

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

@@ -1,10 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :base_product, class: 'Spree::Product' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/option_type_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :product_option_type, class: 'Spree::ProductOptionType' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/property_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :product_property, class: 'Spree::ProductProperty' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/promotion_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :promotion_code, class: 'Spree::PromotionCode' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/promotion_code_factory'
-require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :promotion, class: 'Spree::Promotion' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/payment_factory'
-require 'spree/testing_support/factories/refund_reason_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/customer_return_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :reimbursement, class: 'Spree::Reimbursement' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :return_authorization, class: 'Spree::ReturnAuthorization' do

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

@@ -1,8 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :return_item, class: 'Spree::ReturnItem' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :shipment, class: 'Spree::Shipment' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory(

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/shipping_method_factory'
-require 'spree/testing_support/factories/shipment_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :shipping_rate, class: 'Spree::ShippingRate' do

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/country_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :state, class: 'Spree::State' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_location_factory'
-require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :stock_item, class: 'Spree::StockItem' do

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

@@ -1,8 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :stock_location, class: 'Spree::StockLocation' do

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_item_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :stock_movement, class: 'Spree::StockMovement' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/inventory_unit_factory'
-require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :store_credit_event, class: 'Spree::StoreCreditEvent' do

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

@@ -1,8 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :store_credit, class: 'Spree::StoreCredit' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,13 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 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,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :tax_category, class: 'Spree::TaxCategory' do

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

@@ -1,8 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :tax_rate, class: 'Spree::TaxRate' do

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/taxonomy_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :taxon, class: 'Spree::Taxon' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :taxonomy, class: 'Spree::Taxonomy' do
     name { 'Brand' }

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

@@ -1,8 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :user, class: Spree::UserClassHandle.new do

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

@@ -1,9 +1,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 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,7 @@
 # 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'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :variant_property_rule_condition, class: 'Spree::VariantPropertyRuleCondition' do

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/property_factory'
-require 'spree/testing_support/factories/option_value_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :variant_property_rule, class: 'Spree::VariantPropertyRule' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/variant_property_rule_factory'
-require 'spree/testing_support/factories/property_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :variant_property_rule_value, class: 'Spree::VariantPropertyRuleValue' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/country_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :global_zone, class: 'Spree::Zone' do

data/lib/spree/testing_support/order_walkthrough.rb

@@ -23,7 +23,7 @@ module Spree
         end
 
         order = Spree::Order.create!(
-          email: "spree@example.com",
+          email: "solidus@example.com",
           store: Spree::Store.first || FactoryBot.create(:store)
         )
         add_line_item!(order)

data/lib/tasks/email.rake

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 namespace :email do
-  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake email:test'
+  desc 'Sends test email to specified address - Example: EMAIL=solidus@example.com bundle exec rake email:test'
   task test: :environment do
     Spree::Deprecation.warn("rake email:test has been deprecated and will be removed with Solidus 3.0")
 
-    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=spree@example.com bundle exec rake email:test" unless ENV['EMAIL'].present?
+    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=solidus@example.com bundle exec rake email:test" if ENV['EMAIL'].blank?
+
     Spree::TestMailer.test_email(ENV['EMAIL']).deliver!
   end
 end

data/solidus_core.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 6.1.x']
+    s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.11.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -648,7 +648,6 @@ files:
 - app/models/spree/taxonomy.rb
 - app/models/spree/unit_cancel.rb
 - app/models/spree/user_address.rb
-- app/models/spree/user_class_handle.rb
 - app/models/spree/user_last_url_storer.rb
 - app/models/spree/user_last_url_storer/rules/authentication_rule.rb
 - app/models/spree/user_stock_location.rb
@@ -837,6 +836,7 @@ files:
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
 - lib/spree/promo/environment.rb
+- lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/bar_ability.rb
@@ -927,6 +927,7 @@ files:
 - lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/translations.rb
 - lib/spree/testing_support/url_helpers.rb
+- lib/spree/user_class_handle.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
 - lib/tasks/email.rake