spree_core 3.1.14 → 3.2.0.rc1

data/spec/models/spree/adjustable/adjuster/tax_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe Spree::Adjustable::Adjuster::Tax, type: :model do
+  let(:order) { create :order_with_line_items, line_items_count: 1 }
+  let(:line_item) { order.line_items.first }
+
+  let(:subject) { Spree::Adjustable::AdjustmentsUpdater.new(line_item) }
+  let(:order_subject) { Spree::Adjustable::AdjustmentsUpdater.new(order) }
+
+  context "taxes with promotions" do
+    let!(:tax_rate) do
+      create(:tax_rate, amount: 0.05)
+    end
+
+    let!(:promotion) do
+      Spree::Promotion.create(name: "$10 off")
+    end
+
+    let!(:promotion_action) do
+      calculator = Spree::Calculator::FlatRate.new(preferred_amount: 10)
+      Spree::Promotion::Actions::CreateItemAdjustments.create(calculator: calculator,
+                                                              promotion: promotion)
+    end
+
+    before do
+      line_item.price = 20
+      line_item.tax_category = tax_rate.tax_category
+      line_item.save
+      create(:adjustment, order: order, source: promotion_action, adjustable: line_item)
+    end
+
+    context "tax included in price" do
+      before do
+        create(:adjustment,
+               source: tax_rate,
+               adjustable: line_item,
+               order: order,
+               included: true)
+      end
+
+      it "tax has no bearing on final price" do
+        subject.update
+        line_item.reload
+        expect(line_item.included_tax_total).to eq(0.5)
+        expect(line_item.additional_tax_total).to eq(0)
+        expect(line_item.promo_total).to eq(-10)
+        expect(line_item.adjustment_total).to eq(-10)
+      end
+
+      it "tax linked to order" do
+        order_subject.update
+        order.reload
+        expect(order.included_tax_total).to eq(0.5)
+        expect(order.additional_tax_total).to eq(00)
+      end
+    end
+
+    context "tax excluded from price" do
+      before do
+        create(:adjustment,
+               source: tax_rate,
+               adjustable: line_item,
+               order: order,
+               included: false)
+      end
+
+      it "tax applies to line item" do
+        subject.update
+        line_item.reload
+        # Taxable amount is: $20 (base) - $10 (promotion) = $10
+        # Tax rate is 5% (of $10).
+        expect(line_item.included_tax_total).to eq(0)
+        expect(line_item.additional_tax_total).to eq(0.5)
+        expect(line_item.promo_total).to eq(-10)
+        expect(line_item.adjustment_total).to eq(-9.5)
+      end
+
+      it "tax linked to order" do
+        order_subject.update
+        order.reload
+        expect(order.included_tax_total).to eq(0)
+        expect(order.additional_tax_total).to eq(0.5)
+      end
+    end
+  end
+end

data/spec/models/spree/adjustable/adjustments_updater_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Spree
+  module Adjustable
+    describe AdjustmentsUpdater do
+      let(:order) { create :order_with_line_items, line_items_count: 1 }
+      let(:line_item) { order.line_items.first }
+
+      let(:subject) { AdjustmentsUpdater.new(line_item) }
+      let(:order_subject) { AdjustmentsUpdater.new(order) }
+
+      describe '#update' do
+        it "updates all linked adjusters" do
+          tax_rate = create(:tax_rate, amount: 0.05)
+          create(:adjustment, order: order, source: tax_rate, adjustable: line_item)
+          line_item.price = 10
+          line_item.tax_category = tax_rate.tax_category
+
+          subject.update
+          expect(line_item.adjustment_total).to eq(0.5)
+          expect(line_item.additional_tax_total).to eq(0.5)
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/adjustment_spec.rb

