solidus_core 2.7.4 → 2.8.0

data/spec/models/spree/calculator/flat_percent_item_total_spec.rb

@@ -5,7 +5,7 @@ require 'shared_examples/calculator_shared_examples'
 
 RSpec.describe Spree::Calculator::FlatPercentItemTotal, type: :model do
   let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new }
-  let(:line_item) { mock_model Spree::LineItem }
+  let(:line_item) { create(:line_item) }
 
   it_behaves_like 'a calculator with a description'
 
@@ -20,6 +20,15 @@ RSpec.describe Spree::Calculator::FlatPercentItemTotal, type: :model do
       expect(calculator.compute(line_item)).to eq 3.10
     end
 
+    it "should round result based on order currency" do
+      line_item.order.currency = 'JPY'
+      allow(line_item).to receive_messages amount: 31.08
+      expect(calculator.compute(line_item)).to eq 3
+
+      allow(line_item).to receive_messages amount: 31.00
+      expect(calculator.compute(line_item)).to eq 3
+    end
+
     it 'returns object.amount if computed amount is greater' do
       allow(calculator).to receive_messages preferred_flat_percent: 110
       allow(line_item).to receive_messages amount: 30.00

data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb

@@ -6,16 +6,23 @@ require 'shared_examples/calculator_shared_examples'
 module Spree
   module Calculator::Shipping
     RSpec.describe FlatPercentItemTotal, type: :model do
-      let(:variant1) { build(:variant, price: 10.11) }
-      let(:variant2) { build(:variant, price: 20.2222) }
-
       it_behaves_like 'a calculator with a description'
 
-      let(:line_item1) { build(:line_item, variant: variant1) }
-      let(:line_item2) { build(:line_item, variant: variant2) }
+      let(:line_item1) { build(:line_item, price: 10.11) }
+      let(:line_item2) { build(:line_item, price: 20.2222) }
+
+      let(:inventory_unit1) { build(:inventory_unit, line_item: line_item1) }
+      let(:inventory_unit2) { build(:inventory_unit, line_item: line_item2) }
 
       let(:package) do
-        build(:stock_package, variants_contents: { variant1 => 2, variant2 => 1 })
+        build(
+          :stock_package,
+          contents: [
+            Spree::Stock::ContentItem.new(inventory_unit1),
+            Spree::Stock::ContentItem.new(inventory_unit1),
+            Spree::Stock::ContentItem.new(inventory_unit2),
+          ]
+        )
       end
 
       subject { FlatPercentItemTotal.new(preferred_flat_percent: 10) }
@@ -24,6 +31,11 @@ module Spree
         expect(subject.compute(package)).to eq(4.04)
       end
 
+      it "should round result based on order currency" do
+        package.order.currency = 'JPY'
+        expect(subject.compute(package)).to eq(4)
+      end
+
       it "should return a bigdecimal" do
         expect(subject.compute(package)).to be_a(BigDecimal)
       end

data/spec/models/spree/calculator/tiered_percent_spec.rb

@@ -135,9 +135,15 @@ RSpec.describe Spree::Calculator::TieredPercent, type: :model do
       end
 
       context "when the order's currency does not match the calculator" do
-        let(:preferred_currency) { "CAD" }
+        let(:preferred_currency) { "JPY" }
         let(:line_item_count) { 1 }
+        let(:price) { 15 }
         it { is_expected.to eq 0 }
+
+        it "rounds based on currency" do
+          allow(order).to receive_messages currency: "JPY"
+          expect(subject).to eq(2)
+        end
       end
     end
 

data/spec/models/spree/country_spec.rb

@@ -60,6 +60,82 @@ RSpec.describe Spree::Country, type: :model do
     end
   end
 
