solidus_core 2.2.2 → 2.3.0.beta1

data/spec/models/spree/store_spec.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 describe Spree::Store, type: :model do
   it { is_expected.to respond_to(:cart_tax_country_iso) }
 
-  describe ".by_url" do
+  describe ".by_url (deprecated)" do
     let!(:store)    { create(:store, url: "website1.com\nwww.subdomain.com") }
     let!(:store_2)  { create(:store, url: 'freethewhales.com') }
 
+    around do |example|
+      Spree::Deprecation.silence { example.run }
+    end
+
     it "should find stores by url" do
       by_domain = Spree::Store.by_url('www.subdomain.com')
 
@@ -15,7 +19,7 @@ describe Spree::Store, type: :model do
     end
   end
 
-  describe '.current' do
+  describe '.current (deprecated)' do
     let!(:store_1) { create(:store) }
     let!(:store_default) { create(:store, name: 'default', default: true) }
     let!(:store_2) { create(:store, default: false, url: 'www.subdomain.com') }
@@ -23,6 +27,10 @@ describe Spree::Store, type: :model do
 
     delegate :current, to: :described_class
 
+    around do |example|
+      Spree::Deprecation.silence { example.run }
+    end
+
     context "with no match" do
       it 'should return the default domain' do
         expect(current('foobar.com')).to eql(store_default)

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

@@ -12,31 +12,21 @@ RSpec.describe Spree::Tax::OrderAdjuster do
   end
 
   describe '#adjust!' do
-    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) }
+    let(:order) { Spree::Order.new }
+
+    let(:custom_calculator_class) { double }
+    let(:custom_calculator_instance) { double }
 
     before do
-      expect(Spree::TaxRate).to receive(:for_address).with(order.tax_address).and_return(rates_for_order_zone)
+      Spree::Config.tax_calculator_class = custom_calculator_class
     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: 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: rates_for_order_zone,
-                                              rates_for_default_zone: rates_for_default_zone
-                                            ).and_return(item_adjuster)
-
-      expect(item_adjuster).to receive(:adjust!).twice
+    it 'calls the configured tax calculator' do
+      expect(custom_calculator_class).to receive(:new).with(order).at_least(:once).and_return(custom_calculator_instance)
+      expect(custom_calculator_instance).to receive(:calculate).at_least(:once).and_return(
+        Spree::Tax::OrderTax.new(order_id: order.id, line_item_taxes: [], shipment_taxes: [])
+      )
+
       adjuster.adjust!
     end
   end

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

@@ -22,12 +22,19 @@ describe Spree::Tax::ShippingRateTaxer do
       let(:shipment) { create :shipment, order: order }
       let!(:shipping_method) { create :shipping_method, tax_category: tax_category, zones: [zone] }
       let(:zone) { create :zone, countries: [ship_address.country] }
-      let!(:tax_rate_one) { create :tax_rate, tax_category: tax_category, zone: zone, amount: 0.1 }
-      let!(:tax_rate_two) { create :tax_rate, tax_category: tax_category, zone: zone, amount: 0.2 }
+      let!(:tax_rate_one) { create :tax_rate, tax_categories: [tax_category], zone: zone, amount: 0.1 }
+      let!(:tax_rate_two) do
+        create(
+          :tax_rate,
+          tax_categories: [create(:tax_category), tax_category],
+          zone: zone,
+          amount: 0.2
+        )
+      end
       let!(:non_applicable_rate) { create :tax_rate, zone: zone }
       let(:shipping_rate) { create :shipping_rate, cost: 10, shipping_method: shipping_method }
 
-      it 'builds a shipping rate tax for every tax rate' do
+      it 'builds a shipping rate tax for every matching tax rate' do
         expect(subject.taxes.length).to eq(2)
         expect(subject.taxes.map(&:tax_rate)).to include(tax_rate_one)
         expect(subject.taxes.map(&:tax_rate)).to include(tax_rate_two)

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

@@ -23,14 +23,24 @@ RSpec.describe "Taxation system integration tests" do
            tax_category: normal_category,
            shipping_category: normal_shipping_category
   end
