solidus_core 4.1.6 → 4.5.1

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -10,8 +10,8 @@ module DummyApp
         require lib_name
         require 'spree/testing_support/dummy_app'
         DummyApp.setup(
-          gem_root: gem_root,
-          lib_name: lib_name,
+          gem_root:,
+          lib_name:,
           auto_migrate: false
         )
       end
@@ -38,10 +38,7 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      ActiveRecord::MigrationContext.new(
-        [path],
-        ActiveRecord::SchemaMigration
-      ).migrate
+      ActiveRecord::MigrationContext.new([path]).migrate
     end
 
     ActiveRecord::Base.clear_cache!

data/lib/spree/testing_support/dummy_app.rb

@@ -20,6 +20,7 @@ end
 
 # @private
 class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
 end
 
 # @private
@@ -34,10 +35,19 @@ end
 module DummyApp
   def self.setup(gem_root:, lib_name:, auto_migrate: true)
     ENV["LIB_NAME"] = lib_name
-    DummyApp::Application.config.root = File.join(gem_root, 'spec', 'dummy')
+    root = Pathname(gem_root).join('spec/dummy')
+    root.join("app/assets/config").mkpath
+    root.join("app/assets/config/manifest.js").write("// Intentionally empty\n")
 
+    DummyApp::Application.config.root = root
     DummyApp::Application.initialize! unless DummyApp::Application.initialized?
 
+    # Raise on deprecation warnings.
+    # NOTE: This needs to happen after the application is initialized.
+    if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
+      Spree.deprecator.behavior = :raise
+    end
+
     if auto_migrate
       DummyApp::Migrations.auto_migrate
     end
@@ -45,6 +55,7 @@ module DummyApp
 
   class Application < ::Rails::Application
     config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
+
     # Make the test environment more production-like:
     config.action_controller.allow_forgery_protection = false
     config.action_controller.default_protect_from_forgery = false
@@ -62,9 +73,14 @@ module DummyApp
     config.cache_classes = true
 
     # Make debugging easier:
+    if Rails.gem_version >= Gem::Version.new('7.1')
+      config.action_controller.raise_on_missing_callback_actions = true
+      config.action_dispatch.show_exceptions = :none
+    else
+      config.action_dispatch.show_exceptions = false
+    end
     config.consider_all_requests_local = true
-    config.action_dispatch.show_exceptions = false
-    config.active_support.deprecation = :stderr
+    config.active_support.deprecation = ENV['RAILS_DEPRECATIONS_BEHAVIOR'].presence&.to_sym || :stderr
     config.log_level = :debug
 
     # Improve test suite performance:
@@ -82,22 +98,24 @@ module DummyApp
     config.secret_key_base = 'SECRET_TOKEN'
 
     # Set the preview path within the dummy app:
-    config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
+    if ActionMailer::Base.respond_to? :preview_paths # Rails 7.1+
+      config.action_mailer.preview_paths << File.expand_path('dummy_app/mailer_previews', __dir__)
+    else
+      config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
+    end
 
     config.active_record.dump_schema_after_migration = false
 
     # Configure active storage to use storage within tmp folder
-    unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
-      initializer 'solidus.active_storage' do
-        config.active_storage.service_configurations = {
-          test: {
-            service: 'Disk',
-            root: Rails.root.join('tmp', 'storage')
-          }
+    initializer 'solidus.active_storage' do
+      config.active_storage.service_configurations = {
+        test: {
+          service: 'Disk',
+          root: Rails.root.join('tmp', 'storage')
         }
-        config.active_storage.service = :test
-        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :vips).to_sym
-      end
+      }
+      config.active_storage.service = :test
+      config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :vips).to_sym
     end
 
     # Avoid issues if an old spec/dummy still exists
@@ -117,6 +135,7 @@ module DummyApp
 
     config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
     config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
+    config.assets.css_compressor = nil
 
     config.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
     config.paths['config/routes.rb'] = File.expand_path('dummy_app/routes.rb', __dir__)
@@ -139,8 +158,3 @@ Spree.config do |config|
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
 end
-
-# Raise on deprecation warnings
-if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
-  Spree.deprecator.behavior = :raise
-end

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

@@ -7,7 +7,6 @@ FactoryBot.define do
     amount { 100.0 }
     label { 'Shipping' }
     association(:source, factory: :tax_rate)
-    eligible { true }
 
     after(:build) do |adjustment|
       adjustments = adjustment.adjustable.adjustments
