solidus_core 2.0.3 → 2.1.0.beta1

data/spec/models/spree/reimbursement_spec.rb

@@ -49,7 +49,7 @@ describe Spree::Reimbursement, type: :model do
     let!(:adjustments)            { [] } # placeholder to ensure it gets run prior the "before" at this level
 
     let!(:tax_rate)               { nil }
-    let!(:tax_zone)               { create :zone, :with_country, default_tax: true }
+    let!(:tax_zone)               { create :zone, :with_country }
     let(:shipping_method)         { create :shipping_method, zones: [tax_zone] }
     let(:variant)                 { create :variant }
     let(:order)                   { create(:order_with_line_items, state: 'payment', line_items_attributes: [{ variant: variant, price: line_items_price }], shipment_cost: 0, shipping_method: shipping_method) }

data/spec/models/spree/reimbursement_tax_calculator_spec.rb

@@ -24,7 +24,7 @@ describe Spree::ReimbursementTaxCalculator, type: :model do
 
   context 'with additional tax' do
     let!(:tax_rate) { create(:tax_rate, name: "Sales Tax", amount: 0.10, included_in_price: false, zone: tax_zone) }
-    let(:tax_zone) { create(:zone, :with_country, default_tax: true) }
+    let(:tax_zone) { create(:zone, :with_country) }
 
     it 'sets additional_tax_total on the return items' do
       subject
@@ -37,7 +37,7 @@ describe Spree::ReimbursementTaxCalculator, type: :model do
 
   context 'with included tax' do
     let!(:tax_rate) { create(:tax_rate, name: "VAT Tax", amount: 0.1, included_in_price: true, zone: tax_zone) }
-    let(:tax_zone) { create(:zone, :with_country, default_tax: true) }
+    let(:tax_zone) { create(:zone, :with_country) }
 
     it 'sets included_tax_total on the return items' do
       subject

data/spec/models/spree/shipment_spec.rb

@@ -118,10 +118,23 @@ describe Spree::Shipment, type: :model do
   end
 
   context "#item_cost" do
+    let(:shipment) { order.shipments[0] }
+
+    let(:order) do
+      create(
+        :order_ready_to_ship,
+        line_items_attributes: [{ price: 10, variant: variant }],
+        ship_address: ship_address,
+      )
+    end
+
+    let!(:ship_address) { create(:address) }
+    let!(:tax_zone) { create(:global_zone) } # will include the above address
+    let!(:tax_rate) { create(:tax_rate, amount: 0.1, zone: tax_zone, tax_category: tax_category) }
+    let(:tax_category) { create(:tax_category) }
+    let(:variant) { create(:variant, tax_category: tax_category) }
+
     it 'should equal line items final amount with tax' do
-      shipment = create(:shipment, order: create(:order_with_totals))
-      create :tax_adjustment, adjustable: shipment.order.line_items.first, order: shipment.order
-      shipment.order.update!
       expect(shipment.item_cost).to eql(11.0)
     end
   end
@@ -523,66 +536,59 @@ describe Spree::Shipment, type: :model do
 
   context "updates cost when selected shipping rate is present" do
     let(:shipment) { create(:shipment) }
-
-    before { allow(shipment).to receive_message_chain :selected_shipping_rate, cost: 5 }
+    before { shipment.selected_shipping_rate.update!(cost: 5) }
 
     it "updates shipment totals" do
-      shipment.update_amounts
-      expect(shipment.reload.cost).to eq(5)
-    end
-
-    it "factors in additional adjustments to adjustment total" do
-      shipment.adjustments.create!(
-        order:    order,
-        label:    "Additional",
-        amount:   5,
-        included: false,
-        finalized: true
-      )
-      shipment.update_amounts
-      expect(shipment.reload.adjustment_total).to eq(5)
-    end
-
-    it "does not factor in included adjustments to adjustment total" do
-      shipment.adjustments.create!(
-        order:    order,
-        label:    "Included",
-        amount:   5,
-        included: true,
-        finalized: true
-      )
-      shipment.update_amounts
-      expect(shipment.reload.adjustment_total).to eq(0)
+      expect {
+        shipment.update_amounts
+      }.to change { shipment.cost }.to(5)
     end
   end
 
   context "changes shipping rate via general update" do
-    let(:store) { create :store }
+    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_category: tax_category) }
+    let(:tax_category) { create(:tax_category) }
+
     let(:order) do
