solidus_core 2.0.3 → 2.1.0.beta1

data/spec/lib/spree/core/controller_helpers/pricing_spec.rb

@@ -59,5 +59,21 @@ describe Spree::Core::ControllerHelpers::Pricing, type: :controller do
         it { is_expected.to eq('EUR') }
       end
     end
+
+    context "country_iso" do
+      subject { controller.current_pricing_options.country_iso }
+
+      let(:store) { FactoryGirl.create(:store, cart_tax_country_iso: cart_tax_country_iso) }
+
+      context "when the store has a cart tax country set" do
+        let(:cart_tax_country_iso) { "DE" }
+        it { is_expected.to eq("DE") }
+      end
+
+      context "when the store has no cart tax country set" do
+        let(:cart_tax_country_iso) { nil }
+        it { is_expected.to be_nil }
+      end
+    end
   end
 end

data/spec/lib/spree/core/importer/order_spec.rb

@@ -119,13 +119,11 @@ module Spree
       end
 
       it 'handles line_item updating exceptions' do
-        line_items['0'][:currency] = 'GBP'
+        line_items['0'][:price] = 'an invalid price'
         params = { line_items_attributes: line_items }
 
         expect {
-          Spree::Deprecation.silence do
-            Importer::Order.import(user, params)
-          end
+          Importer::Order.import(user, params)
         }.to raise_exception ActiveRecord::RecordInvalid
       end
 
@@ -169,26 +167,37 @@ module Spree
       end
 
       context "with a different currency" do
-        before { variant.prices.create(currency: "GBP", amount: 18.99) }
+        let(:params) { { currency: "GBP" } }
 
         it "sets the order currency" do
-          params = {
-            currency: "GBP"
-          }
           order = Importer::Order.import(user, params)
           expect(order.currency).to eq "GBP"
         end
 
-        it "can handle it when a line order price is specified" do
-          params = {
-            currency: "GBP",
-            line_items_attributes: line_items
-          }
-          line_items["0"].merge! currency: "GBP", price: 1.99
-          order = Importer::Order.import(user, params)
-          expect(order.currency).to eq "GBP"
-          expect(order.line_items.first.price).to eq 1.99
-          expect(order.line_items.first.currency).to eq "GBP"
+        context "when a line item price is specified" do
+          let(:params) { { currency: "GBP", line_items_attributes: line_items } }
+
+          before { line_items["0"][:price] = 1.99 }
+
+          context "and price is present in the order currency" do
+            before { variant.prices.create(currency: "GBP", amount: 18.99) }
+
+            it "assigns a price correctly" do
+              order = Importer::Order.import(user, params)
+
+              expect(order.currency).to eq "GBP"
+              expect(order.line_items.first.price).to eq 1.99
+              expect(order.line_items.first.currency).to eq "GBP"
+            end
+          end
+
+          context "and no price is present in the order currency" do
+            it "raises an exception" do
+              expect {
+                Importer::Order.import(user, params)
+              }.to raise_exception ActiveRecord::RecordInvalid
+            end
+          end
         end
       end
 

data/spec/lib/spree/core/price_migrator_spec.rb

@@ -114,7 +114,9 @@ describe Spree::PriceMigrator do
     end
 
     before do
-      Spree::PriceMigrator.migrate_default_vat_prices
+      Spree::Deprecation.silence do
+        Spree::PriceMigrator.migrate_default_vat_prices
+      end
       order.contents.add(variant)
     end
 

data/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb

@@ -75,6 +75,22 @@ RSpec.describe 'order factory' do
         )
       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_category: tax_category) }
+
+      let(:tax_category) { create(:tax_category) }
+      let(:shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone]) }
+
+      it 'shipments get a tax adjustment' do
+        order = create(factory, ship_address: ship_address, shipping_method: shipping_method)
+        shipment = order.shipments[0]
+
+        expect(shipment.additional_tax_total).to be > 0
+      end
+    end
   end
 
   describe 'order ready to complete' do

data/spec/lib/spree/core/unreturned_item_charger_spec.rb

@@ -49,11 +49,9 @@ describe Spree::UnreturnedItemCharger do
     context 'in tax zone' do
       let!(:tax_zone) { create(:zone, countries: [ship_address.country]) }
       let!(:tax_rate) { create(:tax_rate, zone: tax_zone, tax_category: original_variant.tax_category) }
-      before { tax_zone.update_attributes!(default_tax: true) }
 
       it "applies tax" do
         exchange_order = exchange_shipment.order
-        exchange_order.create_tax_charge!
         exchange_order.update!
         subject
         expect(new_order.additional_tax_total).to be > 0

data/spec/lib/tasks/exchanges_spec.rb

@@ -27,7 +27,8 @@ describe "exchanges:charge_unreturned_items" do
     let(:return_item_1) { build(:exchange_return_item, inventory_unit: order.inventory_units.first) }
     let(:return_item_2) { build(:exchange_return_item, inventory_unit: order.inventory_units.last) }
     let!(:rma) { create(:return_authorization, order: order, return_items: [return_item_1, return_item_2]) }
