solidus_core 2.2.2 → 2.3.0.beta1

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

@@ -147,7 +147,8 @@ describe Spree::Order, type: :model do
           it_behaves_like "it references the user's the default address" do
             let(:address_kind) { :bill }
             before do
-              order.user = FactoryGirl.create(:user, bill_address: default_address)
+              order.user = FactoryGirl.create(:user)
+              order.user.default_address = default_address
               order.next!
               order.reload
             end
@@ -184,7 +185,7 @@ describe Spree::Order, type: :model do
 
       it "recalculates tax and updates totals" do
         zone = create(:zone, countries: [order.tax_address.country])
-        create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05, zone: zone)
+        create(:tax_rate, tax_categories: [line_item.tax_category], amount: 0.05, zone: zone)
         order.next!
         expect(order).to have_attributes(
           adjustment_total: 0.5,
@@ -589,22 +590,6 @@ describe Spree::Order, type: :model do
       end
     end
 
-    context 'a shipment has no shipping rates' do
-      let(:order) { create(:order_with_line_items, state: 'confirm') }
-      let(:shipment) { order.shipments.first }
-
-      before do
-        shipment.shipping_rates.destroy_all
-      end
-
-      it 'clears the shipments and fails the transition' do
-        expect(order.complete).to eq(false)
-        expect(order.errors[:base]).to include(Spree.t(:items_cannot_be_shipped))
-        expect(order.shipments.count).to eq(0)
-        expect(Spree::InventoryUnit.where(shipment_id: shipment.id).count).to eq(0)
-      end
-    end
-
     context 'the order is already paid' do
       let(:order) { create(:order_with_line_items) }
 

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

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Order::NumberGenerator do
+  subject { described_class.new.generate }
+
+  it { is_expected.to be_a(String) }
+
+  describe 'length' do
+    let(:default_length) do
+      Spree::Order::ORDER_NUMBER_LENGTH + Spree::Order::ORDER_NUMBER_PREFIX.length
+    end
+
+    it { expect(subject.length).to eq default_length }
+
+    context "when length option is 5" do
+      let(:option_length) { 5 + Spree::Order::ORDER_NUMBER_PREFIX.length }
+
+      subject { described_class.new(length: 5).generate }
+
+      it "should be 5 plus default prefix length" do
+        expect(subject.length).to eq option_length
+      end
+    end
+  end
+
+  context "when letters option is true" do
+    subject { described_class.new(letters: true).generate }
+
+    it "generates order number including letters" do
+      is_expected.to match /[A-Z]/
+    end
+  end
+
+  describe 'prefix' do
+    it { is_expected.to match /^#{Spree::Order::ORDER_NUMBER_PREFIX}/ }
+
+    context "when prefix option is 'P'" do
+      subject { described_class.new(prefix: 'P').generate }
+
+      it "generates order number prefixed with 'P'" do
+        is_expected.to match /^P/
+      end
+    end
+  end
+end

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

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+# This method in particular has been difficult to get right.
+# Many things will affect this amount
+#
+# See also:
+# https://github.com/solidusio/solidus/issues/1254
+# https://github.com/spree/spree/issues/6229
+# https://github.com/solidusio/solidus/issues/1107
+# https://github.com/solidusio/solidus/pull/1557
+# https://github.com/solidusio/solidus/pull/1536
+
+RSpec.describe "Outstanding balance integration tests" do
+  let!(:order) { create(:order_with_line_items, line_items_count: 2, line_items_price: 3, shipment_cost: 13) }
+  let(:item_1) { order.line_items[0] }
+  let(:item_2) { order.line_items[1] }
+  before { order.update_attributes!(state: 'complete', completed_at: Time.now) }
+
+  subject do
+    order.reload
+    order.update!
+    order.outstanding_balance
+  end
+
+  context 'when the order is unpaid' do
+    it { should eq order.total }
+    it { should eq 19 }
+
+    context 'when the order is cancelled' do
+      before { order.cancel! }
+      it { should eq 0 }
+    end
+  end
+
+  context 'when the order is fully paid' do
+    let!(:payment) { create(:payment, :completed, order: order, amount: order.total) }
+    it { should eq 0 }
+
+    context 'and there is a full refund' do
+      let!(:refund) { create(:refund, payment: payment, amount: payment.amount) }
+      it { should eq 19 }
+    end
+
+    context 'when the order is cancelled' do
+      before { order.update_attributes!(state: "canceled") }
+      it { should eq(-19) }
+
+      context 'and the payment is voided' do
+        before { payment.update_attributes!(state: "void") }
+        it { should eq 0 }
+      end
+
+      context 'and there is a full refund' do
+        let!(:refund) { create(:refund, payment: payment, amount: payment.amount) }
+        it { should eq 0 }
+      end
+
+      context 'and there is a partial refund' do
+        let!(:refund) { create(:refund, payment: payment, amount: 6) }
+        it { should eq(-13) }
+      end
+    end
+
+    context 'with a removed item' do
+      before do
+        item_amount = item_1.final_amount
+        order.contents.remove(item_1.variant)
+        create(:refund, payment: payment, amount: item_amount)
+      end
+
+      it { should eq(0) }
+    end
+
+    context 'when the order is adjusted downward by an admin' do
+      let!(:adjustment) { create(:adjustment, order: order, adjustable: item_1, amount: -1, source: nil) }
+      let!(:refund) { create(:refund, payment: payment, amount: 1) }
+
+      it { should eq(0) }
+    end
+
+    context 'with a cancelled item' do
+      let(:cancelations) { Spree::OrderCancellations.new(order) }
+      let(:cancelled_item) { item_1 }
+
+      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)
+
+        order.reload
+      end
+
+      it 'discounts the cancelled item amount' do
+        expect(order.refund_total).to eq(3)
+        expect(order.reimbursement_total).to eq(3)
+        expect(order.payment_total).to eq(16)
+        expect(order.outstanding_balance).to eq(0)
+
+        expect(order.total).to eq(19)
+      end
+    end
+  end
+
+  context 'when the order is partly paid' do
+    let!(:payment) { create(:payment, :completed, order: order, amount: 10) }
+    it { should eq 9 }
+
+    context 'and there is a full refund' do
+      let!(:refund) { create(:refund, payment: payment, amount: payment.amount) }
+      it { should eq 19 }
+    end
+
+    context 'when the order is cancelled' do
+      before { order.update_attributes!(state: "canceled") }
+      it { should eq(-10) }
+
+      context 'and the payment is voided' do
+        before { payment.update_attributes!(state: "void") }
+        it { should eq 0 }
+      end
+
+      context 'and there is a full refund' do
+        let!(:refund) { create(:refund, payment: payment, amount: payment.amount) }
+        it { should eq 0 }
+      end
+
+      context 'and there is a partial refund' do
+        let!(:refund) { create(:refund, payment: payment, amount: 6) }
+        it { should eq(-4) }
+      end
+    end
+  end
+end

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

@@ -182,8 +182,13 @@ module Spree
         context "for canceled orders" do
           before { order.update_attributes(state: 'canceled') }
 
-          it "it should be a negative amount incorporating reimbursements" do
-            expect(order.outstanding_balance).to eq(-10)
+          it "it should be zero" do
+            expect(order.total).to eq(110)
+            expect(order.payments.sum(:amount)).to eq(10)
+            expect(order.refund_total).to eq(10)
+            expect(order.reimbursement_total).to eq(10)
+            expect(order.payment_total).to eq(0)
+            expect(order.outstanding_balance).to eq(0)
           end
         end
 

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

@@ -43,7 +43,7 @@ describe Spree::Order, type: :model do
       end
 
       it "adjusts tax rates when transitioning to delivery" do
-        expect(Spree::Tax::OrderAdjuster).to receive(:new).once.with(order).and_call_original
+        expect(Spree::TaxCalculator::Default).to receive(:new).once.with(order).and_call_original
         order.next!
       end
     end
@@ -82,7 +82,9 @@ describe Spree::Order, type: :model do
     end
 
     it "should send a cancel email" do
-      order.cancel!
+      perform_enqueued_jobs do
+        order.cancel!
+      end
 
       mail = ActionMailer::Base.deliveries.last
       expect(mail.subject).to include "Cancellation"

data/spec/models/spree/order_capturing_spec.rb

@@ -38,7 +38,7 @@ describe Spree::OrderCapturing do
 
       let!(:product) { create(:product, price: 10.00) }
       let!(:variant) do
-        create(:variant, price: 10, product: product, track_inventory: false, tax_category: tax_rate.tax_category)
+        create(:variant, price: 10, product: product, track_inventory: false, tax_category: tax_rate.tax_categories.first)
       end
       let!(:shipping_method) { create(:free_shipping_method) }
       let(:tax_rate) { create(:tax_rate, amount: 0.1, zone: create(:global_zone, name: "Some Tax Zone")) }
@@ -58,10 +58,10 @@ describe Spree::OrderCapturing do
       context "payment method ordering" do
         let(:secondary_payment_method) { SecondaryBogusPaymentMethod }
 
-        class SecondaryBogusPaymentMethod < Spree::Gateway::Bogus; end
+        class SecondaryBogusPaymentMethod < Spree::PaymentMethod::BogusCreditCard; end
 
         context "SecondaryBogusPaymentMethod payments are prioritized" do
-          let(:payment_methods) { [SecondaryBogusPaymentMethod, Spree::Gateway::Bogus] }
+          let(:payment_methods) { [SecondaryBogusPaymentMethod, Spree::PaymentMethod::BogusCreditCard] }
 
           it "captures SecondaryBogusPaymentMethod payments first" do
             @bogus_payment.update!(amount: bogus_total + 100)
@@ -72,7 +72,7 @@ describe Spree::OrderCapturing do
         end
 
         context "Bogus payments are prioritized" do
-          let(:payment_methods) { [Spree::Gateway::Bogus, SecondaryBogusPaymentMethod] }
+          let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, SecondaryBogusPaymentMethod] }
 
           it "captures Bogus payments first" do
             @secondary_bogus_payment.update!(amount: secondary_total + 100)