+  let(:fruit_product) do
+    create :product,
+      price: 5,
+      name: "Food",
+      tax_category: fruit_category,
+      shipping_category: normal_shipping_category
+  end
 
   let(:book) { book_product.master }
   let(:download) { download_product.master }
   let(:sweater) { sweater_product.master }
+  let(:fruit) { fruit_product.master }
 
   let(:books_category) { create :tax_category, name: "Books" }
   let(:normal_category) { create :tax_category, name: "Normal" }
   let(:digital_category) { create :tax_category, name: "Digital Goods" }
+  let(:fruit_category) { create :tax_category, name: "Fruit Product" }
+  let(:milk_category) { create :tax_category, name: "Milk Product" }
 
   let(:books_shipping_category) { create :shipping_category, name: "Book Shipping" }
   let(:normal_shipping_category) { create :shipping_category, name: "Normal Shipping" }
@@ -55,7 +65,7 @@ RSpec.describe "Taxation system integration tests" do
         name: "German reduced VAT",
         included_in_price: true,
         amount: 0.07,
-        tax_category: books_category,
+        tax_categories: [books_category],
         zone: eu_zone
       )
     end
@@ -65,7 +75,7 @@ RSpec.describe "Taxation system integration tests" do
         name: "German VAT",
         included_in_price: true,
         amount: 0.19,
-        tax_category: normal_category,
+        tax_categories: [normal_category],
         zone: eu_zone
       )
     end
@@ -75,7 +85,17 @@ RSpec.describe "Taxation system integration tests" do
         name: "German VAT",
         included_in_price: true,
         amount: 0.19,
-        tax_category: digital_category,
+        tax_categories: [digital_category],
+        zone: germany_zone
+      )
+    end
+    let!(:german_food_vat) do
+      create(
+        :tax_rate,
+        name: "German Food VAT",
+        included_in_price: true,
+        amount: 0.09,
+        tax_categories: [fruit_category, milk_category],
         zone: germany_zone
       )
     end
@@ -85,7 +105,7 @@ RSpec.describe "Taxation system integration tests" do
         name: "Romanian VAT",
         included_in_price: true,
         amount: 0.24,
-        tax_category: digital_category,
+        tax_categories: [digital_category],
         zone: romania_zone
       )
     end
@@ -222,6 +242,22 @@ RSpec.describe "Taxation system integration tests" do
           expect(shipping_rate.display_price).to eq("$2.00 (incl. $0.32 German VAT)")
         end
       end
+
+      context 'an order containg a fruit' do
+        let(:variant) { fruit }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(5)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 0.45 of included tax' do
+          expect(line_item.included_tax_total).to eq(0.41)
+        end
+      end
     end
 
     context 'to romania' do
@@ -345,7 +381,6 @@ RSpec.describe "Taxation system integration tests" do
         end
       end
     end
-
     # Technically, this can't be the case yet as the order won't pass the shipment stage,
     # but the taxation code shouldn't implicitly depend on the shipping code.
     context 'to an address that does not have a zone associated' do