@@ -31,7 +30,7 @@ FactoryBot.define do
             adjustment.source.tax_categories = []
           end
           adjustment.source.save
-          adjustment.recalculate
+          adjustment.update!(amount: adjustment.source.compute_amount(adjustment.adjustable))
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
+  factory :flat_rate_calculator, aliases: [:calculator], class: 'Spree::Calculator::FlatRate' do
     preferred_amount { 10.0 }
   end
 
@@ -22,8 +22,4 @@ FactoryBot.define do
   factory :shipping_no_amount_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
     preferred_amount { 0 }
   end
-
-  factory :percent_on_item_calculator, class: 'Spree::Calculator::PercentOnLineItem' do
-    preferred_percent { 10 }
-  end
 end

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

@@ -13,8 +13,8 @@ FactoryBot.define do
           # ensure the shipment uses the same stock location as the carton
           shipment: build(
             :shipment,
-            stock_location: stock_location,
-            shipping_method: shipping_method
+            stock_location:,
+            shipping_method:
           )
         )
       ]

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

@@ -7,13 +7,13 @@ FactoryBot.define do
     transient do
       line_items_count { 1 }
       return_items_count { line_items_count }
-      shipped_order { create :shipped_order, line_items_count: line_items_count }
+      shipped_order { create :shipped_order, line_items_count: }
       return_authorization { create :return_authorization, order: shipped_order }
     end
 
     before(:create) do |customer_return, evaluator|
       evaluator.shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
-        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit, return_authorization: evaluator.return_authorization)
+        customer_return.return_items << build(:return_item, inventory_unit:, return_authorization: evaluator.return_authorization)
       end
     end
 

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

@@ -10,15 +10,15 @@ FactoryBot.define do
     association :variant, strategy: :create
     line_item do
       if order
-        build(:line_item, variant: variant, order: order)
+        build(:line_item, variant:, order:)
       else
-        build(:line_item, variant: variant)
+        build(:line_item, variant:)
       end
     end
     state { 'on_hand' }
     shipment do
       if stock_location
-        build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
+        build(:shipment, state: 'pending', order: line_item.order, stock_location:)
       else
         build(:shipment, state: 'pending', order: line_item.order)
       end

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

@@ -43,36 +43,25 @@ FactoryBot.define do
         evaluator.stock_location # must evaluate before creating line items
 
         evaluator.line_items_attributes.each do |attributes|
-          attributes = { order: order, price: evaluator.line_items_price }.merge(attributes)
+          attributes = { order:, price: evaluator.line_items_price }.merge(attributes).tap do |attrs|
+            tax_category = attributes.delete(:tax_category)
+            if attrs[:variant] && tax_category
+              attrs[:variant].update(tax_category: )
+            elsif tax_category
+              attrs[:variant] = create(:variant, tax_category: )
+            end
+          end
+
           create(:line_item, attributes)
         end
         order.line_items.reload
 
-        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, stock_location: evaluator.stock_location)
+        create(:shipment, order:, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, stock_location: evaluator.stock_location)
         order.shipments.reload
 
         order.recalculate
       end
 
-      factory :completed_order_with_promotion do
-        transient do
-          completed_at { Time.current }
-          promotion { nil }
-        end
-
-        after(:create) do |order, evaluator|
-          promotion = evaluator.promotion || create(:promotion, code: "test")
-          promotion_code = promotion.codes.first || create(:promotion_code, promotion: promotion)
-
-          promotion.activate(order: order, promotion_code: promotion_code)
-          order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
-
-          # Complete the order after the promotion has been activated
-          order.update_column(:completed_at, evaluator.completed_at)
-          order.update_column(:state, "complete")
-        end
-      end
-
       factory :order_ready_to_complete do
         state { 'confirm' }
         payment_state { 'checkout' }
@@ -84,7 +73,7 @@ FactoryBot.define do
         after(:create) do |order, evaluator|
           create(evaluator.payment_type, {
             amount: order.total,
-            order: order,
+            order:,
             state: order.payment_state
           })
 
@@ -107,7 +96,7 @@ FactoryBot.define do
 
         factory :completed_order_with_pending_payment do
           after(:create) do |order|
-            create(:payment, amount: order.total, order: order, state: 'pending')
+            create(:payment, amount: order.total, order:, state: 'pending')
           end
         end
 
@@ -120,7 +109,7 @@ FactoryBot.define do
           end
 
           after(:create) do |order, evaluator|