@@ -89,7 +89,7 @@ describe Spree::OrderCapturing do
 
           before do
             allow(Spree::OrderCapturing).to receive(:sorted_payment_method_classes).and_return(
-              [SecondaryBogusPaymentMethod, Spree::Gateway::Bogus]
+              [SecondaryBogusPaymentMethod, Spree::PaymentMethod::BogusCreditCard]
             )
           end
 
@@ -103,7 +103,7 @@ describe Spree::OrderCapturing do
 
       context "when a payment is not needed to capture the entire order" do
         let(:secondary_payment_method) { SecondaryBogusPaymentMethod }
-        let(:payment_methods) { [Spree::Gateway::Bogus, SecondaryBogusPaymentMethod] }
+        let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, SecondaryBogusPaymentMethod] }
 
         before do
           @bogus_payment.update!(amount: order.total)
@@ -132,9 +132,9 @@ describe Spree::OrderCapturing do
         let(:secondary_payment_method) { ExceptionallyBogusPaymentMethod }
         let(:bogus_total) { order.total - 1 }
         let(:secondary_total) { 1 }
-        let(:payment_methods) { [Spree::Gateway::Bogus, ExceptionallyBogusPaymentMethod] }
+        let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, ExceptionallyBogusPaymentMethod] }
 
-        class ExceptionallyBogusPaymentMethod < Spree::Gateway::Bogus
+        class ExceptionallyBogusPaymentMethod < Spree::PaymentMethod::BogusCreditCard
           def capture(*_args)
             raise ActiveMerchant::ConnectionError.new("foo", nil)
           end

