solidus_core 1.1.4 → 1.2.0.beta1

data/spec/models/spree/reimbursement_spec.rb

@@ -228,4 +228,26 @@ describe Spree::Reimbursement, type: :model do
       expect(subject.customer_return).to eq customer_return
     end
   end
+
+  describe "#return_all" do
+    subject { reimbursement.return_all }
+
+    let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
+    let(:order)                  { create(:shipped_order, line_items_count: 1) }
+    let(:inventory_unit)         { order.inventory_units.first }
+    let(:return_item)            { build(:return_item, inventory_unit: inventory_unit) }
+    let(:reimbursement)          { build(:reimbursement, order: order, return_items: [return_item]) }
+
+    it "accepts all the return items" do
+      expect { subject }.to change { return_item.acceptance_status }.to "accepted"
+    end
+
+    it "persists the reimbursement" do
+      expect { subject }.to change { reimbursement.persisted? }.to true
+    end
+
+    it "performs a reimbursment" do
+      expect { subject }.to change { reimbursement.refunds.count }.by(1)
+    end
+  end
 end

data/spec/models/spree/return_item_spec.rb

@@ -18,7 +18,7 @@ describe Spree::ReturnItem, :type => :model do
   end
 
   describe '#receive!' do
-    let(:now)            { Time.now }
+    let(:now)            { Time.current }
     let(:order)          { create(:shipped_order)}
     let(:inventory_unit) { create(:inventory_unit, order: order,state: 'shipped') }
     let!(:customer_return) { create(:customer_return_without_return_items, return_items: [return_item], stock_location_id: inventory_unit.shipment.stock_location_id) }
@@ -660,7 +660,7 @@ describe Spree::ReturnItem, :type => :model do
       let(:old_reception_status) { 'cancelled' }
 
       it 'succeeds' do
-        expect { subject.save! }.to_not raise_error
+        subject.save!
       end
     end
 

data/spec/models/spree/shipment_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'benchmark'
 
-describe Spree::Shipment, :type => :model do
-  let(:stock_location) { create(:stock_location) }
+describe Spree::Shipment, type: :model do
   let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
   let(:shipping_method) { create(:shipping_method, name: "UPS") }
   let(:stock_location) { create(:stock_location) }
@@ -33,11 +32,9 @@ describe Spree::Shipment, :type => :model do
     end
   end
 
-  # Regression test for #4063
+  # Regression test for https://github.com/spree/spree/issues/4063
   context "number generation" do
-    before do
-      allow(order).to receive :update!
-    end
+    before { allow(order).to receive :update! }
 
     it "generates a number containing a letter + 11 numbers" do
       shipment.save
@@ -210,6 +207,11 @@ describe Spree::Shipment, :type => :model do
         expect(shipment.refresh_rates).to eq([])
       end
 