-            create(evaluator.payment_type, amount: order.total, order: order, state: 'completed')
+            create(evaluator.payment_type, amount: order.total, order:, state: 'completed')
             order.shipments.each do |shipment|
               shipment.update_column('state', 'ready')
             end

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

@@ -40,7 +40,7 @@ FactoryBot.define do
       end
 
       factory :product_with_option_types do
-        after(:create) { |product| create(:product_option_type, product: product) }
+        after(:create) { |product| create(:product_option_type, product:) }
       end
     end
   end

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

@@ -15,7 +15,7 @@ FactoryBot.define do
     after(:create) do |shipment, evaluator|
       shipping_method = evaluator.shipping_method || create(:shipping_method, cost: evaluator.cost)
       shipment.shipping_rates.create!(
-        shipping_method: shipping_method,
+        shipping_method:,
         cost: evaluator.cost,
         selected: true
       )

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

@@ -6,6 +6,10 @@ FactoryBot.define do
     association :stock_location, factory: :stock_location_without_variant_propagation
     variant
 
-    after(:create) { |object| object.adjust_count_on_hand(10) }
+    transient do
+      on_hand { 10 }
+    end
+
+    after(:create) { |object, evaluator| object.adjust_count_on_hand(evaluator.on_hand) }
   end
 end

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

@@ -14,7 +14,7 @@ FactoryBot.define do
 
     after(:build) do |package, evaluator|
       evaluator.variants_contents.each do |variant, count|
-        package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
+        package.add_multiple build_list(:inventory_unit, count, variant:, stock_location: evaluator.stock_location)
       end
     end
 

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

@@ -14,7 +14,7 @@ FactoryBot.define do
 
     trait :with_orders do
       after(:create) do |user, _|
-        create(:order, user: user)
+        create(:order, user:)
       end
     end
 

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

@@ -6,7 +6,7 @@ FactoryBot.define do
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }
       Spree::Country.all.map do |c|
-        Spree::ZoneMember.create(zoneable: c, zone: zone)
+        Spree::ZoneMember.create(zoneable: c, zone:)
       end
     end
   end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -4,7 +4,7 @@ module Spree
   module TestingSupport
     class OrderWalkthrough
       def self.up_to(state, user: nil)
-        new.up_to(state, user: user)
+        new.up_to(state, user:)
       end
 
       def up_to(state, user: nil)
@@ -23,7 +23,7 @@ module Spree
         end
 
         order = Spree::Order.create!(
-          user: user,
+          user:,
           email: "solidus@example.com",
           store: Spree::Store.first || ::FactoryBot.create(:store)
         )
@@ -47,7 +47,7 @@ module Spree
       private
 
       def add_line_item!(order)
-        ::FactoryBot.create(:line_item, order: order)
+        ::FactoryBot.create(:line_item, order:)
         order.reload
       end
 

data/lib/spree/testing_support/shared_examples/calculator.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for 'a calculator with a description' do
+  describe ".description" do
+    subject { described_class.description }
+    it "has a description" do
+      expect(subject.size).to be > 0
+    end
+  end
+end