-      Spree::Order.create(
-        payment_total: 100,
-        payment_state: 'paid',
-        total: 100,
-        item_total: 100,
-        store: store
+      create(
+        :order_ready_to_ship,
+        ship_address: ship_address,
+        shipment_cost: 10,
+        shipping_method: ten_dollar_shipping_method,
+        line_items_count: 1,
+        line_items_price: 100,
       )
     end
 
-    let(:shipment) { Spree::Shipment.create order_id: order.id }
+    let(:ten_dollar_shipping_method)    { create(:shipping_method, tax_category: tax_category, zones: [tax_zone], cost: 10) }
+    let(:twenty_dollar_shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone], cost: 20) }
 
-    let(:shipping_rate) do
-      Spree::ShippingRate.create shipment_id: shipment.id, cost: 10
-    end
+    let(:shipment) { order.shipments[0] }
 
-    before do
-      shipment.update_attributes_and_order selected_shipping_rate_id: shipping_rate.id
+    let(:twenty_dollar_shipping_rate) do
+      create(:shipping_rate, cost: 20, shipment: shipment, shipping_method: twenty_dollar_shipping_method)
     end
 
     it "updates everything around order shipment total and state" do
-      expect(shipment.cost.to_f).to eq 10
+      expect(shipment.state).to eq 'ready'
+      expect(shipment.cost).to eq 10
+      expect(shipment.additional_tax_total).to eq 1
+
+      expect(order.shipment_total).to eq 10
+      expect(order.total).to eq 121 # shipment: 10 + 1 (tax) + line item: 100 + 10 (tax)
+      expect(order.payment_state).to eq 'paid'
+
+      shipment.update_attributes_and_order selected_shipping_rate_id: twenty_dollar_shipping_rate.id
+
       expect(shipment.state).to eq 'pending'
-      expect(shipment.order.total.to_f).to eq 110
-      expect(shipment.order.payment_state).to eq 'balance_due'
+      expect(shipment.cost).to eq 20
+      expect(shipment.additional_tax_total).to eq 2
+
+      expect(order.shipment_total).to eq 20
+      expect(order.total).to eq 132 # shipment: 20 + 2 (tax) + line item: 100 + 10 (tax)
+      expect(order.payment_state).to eq 'balance_due'
     end
   end
 
@@ -648,9 +654,21 @@ describe Spree::Shipment, type: :model do
 
   # 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)
-      expect(reflection.options[:dependent]).to be(:delete_all)
+    let(:shipping_rate) do
+      Spree::ShippingRate.create!(
+        shipping_method: shipping_method,
+        selected: true,
+        taxes: [Spree::ShippingRateTax.new(amount: 20)]
+      )
+    end
+    it "destroys linked shipping_rates and shipping_rate_taxes" do
+      shipping_rate = shipment.shipping_rates.first
+      shipping_rate_tax = shipping_rate.taxes.first
+
+      shipment.destroy
+
+      expect{shipping_rate.reload}.to raise_error(ActiveRecord::RecordNotFound)
+      expect{shipping_rate_tax.reload}.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 

data/spec/models/spree/shipping_method_spec.rb

@@ -210,4 +210,45 @@ describe Spree::ShippingMethod, type: :model do
       it { is_expected.to_not include(shipping_method) }
     end
   end
+
+  describe "display_on=" do
+    subject do
+      Spree::Deprecation.silence do
+        described_class.new(display_on: display_on).available_to_users
+      end
+    end
+
+    context "with 'back_end'" do
+      let(:display_on) { 'back_end' }
+      it { should be false }
+    end
+
+    context "with 'both'" do
+      let(:display_on) { 'both' }
+      it { should be true }
+    end
+
+    context "with 'front_end'" do
+      let(:display_on) { 'front_end' }
+      it { should be true }
+    end
+  end
+
+  describe "display_on" do
+    subject do
+      Spree::Deprecation.silence do
+        described_class.new(available_to_users: available_to_users).display_on
+      end
+    end
+
+    context "when available_to_users is true" do
+      let(:available_to_users) { true }
+      it { should == 'both' }
+    end
+
+    context "when available_to_users is false" do
+      let(:available_to_users) { false }
+      it { should == 'back_end' }
+    end
+  end
 end

data/spec/models/spree/shipping_rate_spec.rb

@@ -19,8 +19,9 @@ describe Spree::ShippingRate, type: :model do
   end
 
   context "#display_price" do
-    let!(:default_zone) { create :zone, countries: [address.country], default_tax: true }
+    let!(:default_zone) { create :zone, countries: [address.country], default_tax: default_tax }
     let!(:other_zone) { create :zone, countries: [foreign_address.country] }
+    let(:default_tax) { false }
 
     before do
       allow(order).to receive(:tax_address).and_return(order_address)