-    let!(:tax_rate) { create(:tax_rate, zone: order.tax_zone, tax_category: return_item_2.exchange_variant.tax_category) }
+    let(:zone) { create(:zone, countries: [order.tax_address.country])}
+    let!(:tax_rate) { create(:tax_rate, zone: zone, tax_category: return_item_2.exchange_variant.tax_category) }
     before do
       rma.save!
       Spree::Shipment.last.ship!
@@ -44,7 +45,8 @@ describe "exchanges:charge_unreturned_items" do
     let(:return_item_1) { build(:exchange_return_item, inventory_unit: order.inventory_units.first) }
     let(:return_item_2) { build(:exchange_return_item, inventory_unit: order.inventory_units.last) }
     let!(:rma) { create(:return_authorization, order: order, return_items: [return_item_1, return_item_2]) }
-    let!(:tax_rate) { create(:tax_rate, zone: order.tax_zone, tax_category: return_item_2.exchange_variant.tax_category) }
+    let(:zone) { create(:zone, countries: [order.tax_address.country])}
+    let!(:tax_rate) { create(:tax_rate, zone: zone, tax_category: return_item_2.exchange_variant.tax_category) }
 
     before do
       rma.save!

data/spec/lib/tasks/migrations/create_vat_prices_spec.rb

@@ -20,9 +20,11 @@ describe 'solidus:migrations:create_vat_prices' do
       let!(:zone) { create(:zone, :with_country, default_tax: true) }
 
       it 'runs' do
-        expect { task.invoke }.to output(
-          "Creating differentiated prices for VAT countries ... Success.\n"
-        ).to_stdout
+        Spree::Deprecation.silence do
+          expect { task.invoke }.to output(
+            "Creating differentiated prices for VAT countries ... Success.\n"
+          ).to_stdout
+        end
       end
     end
   end

data/spec/models/spree/adjustment_spec.rb

@@ -157,4 +157,140 @@ describe Spree::Adjustment, type: :model do
       end
     end
   end
+
+  describe 'repairing adjustment associations' do
+    context 'on create' do
+      let(:adjustable) { order }
+      let(:adjustment_source) { promotion.actions[0] }
+      let(:order) { create(:order) }
+      let(:promotion) { create(:promotion, :with_line_item_adjustment) }
+
+      def expect_deprecation_warning
+        expect(Spree::Deprecation).to(
+          receive(:warn).
+          with(
+            /Adjustment \d+ was not added to #{adjustable.class} #{adjustable.id}/,
+            instance_of(Array),
+          )
+        )
+      end
+
+      context 'when adding adjustments via the wrong association' do
+        def create_adjustment
+          adjustment_source.adjustments.create!(
+            amount: 10,
+            adjustable: adjustable,
+            order: order,
+            label: 'some label',
+          )
+        end
+
+        context 'when adjustable.adjustments is loaded' do
+          before { adjustable.adjustments.to_a }
+
+          it 'repairs adjustable.adjustments' do
+            expect_deprecation_warning
+            adjustment = create_adjustment
+            expect(adjustable.adjustments).to include(adjustment)
+          end
+
+          context 'when the adjustment is destroyed before after_commit runs' do
+            it 'does not repair' do
+              expect(Spree::Deprecation).not_to receive(:warn)
+              Spree::Adjustment.transaction do
+                adjustment = create_adjustment
+                adjustment.destroy!
+              end
+            end
+          end
+        end
+
+        context 'when adjustable.adjustments is not loaded' do
+          it 'does repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            create_adjustment
+          end
+        end
+      end
+
+      context 'when adding adjustments via the correct association' do
+        def create_adjustment
+          adjustable.adjustments.create!(
+            amount: 10,
+            source: adjustment_source,
+            order: order,
+            label: 'some label',
+          )
+        end
+
+        context 'when adjustable.adjustments is loaded' do
+          before { adjustable.adjustments.to_a }
+
+          it 'does not repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            create_adjustment
+          end
+        end
+
+        context 'when adjustable.adjustments is not loaded' do
+          it 'does not repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            create_adjustment
+          end
+        end
+      end
+    end
+
+    context 'on destroy' do
+      let(:adjustment) { create(:adjustment) }
+      let(:adjustable) { adjustment.adjustable }
+
+      def expect_deprecation_warning(adjustable)
+        expect(Spree::Deprecation).to(
+          receive(:warn).
+          with(
+            /Adjustment #{adjustment.id} was not removed from #{adjustable.class} #{adjustable.id}/,
+            instance_of(Array),
+          )
+        )
+      end
+
+      context 'when destroying adjustments not via association' do
+        context 'when adjustable.adjustments is loaded' do
+          before { adjustable.adjustments.to_a }
+
+          it 'repairs adjustable.adjustments' do
+            expect_deprecation_warning(adjustable)
+            adjustment.destroy!
+            expect(adjustable.adjustments).not_to include(adjustment)
+          end
+        end
+
+        context 'when adjustable.adjustments is not loaded' do
+          it 'does not repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            adjustment.destroy!
+          end
+        end
+      end
+
+      context 'when destroying adjustments via the association' do
+        context 'when adjustable.adjustments is loaded' do
+          before { adjustable.adjustments.to_a }
+
+          it 'does not repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            adjustable.adjustments.destroy(adjustment)
+          end
+        end
+
+        context 'when adjustable.adjustments is not loaded' do
+          it 'does not repair' do
+            expect(Spree::Deprecation).not_to receive(:warn)
+            adjustable.adjustments.destroy(adjustment)
+          end
+        end
+      end
+    end
+  end
 end

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