@@ -528,7 +563,7 @@ RSpec.describe "Taxation system integration tests" do
       create(
         :tax_rate,
         name: "New York Sales Tax",
-        tax_category: books_category,
+        tax_categories: [books_category],
         zone: new_york_zone,
         included_in_price: false,
         amount: 0.05
@@ -539,7 +574,7 @@ RSpec.describe "Taxation system integration tests" do
       create(
         :tax_rate,
         name: "Federal Sales Tax",
-        tax_category: books_category,
+        tax_categories: [books_category],
         zone: united_states_zone,
         included_in_price: false,
         amount: 0.10
@@ -550,7 +585,7 @@ RSpec.describe "Taxation system integration tests" do
       create(
         :tax_rate,
         name: "Federal Sales Tax",
-        tax_category: digital_category,
+        tax_categories: [digital_category],
         zone: united_states_zone,
         included_in_price: false,
         amount: 0.20

data/spec/models/spree/tax_calculator/default_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+RSpec.describe Spree::TaxCalculator::Default do
+  let(:shipping_address) { FactoryGirl.create(:address, state: new_york) }
+  let(:order) { FactoryGirl.create(:order, ship_address: shipping_address, state: "delivery") }
+
+  let(:new_york) { FactoryGirl.create(:state, state_code: "NY") }
+  let(:new_york_zone) { FactoryGirl.create(:zone, states: [new_york]) }
+
+  let(:books_category) { FactoryGirl.create(:tax_category, name: "Books") }
+  let!(:book_tax_rate) do
+    FactoryGirl.create(
+      :tax_rate,
+      name: "New York Sales Tax",
+      tax_categories: [books_category],
+      zone: new_york_zone,
+      included_in_price: false,
+      amount: 0.05
+    )
+  end
+
+  before do
+    book = FactoryGirl.create(
+      :product,
+      price: 20,
+      name: "Book",
+      tax_category: books_category,
+    )
+
+    order.contents.add(book.master)
+  end
+
+  let(:calculator) { described_class.new(order) }
+
+  describe '#calculate' do
+    subject(:calculated_taxes) { calculator.calculate }
+
+    it { is_expected.to be_a Spree::Tax::OrderTax }
+
+    it "has tax information for the line item", aggregate_failures: true do
+      expect(calculated_taxes.line_item_taxes.count).to eq 1
+
+      line_item_tax = calculated_taxes.line_item_taxes.first
+      expect(line_item_tax.amount).to eq 1
+      expect(line_item_tax.included_in_price).to be false
+      expect(line_item_tax.tax_rate).to eq book_tax_rate
+      expect(line_item_tax.label).to eq "New York Sales Tax 5.000%"
+    end
+
+    it "has tax information for the shipments" do
+      expect(calculated_taxes.shipment_taxes).to be_empty
+    end
+  end
+end

data/spec/models/spree/tax_rate_spec.rb

@@ -264,4 +264,96 @@ describe Spree::TaxRate, type: :model do
       end
     end
   end
+
+  describe "#active?" do
+    subject(:rate) { create(:tax_rate, validity).active? }
+
+    context "when validity is not set" do
+      let(:validity) { {} }
+
+      it { is_expected.to eq(true) }
+    end
+
+    context "when starts_at is set" do
+      context "now" do
+        let(:validity) { { starts_at: DateTime.now } }
+
+        it { is_expected.to eq(true) }
+      end
+
+      context "in the past" do
+        let(:validity) { { starts_at: 1.day.ago } }
+
+        it { is_expected.to eq(true) }
+      end
+
+      context "in the future" do
+        let(:validity) { { starts_at: 1.day.from_now } }
+
+        it { is_expected.to eq(false) }
+      end
+    end
+
+    context "when expires_at is set" do
+      context "now" do
+        let(:validity) { { expires_at: DateTime.now } }
+
+        it { is_expected.to eq(false) }
+      end
+
+      context "in the past" do
+        let(:validity) { { expires_at: 1.day.ago } }
+
+        it { is_expected.to eq(false) }
+      end
+
+      context "in the future" do
+        let(:validity) { { expires_at: 1.day.from_now } }
+
+        it { is_expected.to eq(true) }
+      end
+    end
+
+    context "when starts_at and expires_at are set" do
+      context "so that today is in range" do
+        let(:validity) { { starts_at: 1.day.ago, expires_at: 1.day.from_now } }
+
+        it { is_expected.to eq(true) }
+      end
+
+      context "both in the past" do
+        let(:validity) { { starts_at: 2.days.ago, expires_at: 1.day.ago } }
+
+        it { is_expected.to eq(false) }
+      end
+
+      context "both in the future" do
+        let(:validity) { { starts_at: 1.day.from_now, expires_at: 2.days.from_now } }
+
+        it { is_expected.to eq(false) }
+      end
+    end
+  end
+
+  describe '#tax_category (deprecated)' do
+    let(:tax_rate) { create(:tax_rate, tax_categories: [tax_category]) }
+    let(:tax_category) { create(:tax_category) }
+
+    it "returns the first tax category" do
+      tax_category = Spree::Deprecation.silence { tax_rate.tax_category }
+      expect(tax_category).to eq(tax_category)
+    end
+  end
+
+  describe '#tax_category= (deprecated)' do
+    let(:tax_rate) { Spree::TaxRate.new }
+    let(:tax_category) { create(:tax_category) }
+
+    it "can assign the tax categories" do
+      Spree::Deprecation.silence {
+        tax_rate.tax_category = tax_category
+      }
+      expect(tax_rate.tax_categories).to eq([tax_category])
+    end
+  end
 end

data/spec/models/spree/variant/vat_price_generator_spec.rb

@@ -10,10 +10,10 @@ describe Spree::Variant::VatPriceGenerator do
   context "with Germany as default admin country" do
     let(:germany) { create(:country, iso: "DE") }
     let(:germany_zone) { create(:zone, countries: [germany]) }
-    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_category: tax_category) }
+    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_categories: [tax_category]) }
     let(:france) { create(:country, iso: "FR") }
     let(:france_zone) { create(:zone, countries: [france]) }