+  describe '.available' do
+    let!(:united_states) { create(:country, iso: 'US') }
+    let!(:canada) { create(:country, iso: 'CA') }
+    let!(:italy) { create(:country, iso: 'IT') }
+    let!(:custom_zone) { create(:zone, name: 'Custom Zone', countries: [united_states, italy]) }
+
+    context 'with a checkout zone defined' do
+      context 'when checkout zone is of type country' do
+        let!(:checkout_zone) { create(:zone, name: 'Checkout Zone', countries: [united_states, canada]) }
+
+        before do
+          Spree::Config.checkout_zone = checkout_zone.name
+        end
+
+        context 'with no arguments' do
+          it 'returns "Checkout Zone" countries' do
+            expect(described_class.available).to contain_exactly(united_states, canada)
+          end
+        end
+
+        context 'setting nil as restricting zone' do
+          it 'returns all countries' do
+            expect(described_class.available(restrict_to_zone: nil)).to contain_exactly(united_states, canada, italy)
+          end
+        end
+
+        context 'setting "Custom Zone" as restricting zone' do
+          it 'returns "Custom Zone" countries' do
+            expect(described_class.available(restrict_to_zone: 'Custom Zone')).to contain_exactly(united_states, italy)
+          end
+        end
+
+        context 'setting "Checkout Zone" as restricting zone' do
+          it 'returns "Checkout Zone" countries' do
+            expect(described_class.available(restrict_to_zone: 'Checkout Zone')).to contain_exactly(united_states, canada)
+          end
+        end
+      end
+
+      context 'when checkout zone is of type state' do
+        let!(:state) { create(:state, country: united_states) }
+        let!(:checkout_zone) { create(:zone, name: 'Checkout Zone', states: [state]) }
+
+        before do
+          Spree::Config[:checkout_zone] = checkout_zone.name
+        end
+
+        context 'with no arguments' do
+          it 'returns all countries' do
+            expect(described_class.available(restrict_to_zone: nil)).to contain_exactly(united_states, canada, italy)
+          end
+        end
+      end
+    end
+
+    context 'with no checkout zone defined' do
+      context 'with no arguments' do
+        it 'returns all countries' do
+          expect(described_class.available).to contain_exactly(united_states, canada, italy)
+        end
+      end
+
+      context 'setting nil as restricting zone' do
+        it 'returns all countries' do
+          expect(described_class.available(restrict_to_zone: nil)).to contain_exactly(united_states, canada, italy)
+        end
+      end
+
+      context 'setting "Custom Zone" as restricting zone' do
+        it 'returns "Custom Zone" countries' do
+          expect(described_class.available(restrict_to_zone: 'Custom Zone')).to contain_exactly(united_states, italy)
+        end
+      end
+    end
+  end
+
   describe '#prices' do
     let(:country) { create(:country) }
     subject { country.prices }

data/spec/models/spree/customer_return_spec.rb

@@ -282,7 +282,8 @@ RSpec.describe Spree::CustomerReturn, type: :model do
           end
 
           context 'when all reimbursements are reimbursed' do
-            before { reimbursement.perform! }
+            let(:created_by_user) { create(:user, email: 'user@email.com') }
+            before { reimbursement.perform!(created_by: created_by_user) }
 
             it { is_expected.to be true }
           end

data/spec/models/spree/fulfilment_changer_spec.rb

@@ -37,6 +37,39 @@ RSpec.describe Spree::FulfilmentChanger do
     variant.stock_items.first.update_column(:count_on_hand, 100)
   end
 
+  context "when the current shipment stock location is the same of the target shipment" do
+    let(:current_shipment_inventory_unit_count) { 1 }
+    let(:quantity) { current_shipment_inventory_unit_count }
+
+    context "when the stock location is empty" do
+      before do
+        variant.stock_items.first.update_column(:count_on_hand, 0)
+      end
+
+      context "when the inventory unit is backordered" do
+        before do
+          current_shipment.inventory_units.first.update state: :backordered
+        end
+
+        it "creates a new backordered inventory unit" do
+          subject
+          expect(desired_shipment.inventory_units.first).to be_backordered
+        end
+      end
+
+      context "when the inventory unit is on hand" do
+        before do
+          current_shipment.inventory_units.first.update state: :on_hand
+        end
+
+        it "creates a new on hand inventory unit" do
+          subject
+          expect(desired_shipment.inventory_units.first).to be_on_hand
+        end
+      end
+    end
+  end
+
   context "when the current shipment has enough inventory units" do
     let(:current_shipment_inventory_unit_count) { 2 }
     let(:quantity) { 1 }