data/lib/spree/testing_support/shared_examples/order_factory.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "shipping methods are assigned" do
+  context "given a shipping method" do
+    let(:shipping_method) { create(:shipping_method) }
+
+    it "assigns the shipping method when created" do
+      expect(
+        create(
+          factory,
+          shipping_method:
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+
+    it "assigns the shipping method when built" do
+      expect(
+        build(
+          factory,
+          shipping_method:
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+  end
+end
+
+RSpec.shared_examples "an order with line items factory" do |expected_order_state, expected_inventory_unit_state|
+  # This factory cannot be built correctly because Shipment#set_up_inventory
+  # requires records to be saved.
+  context "when created" do
+    let(:stock_location) { create(:stock_location) }
+    let(:first_variant) { create(:variant) }
+    let(:second_variant) { create(:variant) }
+    let(:shipping_method) { create(:shipping_method) }
+    let(:order) do
+      create(
+        factory,
+        stock_location:,
+        line_items_attributes: [
+          { variant: first_variant, quantity: 1, price: 1 },
+          { variant: second_variant, quantity: 2, price: 2 }
+        ],
+        shipment_cost: 3,
+        shipping_method:
+      )
+    end
+
+    it "has the expected attributes" do
+      aggregate_failures "for line items" do
+        expect(order.line_items.count).to eq 2
+        expect(order.line_items[0]).to have_attributes(
+          quantity: 1,
+          price: 1.0
+        )
+        expect(order.line_items[1]).to have_attributes(
+          price: 2.0,
+          quantity: 2
+        )
+      end
+
+      aggregate_failures "for shipments" do
+        expect(order.shipments.count).to eq 1
+        expect(order.shipments[0]).to have_attributes(
+          amount: 3.0,
+          stock_location:
+        )
+
+        expect(order.shipments[0].shipping_method).to eq(shipping_method)
+
+        # Explicitly order by line item id, because otherwise these can be in
+        # an arbitrary order.
+        inventory_units = order.shipments[0].inventory_units.sort_by(&:line_item_id)
+
+        expect(inventory_units.count).to eq(3)
+        expect(inventory_units[0]).to have_attributes(
+          order:,
+          shipment: order.shipments[0],
+          line_item: order.line_items[0],
+          variant: order.line_items[0].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[1]).to have_attributes(
+          order:,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[2]).to have_attributes(
+          order:,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+      end
+
+      expect(order).to have_attributes(
+        item_total: 5.0,
+        ship_total: 3.0,
+        total: 8.0,
+        state: expected_order_state
+      )
+    end
+  end
+
+  context 'when shipments should be taxed' do
+    let!(:ship_address) { create(:address) }
+    let!(:tax_zone) { create(:global_zone) } # will include the above address
+    let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_categories: [tax_category]) }
+
+    let(:tax_category) { create(:tax_category) }
+    let(:shipping_method) { create(:shipping_method, tax_category:, zones: [tax_zone]) }
+
+    it 'shipments get a tax adjustment' do
+      order = create(factory, ship_address:, shipping_method:)
+      shipment = order.shipments[0]
+
+      expect(shipment.additional_tax_total).to be > 0
+    end
+  end
+end
+
+RSpec.shared_examples 'supplied completed_at is respected' do
+  context 'when passed a completed_at timestamp' do
+    let(:completed_at) { 2.days.ago }
+    let(:order) { create(factory, completed_at:) }
+
+    it 'respects the timestamp' do
+      expect(order.completed_at).to be_within(5.seconds).of(completed_at)
+    end
+  end
+
+  context 'when no completed_at timestamp is passed' do
+    let(:order) { create(factory) }
+
+    it 'defaults to the current time' do
+      expect(order.completed_at).to be_within(2.seconds).of(Time.current)
+    end
+  end
+end

data/lib/spree/testing_support/shared_examples/working_factory.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for 'a working factory' do
+  it "builds successfully" do
+    expect(build(factory)).to be_a(factory_class)
+  end
+
+  it "creates successfully" do
+    expect(create(factory)).to be_a(factory_class)
+  end
+
+  it "is creates a valid record" do
+    expect(create(factory)).to be_valid
+  end
+end

data/lib/tasks/colorado_delivery_fee.rake

@@ -16,8 +16,8 @@ namespace :taxes do
       calculator = Spree::Calculator::FlatFee.new
       rate = Spree::TaxRate.create!(
         name: "Colorado Delivery Fee",
-        calculator: calculator,
-        zone: zone,
+        calculator:,
+        zone:,
         amount: 0.27,
         show_rate_in_label: false,
         level: "order"

data/solidus_core.gemspec

@@ -17,27 +17,24 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(spec|script)/})
+    f.match(%r{^(spec|bin)/})
   end
 
-  s.required_ruby_version = '>= 3.0.0'
+  s.required_ruby_version = '>= 3.1.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 7.0', '< 7.1']
+    s.add_dependency rails_dep, ['>= 7.0', '< 8.1.0.beta1']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '< 2.0'
-  s.add_dependency 'awesome_nested_set', '~> 3.3'
+  s.add_dependency 'awesome_nested_set', ['~> 3.3', '>= 3.7.0']
   s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
-  # Adding a constraint here to make sure Rails 7.0 does not crash on startup
-  # https://github.com/rails/rails/pull/54264
-  s.add_dependency 'concurrent-ruby', '< 1.3.5'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'image_processing', '~> 1.10'
@@ -45,9 +42,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
   s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
-  s.add_dependency 'psych', ['>= 4.0.1', '< 5.0']
-  s.add_dependency 'ransack', '~> 2.0'
-  s.add_dependency 'sprockets-rails'
+  s.add_dependency 'psych', ['>= 4.0.1', '< 6.0']
+  s.add_dependency 'ransack', ['~> 4.0', '< 5']
+  s.add_dependency 'sprockets-rails', '!= 3.5.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'omnes', '~> 0.2.2'