+      it 'uses the pluggable estimator class' do
+        expect(Spree::StockConfiguration).to receive(:estimator_class).and_call_original
+        shipment.refresh_rates
+      end
+
       context 'to_package' do
         let(:inventory_units) do
           [build(:inventory_unit, line_item: line_item, variant: variant, state: 'on_hand'),
@@ -314,7 +316,7 @@ describe Spree::Shipment, :type => :model do
         shipment.update!(order)
       end
 
-      # Regression test for #4347
+      # Regression test for https://github.com/spree/spree/issues/4347
       context "with adjustments" do
         before do
           shipment.adjustments << Spree::Adjustment.create(order: order, label: "Label", amount: 5)
@@ -322,7 +324,7 @@ describe Spree::Shipment, :type => :model do
 
         it "transitions to shipped" do
           shipment.update_column(:state, "ready")
-          expect { shipment.ship! }.not_to raise_error
+          shipment.ship!
         end
       end
     end
@@ -493,7 +495,7 @@ describe Spree::Shipment, :type => :model do
   end
 
   context "#ready" do
-    # Regression test for #2040
+    # Regression test for https://github.com/spree/spree/issues/2040
     it "cannot ready a shipment for an order if the order is unpaid" do
       expect(order).to receive_messages(paid?: false)
       expect(shipment).not_to be_can_ready
@@ -633,7 +635,7 @@ describe Spree::Shipment, :type => :model do
     end
   end
 
-  # Regression test for #3349
+  # Regression test for https://github.com/spree/spree/issues/3349
   context "#destroy" do
     it "destroys linked shipping_rates" do
       reflection = Spree::Shipment.reflect_on_association(:shipping_rates)
@@ -641,8 +643,8 @@ describe Spree::Shipment, :type => :model do
     end
   end
 
-  # Regression test for #4072 (kinda)
-  # The need for this was discovered in the research for #4702
+  # Regression test for https://github.com/spree/spree/issues/4072 (kinda)
+  # The need for this was discovered in the research for https://github.com/spree/spree/issues/4702
   context "state changes" do
     before do
       # Must be stubbed so transition can succeed
@@ -750,4 +752,18 @@ describe Spree::Shipment, :type => :model do
       end
     end
   end
+
+  describe ".by_store" do
+    it "returns shipments by store" do
+      olivanders_store = create(:store, name: 'Olivanders')
+      wizard_shipment = create(:shipment, order: create(:order, store: olivanders_store))
+      create(:shipment, order: build(:order, store: create(:store, name: 'Target')))
+
+      shipments = Spree::Shipment.by_store(olivanders_store)
+
+      expect(Spree::Shipment.count).to eq(2)
+      expect(shipments.count).to eq(1)
+      expect(shipments.first).to eq(wizard_shipment)
+    end
+  end
 end

data/spec/models/spree/shipping_method_spec.rb

@@ -20,7 +20,7 @@ describe Spree::ShippingMethod, :type => :model do
     end
   end
 
-  # Regression test for #4492
+  # Regression test for https://github.com/spree/spree/issues/4492
   context "#shipments" do
     let!(:shipping_method) { create(:shipping_method) }
     let!(:shipment) do
@@ -77,7 +77,7 @@ describe Spree::ShippingMethod, :type => :model do
     end
   end
 
-  # Regression test for #4320
+  # Regression test for https://github.com/spree/spree/issues/4320
   context "soft deletion" do
     let(:shipping_method) { create(:shipping_method) }
     it "soft-deletes when destroy is called" do

data/spec/models/spree/shipping_rate_spec.rb

@@ -97,14 +97,14 @@ describe Spree::ShippingRate, :type => :model do
     end
   end
 
-  # Regression test for #3829
+  # Regression test for https://github.com/spree/spree/issues/3829
   context "#shipping_method" do
     it "can be retrieved" do
       expect(shipping_rate.shipping_method.reload).to eq(shipping_method)
     end
 
     it "can be retrieved even when deleted" do
-      shipping_method.update_column(:deleted_at, Time.now)
+      shipping_method.update_column(:deleted_at, Time.current)
       shipping_rate.save
       shipping_rate.reload
       expect(shipping_rate.shipping_method).to eq(shipping_method)
@@ -123,7 +123,7 @@ describe Spree::ShippingRate, :type => :model do
     end
 
     it "can be retrieved even when deleted" do
-      tax_rate.update_column(:deleted_at, Time.now)
+      tax_rate.update_column(:deleted_at, Time.current)
       shipping_rate.save
       shipping_rate.reload
       expect(shipping_rate.tax_rate).to eq(tax_rate)

data/spec/models/spree/stock/coordinator_spec.rb

@@ -15,6 +15,11 @@ module Spree
           expect(subject).to receive(:estimate_packages).ordered
           subject.packages
         end
+
+        it 'uses the pluggable estimator class' do
+          expect(Spree::StockConfiguration).to receive(:estimator_class).and_call_original
+          subject.packages
+        end
       end
 
       describe "#shipments" do

data/spec/models/spree/stock/estimator_spec.rb

@@ -117,7 +117,7 @@ module Spree
             expect(subject.shipping_rates(package).map(&:shipping_method_id)).to eq([generic_method.id])
           end
 
-          # regression for #3287
+          # regression for https://github.com/spree/spree/issues/3287
           it "doesn't select backend rates even if they're more affordable" do
             expect(subject.shipping_rates(package).map(&:selected)).to eq [true]
           end
@@ -140,6 +140,40 @@ module Spree
             expect(shipping_rates.first.tax_rate).to eq(tax_rate)
           end
         end
+
+        it 'uses the configured shipping rate selector' do
+          shipping_rate = Spree::ShippingRate.new
+          allow(Spree::ShippingRate).to receive(:new).and_return(shipping_rate)
+
+          selector_class = Class.new do
+            def initialize(_); end;
+
+            def find_default
+              Spree::ShippingRate.new
+            end
+          end
+          Spree::Config.shipping_rate_selector_class = selector_class
+
+          subject.shipping_rates(package)
+
+          expect(shipping_rate.selected).to eq(true)
+
+          Spree::Config.shipping_rate_selector_class = nil
+        end
+
+        it 'uses the configured shipping rate sorter' do
+          class Spree::Stock::TestSorter; end;
+          Spree::Config.shipping_rate_sorter_class = Spree::Stock::TestSorter
+
+          sorter = double(:sorter, sort: nil)
+          allow(Spree::Stock::TestSorter).to receive(:new).and_return(sorter)
+
+          subject.shipping_rates(package)
+
+          expect(sorter).to have_received(:sort)
+
+          Spree::Config.shipping_rate_sorter_class = nil
+        end
       end
     end
   end

data/spec/models/spree/stock/package_spec.rb

@@ -47,7 +47,7 @@ module Spree
         expect(item.quantity).to eq 1
       end
 
-      # Contains regression test for #2804
+      # Contains regression test for https://github.com/spree/spree/issues/2804
       it 'builds a list of shipping methods common to all categories' do
         category1 = create(:shipping_category)
         category2 = create(:shipping_category)

data/spec/models/spree/stock/packer_spec.rb

@@ -28,9 +28,8 @@ module Spree
         end
 
         it 'variants are added as backordered without enough on_hand' do
-          expect(stock_location).to receive(:fill_status).exactly(5).times.and_return(
-            *(Array.new(3, [1,0]) + Array.new(2, [0,1]))
-          )
+          inventory_units[0..2].each { |iu| stock_location.stock_item(iu.variant_id).set_count_on_hand(1) }
+          inventory_units[3..4].each { |iu| stock_location.stock_item(iu.variant_id).set_count_on_hand(0) }
 
           package = subject.default_package
           expect(package.on_hand.size).to eq 3

data/spec/models/spree/stock/shipping_rate_selector_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Spree::Stock::ShippingRateSelector do
+  describe '#sort' do
+    it 'sorts by increasing cost' do
+      cheapest_shipping_rate = Spree::ShippingRate.new(cost: 1.00)
+      middle_shipping_rate = Spree::ShippingRate.new(cost: 5.00)
+      expensive_shipping_rate = Spree::ShippingRate.new(cost: 42.00)
+      shipping_rates = [expensive_shipping_rate, middle_shipping_rate, cheapest_shipping_rate]
+
+      sorter = Spree::Stock::ShippingRateSelector.new(shipping_rates)
+
+      expect(sorter.find_default).to eq(cheapest_shipping_rate)
+    end
+  end
+end

data/spec/models/spree/stock/shipping_rate_sorter_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Spree::Stock::ShippingRateSorter do
+  describe '#sort' do
+    it 'sorts by increasing cost' do
+      cheapest_shipping_rate = Spree::ShippingRate.new(cost: 1.00)
+      middle_shipping_rate = Spree::ShippingRate.new(cost: 5.00)
+      expensive_shipping_rate = Spree::ShippingRate.new(cost: 42.00)
+      shipping_rates = [expensive_shipping_rate, middle_shipping_rate, cheapest_shipping_rate]
+
+      sorter = Spree::Stock::ShippingRateSorter.new(shipping_rates)
+
+      expect(sorter.sort).to eq([cheapest_shipping_rate, middle_shipping_rate, expensive_shipping_rate])
+    end
+  end
+end

data/spec/models/spree/stock_item_spec.rb

@@ -77,7 +77,7 @@ describe Spree::StockItem, :type => :model do
         subject.update_column(:count_on_hand, -2)
       end
 
-      # Regression test for #3755
+      # Regression test for https://github.com/spree/spree/issues/3755
       it "processes existing backorders, even with negative stock" do
         expect(inventory_unit).to receive(:fill_backorder)
         expect(inventory_unit_2).not_to receive(:fill_backorder)
@@ -85,7 +85,7 @@ describe Spree::StockItem, :type => :model do
         expect(subject.count_on_hand).to eq(-1)
       end
 
-      # Test for #3755
+      # Test for https://github.com/spree/spree/issues/3755
       it "does not process backorders when stock is adjusted negatively" do
         expect(inventory_unit).not_to receive(:fill_backorder)
         expect(inventory_unit_2).not_to receive(:fill_backorder)
@@ -149,7 +149,7 @@ describe Spree::StockItem, :type => :model do
     before { Spree::StockMovement.create(stock_item: subject, quantity: 1) }
 
     it "doesnt raise ReadOnlyRecord error" do
-      expect { subject.destroy }.not_to raise_error
+      subject.destroy
     end
   end
 
@@ -157,9 +157,7 @@ describe Spree::StockItem, :type => :model do
     before { subject.destroy }
 
     it "recreates stock item just fine" do
-      expect {
-        stock_location.stock_items.create!(variant: subject.variant)
-      }.not_to raise_error
+      stock_location.stock_items.create!(variant: subject.variant)
     end
 
     it "doesnt allow recreating more than one stock item at once" do
@@ -264,7 +262,7 @@ describe Spree::StockItem, :type => :model do
     end
   end
 
-  # Regression test for #4651
+  # Regression test for https://github.com/spree/spree/issues/4651
   context "variant" do
     it "can be found even if the variant is deleted" do
       subject.variant.destroy

data/spec/models/spree/stock_location_spec.rb

@@ -170,10 +170,7 @@ module Spree
       end
 
       it 'zero on_hand with all backordered' do
-        zero_stock_item = mock_model(StockItem,
-                                     count_on_hand: 0,
-                                     backorderable?: true)
-        expect(subject).to receive(:stock_item).with(variant).and_return(zero_stock_item)
+        stock_item.set_count_on_hand(0)
 
         on_hand, backordered = subject.fill_status(variant, 20)
         expect(on_hand).to eq 0
@@ -182,12 +179,11 @@ module Spree
 
       context 'when backordering is not allowed' do
         before do
-          @stock_item = mock_model(StockItem, backorderable?: false)
-          expect(subject).to receive(:stock_item).with(variant).and_return(@stock_item)
+          stock_item.update!(backorderable: false)
         end
 
         it 'all on_hand' do
-          allow(@stock_item).to receive_messages(count_on_hand: 10)
+          stock_item.set_count_on_hand(10)
 
           on_hand, backordered = subject.fill_status(variant, 5)
           expect(on_hand).to eq 5
@@ -195,7 +191,7 @@ module Spree
         end
 
         it 'some on_hand' do
-          allow(@stock_item).to receive_messages(count_on_hand: 10)
+          stock_item.set_count_on_hand(10)
 
           on_hand, backordered = subject.fill_status(variant, 20)
           expect(on_hand).to eq 10
@@ -203,7 +199,7 @@ module Spree
         end
 
         it 'zero on_hand' do
-          allow(@stock_item).to receive_messages(count_on_hand: 0)
+          stock_item.set_count_on_hand(0)
 
           on_hand, backordered = subject.fill_status(variant, 20)
           expect(on_hand).to eq 0

data/spec/models/spree/stock_transfer_spec.rb

@@ -48,7 +48,7 @@ module Spree
 
       context "finalized" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -56,7 +56,7 @@ module Spree
 
       context "shipped" do
         before do
-          stock_transfer.update_attributes(shipped_at: Time.now)
+          stock_transfer.update_attributes(shipped_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -64,7 +64,7 @@ module Spree
 
       context "closed" do
         before do
-          stock_transfer.update_attributes(closed_at: Time.now)
+          stock_transfer.update_attributes(closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -72,7 +72,7 @@ module Spree
 
       context "finalized and closed" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now, closed_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current, closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -80,7 +80,7 @@ module Spree
 
       context "shipped and closed" do
         before do
-          stock_transfer.update_attributes(shipped_at: Time.now, closed_at: Time.now)
+          stock_transfer.update_attributes(shipped_at: Time.current, closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -88,7 +88,7 @@ module Spree
 
       context "finalized and shipped" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now, shipped_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current, shipped_at: Time.current)
         end
 
         it { is_expected.to eq true }
@@ -100,7 +100,7 @@ module Spree
 
       context "finalized" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -108,7 +108,7 @@ module Spree
 
       context "shipped" do
         before do
-          stock_transfer.update_attributes(shipped_at: Time.now)
+          stock_transfer.update_attributes(shipped_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -116,7 +116,7 @@ module Spree
 
       context "closed" do
         before do
-          stock_transfer.update_attributes(closed_at: Time.now)
+          stock_transfer.update_attributes(closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -124,7 +124,7 @@ module Spree
 
       context "finalized and closed" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now, closed_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current, closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -132,7 +132,7 @@ module Spree
 
       context "shipped and closed" do
         before do
-          stock_transfer.update_attributes(shipped_at: Time.now, closed_at: Time.now)
+          stock_transfer.update_attributes(shipped_at: Time.current, closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -165,7 +165,7 @@ module Spree
 
       context "can't be finalized" do
         before do
-          stock_transfer.update_attributes(finalized_at: Time.now)
+          stock_transfer.update_attributes(finalized_at: Time.current)
         end
 
         it "doesn't set a finalized_at date" do
@@ -225,7 +225,7 @@ module Spree
 
       context "stock transfer is finalized" do
         before do
-          stock_transfer.update_attributes!(finalized_at: Time.now)
+          stock_transfer.update_attributes!(finalized_at: Time.current)
         end
 
         it "doesn't destroy the stock transfer" do
@@ -249,6 +249,26 @@ module Spree
       end
     end
 
+    describe '#ship' do
+      let(:stock_transfer) { create(:stock_transfer, tracking_number: "ABC123") }
+
+      context "tracking number is provided" do
+        subject { stock_transfer.ship(tracking_number: "XYZ123") }
+
+        it "updates the tracking number" do
+          expect { subject }.to change { stock_transfer.tracking_number }.from("ABC123").to("XYZ123")
+        end
+      end
+
+      context "tracking number is not provided" do
+        subject { stock_transfer.ship }
+
+        it "preserves the existing tracking number" do
+          expect { subject }.to_not change { stock_transfer.tracking_number }.from("ABC123")
+        end
+      end
+    end
+
     describe '#transfer' do
       let(:stock_transfer) { create(:stock_transfer_with_items) }