solidus_core 4.3.6 → 4.4.0

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/spree/user_class_handle.rb

@@ -21,8 +21,8 @@ module Spree
     # @return [String] the name of the user class as a string.
     # @raise [RuntimeError] if Spree.user_class is nil
     def to_s
-      fail "'Spree.user_class' has not been set yet." unless Spree.user_class_name
-      "::#{Spree.user_class_name}"
+      fail "'Spree.user_class' has not been set yet." unless Spree.user_class
+      "::#{Spree.user_class}"
     end
   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

@@ -20,19 +20,19 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   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.2']
+    s.add_dependency rails_dep, ['>= 7.0', '< 8.0.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'
   s.add_dependency 'discard', '~> 1.0'
@@ -43,10 +43,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'monetize', '~> 1.8'
   s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
   s.add_dependency 'psych', ['>= 4.0.1', '< 6.0']
-  # @note ransack 4.2 contains a bug which has not yet been addressed.
-  # @see https://github.com/activerecord-hackery/ransack/pull/1468
-  s.add_dependency 'ransack', ['~> 4.0', '< 4.2']
-  s.add_dependency 'sprockets-rails'
+  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'