@@ -57,6 +58,7 @@ describe Spree::ShippingRate, type: :model do
     end
 
     context 'with one tax rate that will be refunded' do
+      let(:default_tax) { true }
       let!(:tax_rate) do
         create :tax_rate,
         included_in_price: true,
@@ -68,7 +70,9 @@ describe Spree::ShippingRate, type: :model do
       let(:order_address) { foreign_address }
 
       before do
-        Spree::Tax::ShippingRateTaxer.new.tax(shipping_rate)
+        Spree::Deprecation.silence do
+          Spree::Tax::ShippingRateTaxer.new.tax(shipping_rate)
+        end
       end
 
       it "shows correct tax amount" do
@@ -141,7 +145,9 @@ describe Spree::ShippingRate, type: :model do
       end
 
       it "shows correct tax amount" do
-        expect(shipping_rate.display_price.to_s).to eq("$10.00 (+ $1.00 Sales Tax, + $0.50 Other Sales Tax)")
+        expect(shipping_rate.display_price.to_s).to match(/\$10.00 \(.*, .*\)/)
+        expect(shipping_rate.display_price.to_s).to include("+ $1.00 Sales Tax")
+        expect(shipping_rate.display_price.to_s).to include("+ $0.50 Other Sales Tax")
       end
 
       context "when cost is zero" do

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

@@ -126,7 +126,7 @@ module Spree
 
         context "involves backend only shipping methods" do
           before{ Spree::ShippingMethod.destroy_all }
-          let!(:backend_method) { create(:shipping_method, display_on: "back_end", cost: 0.00) }
+          let!(:backend_method) { create(:shipping_method, available_to_users: false, cost: 0.00) }
           let!(:generic_method) { create(:shipping_method, cost: 5.00) }
 
           it "does not return backend rates at all" do
@@ -140,7 +140,9 @@ module Spree
         end
 
         context "includes tax adjustments if applicable" do
-          let!(:tax_rate) { create(:tax_rate, zone: order.tax_zone) }
+          let(:zone) { create(:zone, countries: [order.tax_address.country])}
+
+          let!(:tax_rate) { create(:tax_rate, zone: zone) }
 
           before do
             shipping_method.update!(tax_category: tax_rate.tax_category)

data/spec/models/spree/store_credit_spec.rb

@@ -38,7 +38,7 @@ describe Spree::StoreCredit do
         allow(store_credit.category).to receive(:non_expiring?).and_return(false)
       end
 
-      it "sets the credit type to non-expiring" do
+      it "sets the credit type to expiring" do
         subject
         expect(store_credit.credit_type.name).to eq "Expiring"
       end
@@ -414,7 +414,7 @@ describe Spree::StoreCredit do
         expect(subject).to be true
       end
 
-      it "returns the capture amount to the store credit" do
+      it "returns the authorized amount to the store credit" do
         expect { subject }.to change{ store_credit.amount_authorized.to_f }.by(-authorized_amount)
       end
 
@@ -519,7 +519,7 @@ describe Spree::StoreCredit do
             @new_store_credit = Spree::StoreCredit.last
           end
 
-          it "does not set the amount used on hte originating store credit" do
+          it "does not set the amount used on the originating store credit" do
             expect(store_credit.reload.amount_used).to eq amount_used
           end
 

data/spec/models/spree/tax/item_adjuster_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 RSpec.describe Spree::Tax::ItemAdjuster do
   subject(:adjuster) { described_class.new(item) }
   let(:order) { create(:order) }
-  let(:item) { Spree::LineItem.new(order: order) }
+  let(:item) { create(:line_item, order: order) }
 
-  before do
-    allow(order).to receive(:tax_zone) { build(:zone) }
+  def tax_adjustments
+    item.adjustments.tax.to_a
   end
 
   describe 'initialization' do
@@ -19,39 +19,48 @@ RSpec.describe Spree::Tax::ItemAdjuster do
     end
   end
 
-  describe '#adjust!' do
-    before do
-      expect(order).to receive(:tax_zone).and_return(tax_zone)
+  shared_examples_for 'untaxed item' do
+    it 'creates no adjustments' do
+      adjuster.adjust!
+      expect(tax_adjustments).to eq([])
     end
 
-    context 'when the order has no tax zone' do
-      let(:tax_zone) { nil }
+    context 'with an existing tax adjustment' do
+      let!(:existing_adjustment) { create(:tax_adjustment, adjustable: item) }
 
-      before do
-        allow(order).to receive(:tax_zone).and_return(nil)
+      it 'removes the existing adjustment' do
         adjuster.adjust!
+        aggregate_failures do
+          expect(tax_adjustments).to eq([])
+          expect(Spree::Adjustment).to_not be_exists(existing_adjustment.id)
+        end
       end
