solidus_core 2.11.3 → 2.11.8

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

@@ -20,11 +20,14 @@ Dummy::Application.configure do
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # 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,11 +90,8 @@ 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'
 require 'spree/preferences/scoped_store'
-
-if Rails.gem_version >= Gem::Version.new('6.1.0.alpha')
-  require 'spree/awesome_nested_set_override'
-end

data/lib/spree/core/engine.rb

@@ -86,19 +86,18 @@ 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
-      end
 
-      # Load in mailer previews for apps to use in development.
-      # We need to make sure we call `Preview.all` before requiring our
-      # previews, otherwise any previews the app attempts to add need to be
-      # manually required.
-      if Rails.env.development?
-        initializer "spree.mailer_previews" do
+        # Load in mailer previews for apps to use in development.
+        # We need to make sure we call `Preview.all` before requiring our
+        # previews, otherwise any previews the app attempts to add need to be
+        # manually required.
+        if Rails.env.development? || Rails.env.test?
           ActionMailer::Preview.all
+
           Dir[root.join("lib/spree/mailer_previews/**/*_preview.rb")].each do |file|
             require_dependency file
           end

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.3"
+  VERSION = "2.11.8"
 
   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/preferences/persistable.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spree
+  module Preferences
+    module Persistable
+      extend ActiveSupport::Concern
+
+      included do
+        include Spree::Preferences::Preferable
+        serialize :preferences, Hash
+        after_initialize :initialize_preference_defaults
+      end
+
+      private
+
+      def initialize_preference_defaults
+        if has_attribute?(:preferences)
+          self.preferences = default_preferences.merge(preferences)
+        end
+      end
+    end
+  end
+end

data/lib/spree/testing_support.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spree/testing_support/factory_bot'
+
+module Spree
+  module TestingSupport
+    autoload :FactoryBot, "spree/testing_support/factory_bot"
+
+    autoload :SEQUENCES, "spree/testing_support/factory_bot"
+    autoload :FACTORIES, "spree/testing_support/factory_bot"
+
+    def factory_bot_paths
+      Spree::TestingSupport::FactoryBot.definition_file_paths
+    end
+
+    def check_factory_bot_version
+      Spree::TestingSupport::FactoryBot.check_version
+    end
+
+    def load_all_factories
+      Spree::TestingSupport::FactoryBot.add_paths_and_load!
+    end
+
+    deprecate(
+      factory_bot_paths: "Spree::TestingSupport::FactoryBot.definition_file_paths",
+      check_factory_bot_version: "Spree::TestingSupport::FactoryBot.check_version",
+      load_all_factories: "Spree::TestingSupport::FactoryBot.add_paths_and_load!",
+      deprecator: Spree::Deprecation
+    )
+  end
+end

data/lib/spree/testing_support/dummy_app.rb

@@ -16,6 +16,7 @@ RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
 end
 
 # @private
@@ -51,8 +52,8 @@ module DummyApp
     config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
     config.whiny_nils = true
     config.consider_all_requests_local = true
-    config.action_controller.allow_forgery_protection = true
-    config.action_controller.default_protect_from_forgery = true
+    config.action_controller.allow_forgery_protection = false
+    config.action_controller.default_protect_from_forgery = false
     config.action_controller.perform_caching = false
     config.action_dispatch.show_exceptions = false
     config.active_support.deprecation = :stderr
@@ -61,6 +62,7 @@ module DummyApp
     config.secret_key_base = 'SECRET_TOKEN'
 
     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
     config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
 
     config.storage_path = Rails.root.join('tmp', 'storage')

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/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

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