@@ -0,0 +1,189 @@
+# encoding: utf-8
+#
+
+require 'spec_helper'
+
+describe Spree::Adjustment, type: :model do
+
+  let(:order) { Spree::Order.new }
+
+  before do
+    allow(order).to receive(:update_with_updater!)
+  end
+
+  let(:adjustment) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: order, order: order, amount: 5) }
+
+  describe 'scopes' do
+    describe '.for_complete_order' do
+      let(:complete_order) { Spree::Order.create! completed_at: Time.current }
+      let(:incomplete_order) { Spree::Order.create! completed_at: nil }
+      let(:adjustment_for_complete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: complete_order, order: complete_order, amount: 5) }
+      let(:adjustment_for_incomplete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: incomplete_order, order: incomplete_order, amount: 5) }
+
+      subject { Spree::Adjustment.for_complete_order }
+
+      it { is_expected.to include(adjustment_for_complete_order) }
+      it { is_expected.to_not include(adjustment_for_incomplete_order) }
+    end
+
+    describe '.for_incomplete_order' do
+      let(:complete_order) { Spree::Order.create! completed_at: Time.current }
+      let(:incomplete_order) { Spree::Order.create! completed_at: nil }
+      let(:adjustment_for_complete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: complete_order, order: complete_order, amount: 5) }
+      let(:adjustment_for_incomplete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: incomplete_order, order: incomplete_order, amount: 5) }
+
+      subject { Spree::Adjustment.for_incomplete_order }
+
+      it { is_expected.to_not include(adjustment_for_complete_order) }
+      it { is_expected.to include(adjustment_for_incomplete_order) }
+    end
+  end
+
+  context '#create & #destroy' do
+    let(:adjustment) { Spree::Adjustment.new(label: "Adjustment", amount: 5, order: order, adjustable: create(:line_item)) }
+
+    it 'calls #update_adjustable_adjustment_total' do
+      expect(adjustment).to receive(:update_adjustable_adjustment_total).twice
+      adjustment.save
+      adjustment.destroy
+    end
+  end
+
+  context '#save' do
+    let(:order) { Spree::Order.create! }
+    let!(:adjustment) { Spree::Adjustment.create(label: "Adjustment", amount: 5, order: order, adjustable: order) }
+
+    it 'touches the adjustable' do
+      expect(adjustment.adjustable).to receive(:touch)
+      adjustment.amount = 3
+      adjustment.save
+    end
+  end
+
+  describe 'non_tax scope' do
+    subject do
+      Spree::Adjustment.non_tax.to_a
+    end
+
+    let!(:tax_adjustment) { create(:adjustment, order: order, source: create(:tax_rate)) }
+    let!(:non_tax_adjustment_with_source) { create(:adjustment, order: order, source_type: 'Spree::Order', source_id: nil) }
+    let!(:non_tax_adjustment_without_source) { create(:adjustment, order: order, source: nil) }
+
+    it 'select non-tax adjustments' do
+      expect(subject).to_not include tax_adjustment
+      expect(subject).to include non_tax_adjustment_with_source
+      expect(subject).to include non_tax_adjustment_without_source
+    end
+  end
+
+  describe 'competing_promos scope' do    
+    before do
+      allow_any_instance_of(Spree::Adjustment).to receive(:update_adjustable_adjustment_total).and_return(true)
+    end
+
+    subject do
+      Spree::Adjustment.competing_promos.to_a
+    end
+
+    let!(:promotion_adjustment) { create(:adjustment, order: order, source_type: 'Spree::PromotionAction', source_id: nil) }
+    let!(:custom_adjustment_with_source) { create(:adjustment, order: order, source_type: 'Custom', source_id: nil) }
+    let!(:non_promotion_adjustment_with_source) { create(:adjustment, order: order, source_type: 'Spree::Order', source_id: nil) }
+    let!(:non_promotion_adjustment_without_source) { create(:adjustment, order: order, source: nil) }
+
+    context 'no custom source_types have been added to competing_promos' do
+      before { Spree::Adjustment.competing_promos_source_types = ['Spree::PromotionAction'] }
+
+      it 'selects promotion adjustments by default' do
+        expect(subject).to include promotion_adjustment
+        expect(subject).to_not include custom_adjustment_with_source
+        expect(subject).to_not include non_promotion_adjustment_with_source
+        expect(subject).to_not include non_promotion_adjustment_without_source
+      end
+    end
+
+    context 'a custom source_type has been added to competing_promos' do
+      before { Spree::Adjustment.competing_promos_source_types = ['Spree::PromotionAction', 'Custom'] }
+
+      it 'selects adjustments with registered source_types' do
+        expect(subject).to include promotion_adjustment
+        expect(subject).to include custom_adjustment_with_source
+        expect(subject).to_not include non_promotion_adjustment_with_source
+        expect(subject).to_not include non_promotion_adjustment_without_source
+      end
+    end
+  end
+
+
+  context "adjustment state" do
+    let(:adjustment) { create(:adjustment, order: order, state: 'open') }
+
+    context "#closed?" do
+      it "is true when adjustment state is closed" do
+        adjustment.state = "closed"
+        expect(adjustment).to be_closed
+      end
+
+      it "is false when adjustment state is open" do
+        adjustment.state = "open"
+        expect(adjustment).to_not be_closed
+      end
+    end
+  end
+
+  context '#currency' do
+    it 'returns the globally configured currency' do
+      expect(adjustment.currency).to eq 'USD'
+    end
+  end
+
+  context "#display_amount" do
+    before { adjustment.amount = 10.55 }
+
+    it "shows the amount" do
+      expect(adjustment.display_amount.to_s).to eq "$10.55"
+    end
+
+    context "with currency set to JPY" do
+      context "when adjustable is set to an order" do
+        before do
+          expect(order).to receive(:currency).and_return('JPY')
+          adjustment.adjustable = order
+        end
+
+        it "displays in JPY" do
+          expect(adjustment.display_amount.to_s).to eq "¥11"
+        end
+      end
+
+      context "when adjustable is nil" do
+        it "displays in the default currency" do
+          expect(adjustment.display_amount.to_s).to eq "$10.55"
+        end
+      end
+    end
+  end
+
+  context '#update!' do
+    context "when adjustment is closed" do
+      before { expect(adjustment).to receive(:closed?).and_return(true) }
+
+      it "does not update the adjustment" do
+        expect(adjustment).to_not receive(:update_column)
+        adjustment.update!
+      end
+    end
+
+    context "when adjustment is open" do
+      before { expect(adjustment).to receive(:closed?).and_return(false) }
+
+      it "updates the amount" do
+        expect(adjustment).to receive(:adjustable).and_return(double("Adjustable")).at_least(1).times
+        expect(adjustment).to receive(:source).and_return(double("Source")).at_least(1).times
+        expect(adjustment.source).to receive("compute_amount").with(adjustment.adjustable).and_return(5)
+        expect(adjustment).to receive(:update_columns).with(amount: 5, updated_at: kind_of(Time))
+        adjustment.update!
+      end
+    end
+  end
+
+end