+    end
+  end
 
-      it 'returns nil early' do
-        expect(adjuster.adjust!).to be_nil
-      end
+  describe '#adjust!' do
+    before do
+      expect(order).to receive(:tax_address).at_least(:once).and_return(address)
     end
 
-    context 'when the order has a tax zone' do
+    context 'when the order has no tax zone' do
+      let(:address) { Spree::Tax::TaxLocation.new }
+
+      it_behaves_like 'untaxed item'
+    end
+
+    context 'when the order has a taxable address' do
       let(:item) { build_stubbed :line_item, order: order }
-      let(:tax_zone) { build_stubbed(:zone, :with_country) }
+      let(:address) { order.tax_address }
 
       before do
-        expect(Spree::TaxRate).to receive(:for_zone).with(tax_zone).and_return(rates_for_order_zone)
-        expect(Spree::TaxRate).to receive(:for_zone).with(Spree::Zone.default_tax).and_return([])
+        expect(Spree::TaxRate).to receive(:for_address).with(order.tax_address).and_return(rates_for_order_zone)
       end
 
       context 'when there are no matching rates' do
         let(:rates_for_order_zone) { [] }
 
-        it 'returns no adjustments' do
-          expect(adjuster.adjust!).to eq([])
-        end
+        it_behaves_like 'untaxed item'
       end
 
       context 'when there are matching rates for the zone' do
@@ -64,7 +73,8 @@ RSpec.describe Spree::Tax::ItemAdjuster do
           before { allow(item).to receive(:tax_category).and_return(item_tax_category) }
 
           it 'creates an adjustment for every matching rate' do
-            expect(adjuster.adjust!.length).to eq(1)
+            adjuster.adjust!
+            expect(tax_adjustments.length).to eq(1)
           end
         end
       end

data/spec/models/spree/tax/order_adjuster_spec.rb

@@ -12,32 +12,28 @@ RSpec.describe Spree::Tax::OrderAdjuster do
   end
 
   describe '#adjust!' do
-    let(:zone) { build_stubbed(:zone) }
     let(:line_items) { build_stubbed_list(:line_item, 2) }
     let(:order) { build_stubbed(:order, line_items: line_items) }
     let(:rates_for_order_zone) { [] }
+    let(:rates_for_default_zone) { [] }
     let(:item_adjuster) { Spree::Tax::ItemAdjuster.new(line_items.first) }
 
     before do
-      expect(order).to receive(:tax_zone).at_least(:once).and_return(zone)
-      expect(Spree::TaxRate).to receive(:for_zone).with(zone).and_return(rates_for_order_zone)
-      expect(Spree::TaxRate).to receive(:for_zone).with(Spree::Zone.default_tax).and_return([])
+      expect(Spree::TaxRate).to receive(:for_address).with(order.tax_address).and_return(rates_for_order_zone)
     end
 
     it 'calls the item adjuster with all line items' do
       expect(Spree::Tax::ItemAdjuster).to receive(:new).
                                             with(
                                               line_items.first,
-                                              rates_for_order_zone: rates_for_order_zone,
-                                              rates_for_default_zone: [],
-                                              order_tax_zone: zone,
+                                              rates_for_order: rates_for_order_zone,
+                                              rates_for_default_zone: rates_for_default_zone
                                             ).and_return(item_adjuster)
       expect(Spree::Tax::ItemAdjuster).to receive(:new).
                                             with(
                                               line_items.second,
-                                              rates_for_order_zone: rates_for_order_zone,
-                                              rates_for_default_zone: [],
-                                              order_tax_zone: zone,
+                                              rates_for_order: rates_for_order_zone,
+                                              rates_for_default_zone: rates_for_default_zone
                                             ).and_return(item_adjuster)
 
       expect(item_adjuster).to receive(:adjust!).twice

data/spec/models/spree/tax/taxation_integration_spec.rb

@@ -624,6 +624,25 @@ RSpec.describe "Taxation system integration tests" do
           federal_books_tax.destroy!
           expect(line_item.adjustments.count).to eq(2)
         end
+
+        context 'when tax address is later cleared' do
+          before do
+            order.ship_address = nil
+            order.update!
+          end
+
+          it 'removes all tax adjustments' do
+            aggregate_failures do
+              expect(line_item.adjustments.tax.count).to eq(0)
+              expect(line_item).to have_attributes(
+                price: 20,
+                total: 20,
+                included_tax_total: 0,
+                additional_tax_total: 0
+              )
+            end
+          end
+        end
       end
 
       context 'an order with a book and a shipment' do