solidus_core 2.11.7 → 3.0.1

data/lib/spree/money.rb

@@ -6,7 +6,6 @@ module Spree
   class Money
     include Comparable
     DifferentCurrencyError = Class.new(StandardError)
-    RUBY_NUMERIC_STRING = /\A-?\d+(\.\d+)?\z/
 
     class <<self
       attr_accessor :default_formatting_rules
@@ -37,15 +36,8 @@ module Spree
         @money = amount
       else
         currency = (options[:currency] || Spree::Config[:currency])
-        if amount.to_s =~ RUBY_NUMERIC_STRING
-          @money = Monetize.from_string(amount, currency)
-        else
-          @money = Spree::Money.parse_to_money(amount, currency)
-          Spree::Deprecation.warn <<-WARN.squish, caller
-            Spree::Money was initialized with #{amount.inspect}, which will not be supported in the future.
-            Instead use Spree::Money.new(#{@money.to_s.inspect}, options) or Spree::Money.parse(#{amount.inspect})
-          WARN
-        end
+
+        @money = Monetize.from_string(amount, currency)
       end
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -80,14 +72,7 @@ module Spree
     def to_html(options = { html_wrap: true })
       output = format(options)
       # Maintain compatibility by checking html option renamed to html_wrap.
-      if options[:html] || options[:html] == false
-        Spree::Deprecation.warn <<-WARN.squish, caller
-          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html].inspect}),
-          which will not be supported in the future.
-          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html].inspect})
-        WARN
-      end
-      if options[:html_wrap] || options[:html]
+      if options[:html_wrap]
         output = output.html_safe
       end
       output

data/lib/spree/permitted_attributes.rb

@@ -39,8 +39,7 @@ module Spree
     mattr_reader(*ATTRIBUTES)
 
     @@address_attributes = [
-      :id, :name, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_id, :state_id,
+      :id, :name, :address1, :address2, :city, :country_id, :state_id,
       :zipcode, :phone, :state_name, :country_iso, :alternative_phone, :company,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
@@ -90,7 +89,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
+      :wallet_payment_source_id, address_attributes: address_attributes
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -143,61 +142,11 @@ module Spree
     ]
 
     @@checkout_payment_attributes = [
-      :coupon_code,
       payments_attributes: payment_attributes + [
         source_attributes: source_attributes
       ]
     ]
 
     @@checkout_confirm_attributes = []
-
-    def self.checkout_attributes
-      Spree::Deprecation.warn <<-WARN.squish, caller
-        checkout_attributes is deprecated, please use the permitted
-        attributes set for the specific step that needs to be updated.
-
-        E.g. permitted_checkout_address_attributes
-      WARN
-
-      CheckoutAdditionalAttributes.new(
-        checkout_address_attributes +
-        checkout_delivery_attributes +
-        checkout_payment_attributes +
-        checkout_confirm_attributes
-      )
-    end
-  end
-
-  class CheckoutAdditionalAttributes < Array
-    def <<(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :<<)
-    end
-
-    def push(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :push)
-    end
-    alias append push
-
-    def prepend(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :prepend)
-    end
-    alias unshift prepend
-
-    private
-
-    def inject_attributes_to_all_steps(attributes, method_name)
-      attributes.each do |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
 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/capybara_ext.rb

@@ -35,18 +35,6 @@ module Spree
         find("td:nth-of-type(#{num})").text
       end
 