data/spec/models/spree/gallery/product_gallery_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'spree/testing_support/shared_examples/gallery'
+
+RSpec.describe Spree::Gallery::ProductGallery do
+  let(:gallery) { described_class.new(product) }
+  let(:product) { create(:product) }
+
+  shared_context 'has multiple images' do
+    let(:first_image) { build(:image) }
+    let(:second_image) { build(:image) }
+
+    before do
+      product.images << first_image
+      product.images << second_image
+    end
+  end
+
+  it_behaves_like 'a gallery'
+end

data/spec/models/spree/gallery/variant_gallery_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'spree/testing_support/shared_examples/gallery'
+
+RSpec.describe Spree::Gallery::VariantGallery do
+  let(:gallery) { described_class.new(variant) }
+  let(:variant) { build_stubbed(:variant) }
+
+  shared_context 'has multiple images' do
+    let(:first_image) { build(:image) }
+    let(:second_image) { build(:image) }
+
+    before do
+      variant.images << first_image
+      variant.images << second_image
+    end
+  end
+
+  it_behaves_like 'a gallery'
+end

data/spec/models/spree/inventory_unit_spec.rb

@@ -97,8 +97,6 @@ RSpec.describe Spree::InventoryUnit, type: :model do
         shipment.stock_location = stock_location
         shipment.shipping_methods << create(:shipping_method)
         shipment.order = other_order
-        # We don't care about this in this test
-        allow(shipment).to receive(:ensure_correct_adjustment)
         shipment.tap(&:save!)
       end
 
@@ -142,14 +140,13 @@ RSpec.describe Spree::InventoryUnit, type: :model do
     }
 
     it "should create a stock movement" do
+      expect(Spree::Deprecation).to receive(:warn)
       Spree::InventoryUnit.finalize_units!(inventory_units)
       expect(inventory_units.any?(&:pending)).to be false
     end
   end
 
   describe "#current_or_new_return_item" do
-    before { allow(inventory_unit).to receive_messages(total_excluding_vat: 100.0) }
-
     subject { inventory_unit.current_or_new_return_item }
 
     context "associated with a return item" do

data/spec/models/spree/order/checkout_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Spree::Order, type: :model do
         Spree::Order.checkout_flow(&@old_checkout_flow)
       end
 
-      it '.remove_transition' do
+      it '.remove_transition', partial_double_verification: false do
         options = { from: transitions.first.keys.first, to: transitions.first.values.first }
         allow(Spree::Order).to receive(:next_event_transition).and_return([options])
         expect(Spree::Order.remove_transition(options)).to be_truthy
@@ -238,7 +238,7 @@ RSpec.describe Spree::Order, type: :model do
         order.ship_address = ship_address
       end
 
