solidus_core 2.11.4 → 2.11.9

data/app/models/spree/shipping_method.rb

@@ -119,7 +119,7 @@ module Spree
 
     def at_least_one_shipping_category
       if shipping_categories.empty?
-        errors[:base] << "You need to select at least one shipping category"
+        errors.add(:base, "You need to select at least one shipping category")
       end
     end
   end

data/app/models/spree/stock/availability_validator.rb

@@ -11,10 +11,10 @@ module Spree
           display_name = variant.name.to_s
           display_name += %{ (#{variant.options_text})} unless variant.options_text.blank?
 
-          line_item.errors[:quantity] << I18n.t(
+          line_item.errors.add(:quantity, I18n.t(
             'spree.selected_quantity_not_available',
             item: display_name.inspect
-          )
+          ))
           false
         end
       end

data/app/models/spree/stock/inventory_validator.rb

@@ -5,10 +5,10 @@ module Spree
     class InventoryValidator < ActiveModel::Validator
       def validate(line_item)
         if line_item.inventory_units.count != line_item.quantity
-          line_item.errors[:inventory] << I18n.t(
+          line_item.errors.add(:inventory, I18n.t(
             'spree.inventory_not_available',
             item: line_item.variant.name
-          )
+          ))
         end
       end
     end

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -9,11 +9,10 @@ module Spree::Taxon::ActiveStorageAttachment
                    styles: { mini: '32x32>', normal: '128x128>' },
                    default_style: :mini
     validate :icon_is_an_image
-
-
   end
 
   def attachment_partial_name
+    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
     'paperclip'
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -20,6 +20,7 @@ module Spree::Taxon::PaperclipAttachment
   end
 
   def attachment_partial_name
+    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
     'paperclip'
   end
 

data/db/migrate/20210122110141_add_name_to_spree_addresses.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddNameToSpreeAddresses < ActiveRecord::Migration[5.2]
+  def up
+    add_column :spree_addresses, :name, :string
+    add_index :spree_addresses, :name
+  end
+
+  def down
+    remove_index :spree_addresses, :name
+    remove_column :spree_addresses, :name
+  end
+end

data/lib/generators/solidus/install/install_generator.rb

@@ -171,7 +171,7 @@ module Solidus
       end
 
       bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop"
+      run "spring stop" if defined?(Spring)
 
       @plugin_generators_to_run.each do |plugin_generator_name|
         generate "#{plugin_generator_name} --skip_migrations=false"

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

@@ -20,6 +20,9 @@ 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.

data/lib/spree/app_configuration.rb

@@ -504,6 +504,14 @@ module Spree
     # Enumerable of images adhering to the present_image_class interface
     class_name_attribute :image_attachment_module, default: 'Spree::Image::PaperclipAttachment'
 
+    # @!attribute [rw] allowed_image_mime_types
+    #
+    # Defines which MIME types are allowed for images
+    # `%w(image/jpeg image/jpg image/png image/gif).freeze` is the default.
+    #
+    # @return [Array]
+    class_name_attribute :allowed_image_mime_types, default: %w(image/jpeg image/jpg image/png image/gif).freeze
+
     # Allows switching attachment library for Taxon
     #
     # `Spree::Taxon::PaperclipAttachment`

data/lib/spree/core.rb

@@ -95,7 +95,3 @@ 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

@@ -90,15 +90,14 @@ module Spree
             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.4"
+  VERSION = "2.11.9"
 
   def self.solidus_version
     VERSION

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

@@ -1,40 +1,31 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support/factory_bot'
+
 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
+    autoload :FactoryBot, "spree/testing_support/factory_bot"
 
-    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" }
+    autoload :SEQUENCES, "spree/testing_support/factory_bot"
+    autoload :FACTORIES, "spree/testing_support/factory_bot"
 
-      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)
-      )
+    def factory_bot_paths
+      Spree::TestingSupport::FactoryBot.definition_file_paths
     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
+    def check_factory_bot_version
+      Spree::TestingSupport::FactoryBot.check_version
+    end
 
-      FactoryBot.definition_file_paths.concat(factory_bot_paths).uniq!
-      FactoryBot.reload
+    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,5 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
+require 'spree/testing_support/factory_bot'
 
-Spree::TestingSupport.load_all_factories
+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'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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,7 +1,15 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+end
 
 require 'carmen'
 

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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

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

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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

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

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+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