-      def fill_in_quantity(table_column, selector, quantity)
-        Spree::Deprecation.warn <<-WARN.strip_heredoc
-          fill_in_quantity is deprecated. Instead use:
-            within(#{table_column.inspect}) do
-              fill_in #{selector.inspect}, with: #{quantity.inspect}
-            end
-        WARN
-        within(table_column) do
-          fill_in selector, with: quantity
-        end
-      end
-
       def select2_search(value, options)
         options = {
           search: value, # by default search for the value
@@ -122,21 +110,6 @@ module Spree
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       end
-
-      def wait_for_ajax
-        Spree::Deprecation.warn <<-WARN.squish, caller
-          wait_for_ajax has been deprecated.
-          Please refer to the capybara documentation on how to properly wait for asyncronous behavior:
-          https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends
-        WARN
-
-        counter = 0
-        while page.evaluate_script("typeof($) === 'undefined' || $.active > 0")
-          counter += 1
-          sleep(0.1)
-          raise "AJAX request took longer than 5 seconds." if counter >= 50
-        end
-      end
     end
   end
 end
@@ -156,9 +129,6 @@ RSpec::Matchers.define :have_meta do |name, expected|
   end
 end
 
-# @private
-CapybaraExt = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CapybaraExt', 'Spree::TestingSupport::CapybaraExt')
-
 RSpec.configure do |c|
   c.include Spree::TestingSupport::CapybaraExt
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -2,23 +2,12 @@
 
 module Spree
   module TestingSupport
-    # A module providing convenience methods to test Solidus controllers
-    # in Rails controller/functional tests. Possibly from inside an
-    # application with a mounted Solidus engine.
-    #
     # *There is generaly no need* to use this module. Instead, in
     # a functional/controller test against a Spree controller, just
     # use standard Rails functionality by including:
     #
     #   routes { Spree::Core::Engine.routes }
     #
-    # And then use standard Rails test `get`, `post` etc methods.
-    #
-    # But some legacy code uses this ControllerRequests helper. It must
-    # be included only in tests against Spree controllers, it will interfere
-    # with tests against local app or other engine controllers, resulting
-    # in ActionController::UrlGenerationError.
-    #
     # To use this module, inside your spec_helper.rb, include this module inside
     # the RSpec.configure block by:
     #
@@ -26,83 +15,12 @@ module Spree
     #   RSpec.configure do |c|
     #     c.include Spree::TestingSupport::ControllerRequests, spree_controller: true
     #   end
-    #
-    # Then, in your controller tests against spree controllers, you can access
-    # tag to use this module, and access spree routes like this:
-    #
-    #   require 'spec_helper'
-    #
-    #   describe Spree::ProductsController, :spree_controller do
-    #     it "can see all the products" do
-    #       spree_get :index
-    #     end
-    #   end
-    #
-    # Use spree_get, spree_post, spree_put or spree_delete to make requests to
-    # the Spree engine, and use regular get, post, put or delete to make
-    # requests to your application.
     module ControllerRequests
       extend ActiveSupport::Concern
 
       included do
         routes { Spree::Core::Engine.routes }
       end
-
-      def spree_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "GET")
-      end
-      deprecate spree_get: :get, deprecator: Spree::Deprecation
-
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def spree_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "POST")
-      end
-      deprecate spree_post: :post, deprecator: Spree::Deprecation
-
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def spree_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "PUT")
-      end
-      deprecate spree_put: :put, deprecator: Spree::Deprecation
-
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "DELETE")
-      end
-      deprecate spree_delete: :delete, deprecator: Spree::Deprecation
-
-      def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :get)
-      end
-      deprecate spree_xhr_get: :get, deprecator: Spree::Deprecation
-
-      def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :post)
-      end
-      deprecate spree_xhr_post: :post, deprecator: Spree::Deprecation
-
-      def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :put)
-      end
-      deprecate spree_xhr_put: :put, deprecator: Spree::Deprecation
-
-      def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :delete)
-      end
-      deprecate spree_xhr_delete: :delete, deprecator: Spree::Deprecation
-
-      private
-
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
-        parameters ||= {}
-        process(action, method, parameters, session, flash)
-      end
-
-      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
-        parameters ||= {}
-        parameters.reverse_merge!(format: :json)
-        xml_http_request(method, action, parameters, session, flash)
-      end
     end
   end
 end

data/lib/spree/testing_support/dummy_app.rb