-      context 'when order has default selected_shipping_rate_id' do
+      context 'when order has default selected_shipping_rate_id', partial_double_verification: false do
         let(:shipment) { create(:shipment, order: order) }
         let(:shipping_method) { create(:shipping_method) }
         let(:shipping_rate) {
@@ -277,7 +277,7 @@ RSpec.describe Spree::Order, type: :model do
       end
     end
 
-    context "from delivery" do
+    context "from delivery", partial_double_verification: false do
       let(:ship_address) { FactoryBot.create(:ship_address) }
 
       before do
@@ -537,7 +537,7 @@ RSpec.describe Spree::Order, type: :model do
       end
     end
 
-    context "default credit card" do
+    context "default credit card", partial_double_verification: false do
       before do
         order.user = FactoryBot.create(:user)
         order.store = FactoryBot.create(:store)
@@ -568,7 +568,7 @@ RSpec.describe Spree::Order, type: :model do
       end
     end
 
-    context "a payment fails during processing" do
+    context "a payment fails during processing", partial_double_verification: false do
       before do
         order.user = FactoryBot.create(:user)
         order.email = 'spree@example.org'
@@ -656,7 +656,7 @@ RSpec.describe Spree::Order, type: :model do
       assert_state_changed(order, 'cart', 'complete')
     end
 
-    it "does not attempt to process payments" do
+    it "does not attempt to process payments", partial_double_verification: false do
       order.email = 'user@example.com'
       allow(order).to receive(:ensure_promotions_eligible).and_return(true)
       allow(order).to receive(:ensure_line_item_variants_are_not_deleted).and_return(true)

data/spec/models/spree/order/finalizing_spec.rb

@@ -3,11 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::Order, type: :model do
-  let(:order) { stub_model("Spree::Order") }
-
   context "#finalize!" do
-    let!(:store) { create(:store) }
-    let(:order) { Spree::Order.create(email: 'test@example.com', store: store) }
+    let(:order) { create(:order_ready_to_complete) }
 
     before do
       order.update_column :state, 'complete'
@@ -26,29 +23,13 @@ RSpec.describe Spree::Order, type: :model do
       order.finalize!
     end
 
-    it "should decrease the stock for each variant in the shipment" do
-      order.shipments.each do |shipment|
-        expect(shipment.stock_location).to receive(:decrease_stock_for_variant)
-      end
-      order.finalize!
-    end
-
     it "should change the shipment state to ready if order is paid" do
-      Spree::Shipment.create(order: order)
-      order.shipments.reload
-
       allow(order).to receive_messages(paid?: true, complete?: true)
       order.finalize!
       order.reload # reload so we're sure the changes are persisted
       expect(order.shipment_state).to eq('ready')
     end
 
-    it "should not sell inventory units if track_inventory_levels is false" do
-      Spree::Config.set track_inventory_levels: false
-      expect(Spree::InventoryUnit).not_to receive(:sell_units)
-      order.finalize!
-    end
-
     it "should send an order confirmation email" do
       mail_message = double "Mail::Message"
       expect(Spree::OrderMailer).to receive(:confirm_email).with(order).and_return mail_message

data/spec/models/spree/order/outstanding_balance_integration_spec.rb

@@ -83,13 +83,14 @@ RSpec.describe "Outstanding balance integration tests" do
     context 'with a cancelled item' do
       let(:cancelations) { Spree::OrderCancellations.new(order) }
       let(:cancelled_item) { item_1 }
+      let(:created_by_user) { create(:user, email: 'user@email.com') }
 
       before do
         # Required to refund
         Spree::RefundReason.create!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
 
         cancelations.cancel_unit(cancelled_item.inventory_units.first)
-        cancelations.reimburse_units(cancelled_item.inventory_units)
+        cancelations.reimburse_units(cancelled_item.inventory_units, created_by: created_by_user)
 
         order.reload
       end

data/spec/models/spree/order/updating_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Spree::Order, type: :model do
   let(:order) { create(:order) }
 
   context "#update!" do
-    context "when there are update hooks" do
+    context "when there are update hooks", partial_double_verification: false do
       before { Spree::Order.register_update_hook :foo }
       after { Spree::Order.update_hooks.clear }
       it "should call each of the update hooks" do

data/spec/models/spree/order_cancellations_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Spree::OrderCancellations do
   describe "#cancel_unit" do
-    subject { Spree::OrderCancellations.new(order).cancel_unit(inventory_unit) }
+    subject { described_class.new(order).cancel_unit(inventory_unit) }
     let(:order) { create(:shipped_order, line_items_count: 1) }
     let(:inventory_unit) { order.inventory_units.first }
 
@@ -34,7 +34,8 @@ RSpec.describe Spree::OrderCancellations do
     context "when a whodunnit is specified" do
       subject { order.cancellations.cancel_unit(inventory_unit, whodunnit: "some automated system") }
 
-      it "sets the user on the UnitCancel" do
+      it "sets the user on the UnitCancel and print a deprecation" do
+        expect(Spree::Deprecation).to receive(:warn)
         expect(subject.created_by).to eq("some automated system")
       end
     end
@@ -44,13 +45,28 @@ RSpec.describe Spree::OrderCancellations do
         expect(subject.created_by).to be_nil
       end
     end
+
+    context "when a created_by is specified" do
+      subject { order.cancellations.cancel_unit(inventory_unit, created_by: "some automated system") }
+
+      it "sets the user on the UnitCancel" do
+        expect(subject.created_by).to eq("some automated system")
+      end
+    end
+
+    context "when a created_by is not specified" do
+      it "does not set created_by on the UnitCancel" do
+        expect(subject.created_by).to be_nil
+      end
+    end
   end
 
   describe "#reimburse_units" do
-    subject { Spree::OrderCancellations.new(order).reimburse_units(inventory_units) }
+    subject { described_class.new(order).reimburse_units(inventory_units, created_by: created_by_user) }
     let(:order) { create(:shipped_order, line_items_count: 2) }
     let(:inventory_units) { order.inventory_units }
     let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
+    let(:created_by_user) { create(:user, email: 'user@email.com') }
 
     it "creates and performs a reimbursement" do
       expect { subject }.to change { Spree::Reimbursement.count }.by(1)
@@ -67,7 +83,7 @@ RSpec.describe Spree::OrderCancellations do
   end
 
   describe "#short_ship" do
-    subject { Spree::OrderCancellations.new(order).short_ship([inventory_unit]) }
+    subject { described_class.new(order).short_ship([inventory_unit]) }
 
     let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
     let(:inventory_unit) { order.inventory_units.first }
@@ -94,7 +110,19 @@ RSpec.describe Spree::OrderCancellations do
     end
 
     it "adjusts the order" do
-      expect { subject }.to change { order.total }.by(-10.0)
+      expect { subject }.to change { order.reload.total }.by(-10.0)
+    end
+
+    context "multiple inventory units" do
+      subject { described_class.new(order).short_ship(inventory_units) }
+
+      let(:quantity) { 4 }
+      let!(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: quantity }]) }
+      let(:inventory_units) { Spree::InventoryUnit.find(order.line_items.first.inventory_units.pluck(:id)) }
+
+      it "adjusts the order" do
+        expect { subject }.to change { order.reload.total }.by(-40.0)
+      end
     end
 
     it "sends a cancellation email" do