data/spec/models/spree/order_contents_spec.rb

@@ -123,7 +123,7 @@ describe Spree::OrderContents, type: :model do
     describe 'tax calculations' do
       let!(:zone) { create(:global_zone) }
       let!(:tax_rate) do
-        create(:tax_rate, zone: zone, tax_category: variant.tax_category)
+        create(:tax_rate, zone: zone, tax_categories: [variant.tax_category])
       end
 
       context 'when the order has a taxable address' do
@@ -203,6 +203,13 @@ describe Spree::OrderContents, type: :model do
       expect(order.reload.find_line_item_by_variant(variant)).to be_nil
     end
 
+    it 'should remove line_item if quantity is greater than line_item quantity' do
+      subject.add(variant, 1)
+      subject.remove(variant, 2)
+
+      expect(order.reload.find_line_item_by_variant(variant)).to be_nil
+    end
+
     it "should update order totals" do
       expect(order.item_total.to_f).to eq(0.00)
       expect(order.total.to_f).to eq(0.00)

data/spec/models/spree/order_shipping_spec.rb

@@ -19,7 +19,11 @@ describe Spree::OrderShipping do
 
     describe "shipment email" do
       it "should send a shipment email" do
-        expect { subject }.to change { emails.size }.by(1)
+        expect {
+          perform_enqueued_jobs {
+            subject
+          }
+        }.to change { emails.size }.by(1)
         expect(emails.last.subject).to eq("#{order.store.name} Shipment Notification ##{order.number}")
       end
     end