-    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_category: tax_category) }
+    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_categories: [tax_category]) }
 
     before do
       Spree::Config.admin_vat_country_iso = "DE"
@@ -45,10 +45,10 @@ describe Spree::Variant::VatPriceGenerator do
   context "with no default admin country" do
     let(:germany) { create(:country, iso: "DE") }
     let(:germany_zone) { create(:zone, countries: [germany]) }
-    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_category: tax_category) }
+    let!(:german_vat) { create(:tax_rate, included_in_price: true, amount: 0.19, zone: germany_zone, tax_categories: [tax_category]) }
     let(:france) { create(:country, iso: "FR") }
     let(:france_zone) { create(:zone, countries: [france]) }
-    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_category: tax_category) }
+    let!(:french_vat) { create(:tax_rate, included_in_price: true, amount: 0.20, zone: france_zone, tax_categories: [tax_category]) }
 
     it "builds a correct price including VAT for all VAT countries" do
       subject

data/spec/models/spree/variant_spec.rb

@@ -17,6 +17,12 @@ describe Spree::Variant, type: :model do
       variant.price = 0
       expect(variant).to be_valid
     end
+
+    it "should require a product" do
+      expect(variant).to be_valid
+      variant.product = nil
+      expect(variant).to be_invalid
+    end
   end
 
   context "after create" do
@@ -63,8 +69,8 @@ describe Spree::Variant, type: :model do
 
       let(:tax_category) { create(:tax_category) }
 
-      let!(:high_vat) { create(:tax_rate, included_in_price: true, amount: 0.25, zone: high_vat_zone, tax_category: tax_category) }
-      let!(:low_vat) { create(:tax_rate, included_in_price: true, amount: 0.15, zone: low_vat_zone, tax_category: tax_category) }
+      let!(:high_vat) { create(:tax_rate, included_in_price: true, amount: 0.25, zone: high_vat_zone, tax_categories: [tax_category]) }
+      let!(:low_vat) { create(:tax_rate, included_in_price: true, amount: 0.15, zone: low_vat_zone, tax_categories: [tax_category]) }
 
       let(:product) { build(:product, tax_category: tax_category) }
 

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
 require 'cancan/matchers'
 
-ActiveJob::Base.queue_adapter = :inline
+ActiveJob::Base.queue_adapter = :test
 
 RSpec.configure do |config|
   config.color = true
@@ -65,6 +65,7 @@ RSpec.configure do |config|
     reset_spree_preferences
   end
 
+  config.include ActiveJob::TestHelper
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::TestingSupport::Preferences
   config.extend WithModel

data/spec/support/test_gateway.rb

@@ -1,2 +1,2 @@
-class Spree::Gateway::Test < Spree::Gateway
+class Spree::Gateway::Test < Spree::PaymentMethod::CreditCard
 end