data/spec/models/spree/app_configuration_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Spree::AppConfiguration, type: :model do
+  let (:prefs) { Rails.application.config.spree.preferences }
+
+  it "should be available from the environment" do
+    prefs.layout = "my/layout"
+    expect(prefs.layout).to eq "my/layout"
+  end
+
+  it "should be available as Spree::Config for legacy access" do
+    Spree::Config.layout = "my/layout"
+    expect(Spree::Config.layout).to eq "my/layout"
+  end
+
+  it "uses base searcher class by default" do
+    prefs.searcher_class = nil
+    expect(prefs.searcher_class).to eq Spree::Core::Search::Base
+  end
+
+  describe 'admin_path' do
+    it { expect(Spree::Config).to have_preference(:admin_path) }
+    it { expect(Spree::Config.preferred_admin_path_type).to eq(:string) }
+    it { expect(Spree::Config.preferred_admin_path_default).to eq('/admin') }
+  end
+end

data/spec/models/spree/asset_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Spree::Asset, type: :model do
+  describe "#viewable" do
+    it "touches association" do
+      Timecop.scale(3600) do
+
+        product = create(:custom_product)
+        asset   = Spree::Asset.create! { |a| a.viewable = product.master }
+
+        expect do
+          asset.touch
+        end.to change { product.reload.updated_at }
+      end
+    end
+  end
+
+  describe "#acts_as_list scope" do
+    it "should start from first position for different viewables" do
+      asset1 = Spree::Asset.create(viewable_type: 'Spree::Image', viewable_id: 1)
+      asset2 = Spree::Asset.create(viewable_type: 'Spree::LineItem', viewable_id: 1)
+
+      expect(asset1.position).to eq 1
+      expect(asset2.position).to eq 1
+    end
+  end
+
+end

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

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+describe Spree::Calculator::DefaultTax, type: :model do
+  let!(:country) { create(:country) }
+  let!(:zone) { create(:zone, name: "Country Zone", default_tax: true, zone_members: []) }
+  let!(:tax_category) { create(:tax_category, tax_rates: []) }
+  let!(:rate) { create(:tax_rate, tax_category: tax_category, amount: 0.05, included_in_price: included_in_price) }
+  let(:included_in_price) { false }
+  let!(:calculator) { Spree::Calculator::DefaultTax.new(calculable: rate) }
+  let!(:order) { create(:order) }
+  let!(:line_item) { create(:line_item, price: 10, quantity: 3, tax_category: tax_category) }
+  let!(:shipment) { create(:shipment, cost: 15) }
+
+  context "#compute" do
+    context "when given an order" do
+      let!(:line_item_1) { line_item }
+      let!(:line_item_2) { create(:line_item, price: 10, quantity: 3, tax_category: tax_category) }
+
+      before do
+        allow(order).to receive_messages line_items: [line_item_1, line_item_2]
+      end
+
+      context "when no line items match the tax category" do
+        before do
+          line_item_1.tax_category = nil
+          line_item_2.tax_category = nil
+        end
+
+        it "should be 0" do
+          expect(calculator.compute(order)).to eq(0)
+        end
+      end
+
+      context "when one item matches the tax category" do
+        before do
+          line_item_1.tax_category = tax_category
+          line_item_2.tax_category = nil
+        end
+
+        it "should be equal to the item total * rate" do
+          expect(calculator.compute(order)).to eq(1.5)
+        end
+
+        context "correctly rounds to within two decimal places" do
+          before do
+            line_item_1.price = 10.333
+            line_item_1.quantity = 1
+          end
+
+          specify do
+            # Amount is 0.51665, which will be rounded to...
+            expect(calculator.compute(order)).to eq(0.52)
+          end
+        end
+      end
+
+      context "when more than one item matches the tax category" do
+        it "should be equal to the sum of the item totals * rate" do
+          expect(calculator.compute(order)).to eq(3)
+        end
+      end
+
+      context "when tax is included in price" do
+        let(:included_in_price) { true }
+
+        it "will return the deducted amount from the totals" do
+          # total price including 5% tax = $60
+          # ex pre-tax = $57.14
+          # 57.14 + %5 = 59.997 (or "close enough" to $60)
+          # 60 - 57.14 = $2.86
+          expect(calculator.compute(order).to_f).to eql 2.86
+        end
+      end
+    end
+
+    context "when tax is included in price" do
+      let(:included_in_price) { true }
+      context "when the variant matches the tax category" do
+        context "when line item is discounted" do
+          before do
+            line_item.taxable_adjustment_total = -1
+            Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+          end
+
+          it "should be equal to the item's discounted total * rate" do
+            expect(calculator.compute(line_item)).to eql 1.38
+          end
+        end
+        it "should be equal to the item's full price * rate" do
+          Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+          expect(calculator.compute(line_item)).to eql 1.43
+        end
+      end
+    end
+
+    context "when tax is not included in price" do
+      context "when the line item is discounted" do
+        before { line_item.taxable_adjustment_total = -1 }
+
+        it "should be equal to the item's pre-tax total * rate" do
+          expect(calculator.compute(line_item)).to eq(1.45)
+        end
+      end
+
+      context "when the variant matches the tax category" do
+        it "should be equal to the item pre-tax total * rate" do
+          expect(calculator.compute(line_item)).to eq(1.50)
+        end
+      end
+    end
+
+    context "when given a shipment" do
+      it "should be 5% of 15" do
+        expect(calculator.compute(shipment)).to eq(0.75)
+      end
+
+      it "takes discounts into consideration" do
+        shipment.promo_total = -1
+        # 5% of 14
+        expect(calculator.compute(shipment)).to eq(0.7)
+      end
+    end
+  end
+
+  context "when given a line_item" do
+    let(:rate) { create(:tax_rate, amount: 0.07, included_in_price: true) }
+    let(:line_item) { create(:line_item, quantity: 50, price: 8.50) }
+
+    subject do
+      Spree::Calculator::DefaultTax.new(calculable: rate).
+        compute_line_item(line_item)
+    end
+
+    describe "#compute_line_item" do
+      it "computes the line item right" do
+        Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+        expect(subject).to eq(27.80)
+      end
+
+      context "with a 40$ promo" do
+        before do
+          allow(line_item).to receive(:taxable_adjustment_total).and_return(BigDecimal.new("-40"))
+          Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+        end
+
+        it "computes the line item right" do
+          expect(subject).to eq(25.19)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Spree::Calculator::FlatPercentItemTotal, type: :model do
+  let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new }
+  let(:line_item) { mock_model Spree::LineItem }
+
+  before { allow(calculator).to receive_messages preferred_flat_percent: 10 }
+
+  context "compute" do
+    it "should round result correctly" do
+      allow(line_item).to receive_messages amount: 31.08
+      expect(calculator.compute(line_item)).to eq 3.11
+
+      allow(line_item).to receive_messages amount: 31.00
+      expect(calculator.compute(line_item)).to eq 3.10
+    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
+
+      expect(calculator.compute(line_item)).to eq 30.0
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Spree::Calculator::FlatRate, type: :model do
+  let(:calculator) { Spree::Calculator::FlatRate.new }
+
+  let(:order) do
+    mock_model(
+      Spree::Order, quantity: 10, currency: "USD"
+    )
+  end
+
+  context "compute" do
+    it "should compute the amount as the rate when currency matches the order's currency" do
+      calculator.preferred_amount = 25.0
+      calculator.preferred_currency = "GBP"
+      allow(order).to receive_messages currency: "GBP"
+      expect(calculator.compute(order).round(2)).to eq(25.0)
+    end
+
+    it "should compute the amount as 0 when currency does not match the order's currency" do
+      calculator.preferred_amount = 100.0
+      calculator.preferred_currency = "GBP"
+      allow(order).to receive_messages currency: "USD"
+      expect(calculator.compute(order).round(2)).to eq(0.0)
+    end
+
+    it "should compute the amount as 0 when currency is blank" do
+      calculator.preferred_amount = 100.0
+      calculator.preferred_currency = ""
+      allow(order).to receive_messages currency: "GBP"
+      expect(calculator.compute(order).round(2)).to eq(0.0)
+    end
+
+    it "should compute the amount as the rate when the currencies use different casing" do
+      calculator.preferred_amount = 100.0
+      calculator.preferred_currency = "gBp"
+      allow(order).to receive_messages currency: "GBP"
+      expect(calculator.compute(order).round(2)).to eq(100.0)
+    end
+
+    it "should compute the amount as 0 when there is no object" do
+      calculator.preferred_amount = 100.0
+      calculator.preferred_currency = "GBP"
+      expect(calculator.compute.round(2)).to eq(0.0)
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Spree::Calculator::FlexiRate, type: :model do
+  let(:calculator) { Spree::Calculator::FlexiRate.new }
+
+  let(:order) do
+    mock_model(
+      Spree::Order, quantity: 10
+    )
+  end
+
+  context "compute" do
+    it "should compute amount correctly when all fees are 0" do
+      expect(calculator.compute(order).round(2)).to eq(0.0)
+    end
+
+    it "should compute amount correctly when first_item has a value" do
+      allow(calculator).to receive_messages preferred_first_item: 1.0
+      expect(calculator.compute(order).round(2)).to eq(1.0)
+    end
+
+    it "should compute amount correctly when additional_items has a value" do
+      allow(calculator).to receive_messages preferred_additional_item: 1.0
+      expect(calculator.compute(order).round(2)).to eq(9.0)
+    end
+
+    it "should compute amount correctly when additional_items and first_item have values" do
+      allow(calculator).to receive_messages preferred_first_item: 5.0, preferred_additional_item: 1.0
+      expect(calculator.compute(order).round(2)).to eq(14.0)
+    end
+
+    it "should compute amount correctly when additional_items and first_item have values AND max items has value" do
+      allow(calculator).to receive_messages preferred_first_item: 5.0, preferred_additional_item: 1.0, preferred_max_items: 3
+      expect(calculator.compute(order).round(2)).to eq(7.0)
+    end
+
+    it "should allow creation of new object with all the attributes" do
+      Spree::Calculator::FlexiRate.new(preferred_first_item: 1, preferred_additional_item: 1, preferred_max_items: 1)
+    end
+  end
+end

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

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

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Spree::Calculator::PriceSack, type: :model do
+  let(:calculator) do
+    calculator = Spree::Calculator::PriceSack.new
+    calculator.preferred_minimal_amount = 5
+    calculator.preferred_normal_amount = 10
+    calculator.preferred_discount_amount = 1
+    calculator
+  end
+
+  let(:order) { stub_model(Spree::Order) }
+  let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
+
+  # Regression test for #714 and #739
+  it "computes with an order object" do
+    calculator.compute(order)
+  end
+
+  # Regression test for #1156
+  it "computes with a shipment object" do
+    calculator.compute(shipment)
+  end
+
+  # Regression test for #2055
+  it "computes the correct amount" do
+    expect(calculator.compute(2)).to eq(calculator.preferred_normal_amount)
+    expect(calculator.compute(6)).to eq(calculator.preferred_discount_amount)
+  end
+end