@@ -105,14 +133,14 @@ RSpec.describe Spree::OrderCancellations do
     end
 
     context "when send_cancellation_mailer is false" do
-      subject { Spree::OrderCancellations.new(order).short_ship([inventory_unit]) }
+      subject { described_class.new(order).short_ship([inventory_unit]) }
 
       before do
-        @original_send_boolean = Spree::OrderCancellations.send_cancellation_mailer
-        Spree::OrderCancellations.send_cancellation_mailer = false
+        @original_send_boolean = described_class.send_cancellation_mailer
+        described_class.send_cancellation_mailer = false
       end
 
-      after { Spree::OrderCancellations.send_cancellation_mailer = @original_send_boolean }
+      after { described_class.send_cancellation_mailer = @original_send_boolean }
 
       it "does not send a cancellation email" do
         expect(Spree::OrderMailer).not_to receive(:inventory_cancellation_email)
@@ -120,8 +148,8 @@ RSpec.describe Spree::OrderCancellations do
       end
     end
 
-    context "with a who" do
-      subject { order.cancellations.short_ship([inventory_unit], whodunnit: 'some automated system') }
+    context "when a created_by is specified" do
+      subject { order.cancellations.short_ship([inventory_unit], created_by: 'some automated system') }
 
       let(:user) { order.user }
 
@@ -131,6 +159,19 @@ RSpec.describe Spree::OrderCancellations do
       end
     end
 
+    context "when a whodunnit is specified" do
+      subject { order.cancellations.short_ship([inventory_unit], whodunnit: 'some automated system') }
+
+      let(:user) { order.user }
+
+      it "sets the user on the UnitCancel and raises a deprecation # WARNING: " do
+        expect(Spree::Deprecation).to receive(:warn)
+
+        expect { subject }.to change { Spree::UnitCancel.count }.by(1)
+        expect(Spree::UnitCancel.last.created_by).to eq("some automated system")
+      end
+    end
+
     context "when rounding is required" do
       let(:order) { create(:order_ready_to_ship, line_items_count: 1, line_items_price: 0.83) }
       let(:line_item) { order.line_items.to_a.first }
@@ -172,11 +213,11 @@ RSpec.describe Spree::OrderCancellations do
         let(:short_ship_tax_notifier) { double }
 
         before do
-          @old_notifier = Spree::OrderCancellations.short_ship_tax_notifier
-          Spree::OrderCancellations.short_ship_tax_notifier = short_ship_tax_notifier
+          @old_notifier = described_class.short_ship_tax_notifier
+          described_class.short_ship_tax_notifier = short_ship_tax_notifier
         end
         after do
-          Spree::OrderCancellations.short_ship_tax_notifier = @old_notifier
+          described_class.short_ship_tax_notifier = @old_notifier
         end
 
         it 'calls the short_ship_tax_notifier' do