@@ -1,14 +1,18 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::DefaultTax, type: :model do
   let(:address) { create(:address) }
-  let!(:zone) { create(:zone, name: "Country Zone", default_tax: true, countries: [tax_rate_country]) }
+  let!(:zone) { create(:zone, name: "Country Zone", default_tax: default_tax, countries: [tax_rate_country]) }
   let(:tax_rate_country) { address.country }
   let(:tax_category) { create(:tax_category) }
   let!(:rate) { create(:tax_rate, tax_category: tax_category, amount: 0.05, included_in_price: included_in_price, zone: zone) }
   let(:included_in_price) { false }
+  let(:default_tax) { false }
   subject(:calculator) { Spree::Calculator::DefaultTax.new(calculable: rate ) }
 
+  it_behaves_like 'a calculator with a description'
+
   context "#compute" do
     context "when given an order" do
       let(:order) do
@@ -70,17 +74,17 @@ describe Spree::Calculator::DefaultTax, type: :model do
         end
 
         context "when the order's tax address is outside the default VAT zone" do
-          let(:order_zone) { create(:zone, countries: [address.country]) }
+          let(:default_tax) { true }
           let(:default_vat_country) { create(:country, iso: "DE") }
 
           before do
             rate.zone.update(countries: [default_vat_country])
-            # The order has to be reloaded here because of tax zone caching.
-            order.reload
           end
 
           it 'creates a negative amount, indicating a VAT refund' do
-            expect(subject.compute(order)).to eq(-2.86)
+            Spree::Deprecation.silence do
+              expect(subject.compute(order)).to eq(-2.86)
+            end
           end
         end
       end
@@ -108,15 +112,17 @@ describe Spree::Calculator::DefaultTax, type: :model do
         end
 
         context "when the order's tax address is outside the default VAT zone" do
-          let!(:order_zone) { create(:zone, countries: [address.country]) }
           let(:default_vat_country) { create(:country, iso: "DE") }
+          let(:default_tax) { true }
 
           before do
             rate.zone.update(countries: [default_vat_country])
           end
 
           it 'creates a negative amount, indicating a VAT refund' do
-            expect(subject.compute(item)).to eq(-1.43)
+            Spree::Deprecation.silence do
+              expect(subject.compute(item)).to eq(-1.43)
+            end
           end
         end
       end

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

@@ -1,9 +1,12 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::FlatPercentItemTotal, type: :model do
   let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new }
   let(:line_item) { mock_model Spree::LineItem }
 
+  it_behaves_like 'a calculator with a description'
+
   before { allow(calculator).to receive_messages preferred_flat_percent: 10 }
 
   context "compute" do

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

@@ -1,8 +1,11 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::FlatRate, type: :model do
   let(:calculator) { Spree::Calculator::FlatRate.new }
 
+  it_behaves_like 'a calculator with a description'
+
   let(:order) do
     mock_model(
       Spree::Order, quantity: 10, currency: "USD"

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

@@ -1,8 +1,11 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::FlexiRate, type: :model do
   let(:calculator) { Spree::Calculator::FlexiRate.new }
 
+  it_behaves_like 'a calculator with a description'
+
   let(:order) do
     mock_model(
       Spree::Order, quantity: 10

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
+
+describe Spree::Calculator::FreeShipping, type: :model do
+  it_behaves_like 'a calculator with a description'
+end

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

@@ -1,15 +1,20 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 module Spree
   class Calculator
     describe PercentOnLineItem, type: :model do
-      let(:line_item) { double("LineItem", amount: 100) }
+      context "compute" do
+        let(:line_item) { double("LineItem", amount: 100) }
 
-      before { subject.preferred_percent = 15 }
+        before { subject.preferred_percent = 15 }
 
-      it "computes based on item price and quantity" do
-        expect(subject.compute(line_item)).to eq 15
+        it "computes based on item price and quantity" do
+          expect(subject.compute(line_item)).to eq 15
+        end
       end
+
+      it_behaves_like 'a calculator with a description'
     end
   end
 end