@@ -7,6 +7,7 @@ require 'rails'
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'active_storage/engine'
 
 Rails.env = 'test'
 
@@ -67,7 +68,7 @@ module DummyApp
 
     config.storage_path = Rails.root.join('tmp', 'storage')
 
-    if ENV['ENABLE_ACTIVE_STORAGE']
+    unless ENV['DISABLE_ACTIVE_STORAGE']
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -116,20 +117,11 @@ end
 
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
-  config.use_legacy_address_state_validator = false
   config.mails_from = "store@example.com"
-  config.raise_with_invalid_currency = false
-  config.redirect_back_on_unauthorized = true
-  config.run_order_validations_on_order_updater = true
-  config.use_combined_first_and_last_name_in_address = true
-  config.use_legacy_order_state_machine = false
-  config.use_custom_cancancan_actions = false
-  config.consider_actionless_promotion_active = false
-  config.use_legacy_store_credit_reimbursement_category_name = false
-
-  if ENV['ENABLE_ACTIVE_STORAGE']
-    config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
-    config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
+
+  if ENV['DISABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
 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/order_factory.rb

@@ -30,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/refund_factory.rb

@@ -18,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

data/lib/spree/testing_support/fixtures/file.txt

@@ -0,0 +1 @@
+This is a text file

data/lib/spree/testing_support/order_walkthrough.rb

@@ -82,6 +82,3 @@ module Spree
     end
   end
 end
-
-# @private
-OrderWalkthrough = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OrderWalkthrough', 'Spree::TestingSupport::OrderWalkthrough')

data/lib/spree/testing_support/preferences.rb

@@ -1,33 +1,8 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
-
 module Spree
   module TestingSupport
     module Preferences
-      # Resets all preferences to default values, you can
-      # pass a block to override the defaults with a block
-      #
-      # reset_spree_preferences do |config|
-      #   config.track_inventory_levels = false
-      # end
-      #
-      # @deprecated
-      def reset_spree_preferences(&config_block)
-        Spree::Config.instance_variables.
-          reject { |iv| iv == :@events_configuration }.
-          each { |iv| Spree::Config.remove_instance_variable(iv) }
-        Spree::Config.preference_store = Spree::Config.default_preferences
-
-        if defined?(Railties)
-          Rails.application.config.spree = Spree::Config.environment
-        end
-
-        configure_spree_preferences(&config_block) if block_given?
-      end
-
-      deprecate :reset_spree_preferences, deprecator: Spree::Deprecation
-
       def configure_spree_preferences
         yield(Spree::Config) if block_given?
       end

data/lib/tasks/upgrade.rake

@@ -2,12 +2,14 @@
 
 namespace :solidus do
   namespace :upgrade do
-    desc "Upgrade Solidus to version 2.11"
-    task two_point_eleven: [
-        'solidus:migrations:migrate_default_billing_addresses_to_address_book:up',
-        'solidus:migrations:migrate_address_names:up'
+    task three_point_zero: [
+        'railties:install:migrations',
+        'db:migrate'
       ] do
-      puts "Your Solidus install is ready for Solidus 2.11"
+      puts "Your Solidus install is ready for Solidus 3.0"
     end
   end
+
+  desc "Upgrade to the current Solidus version"
+  task upgrade: 'upgrade:three_point_zero'
 end

data/solidus_core.gemspec

@@ -39,8 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'paperclip', '>= 4.2'
-  s.add_dependency 'paranoia', '~> 2.4'
+  s.add_dependency 'kt-paperclip', '~> 6.3'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
 
@@ -56,9 +55,7 @@ $ bin/rails g solidus:install
 If you are updating Solidus from an older version, please run
 the following commands to complete the update:
 
-$ bin/rails railties:install:migrations
-$ bin/rails db:migrate
-$ bin/rails solidus:upgrade:two_point_eleven
+$ bin/rails solidus:upgrade
 
 Please report any issues at:
 - https://github.com/solidusio/solidus/issues