solidus_core 1.3.0.beta1 → 1.3.0.rc1

data/spec/models/spree/country_spec.rb

@@ -49,4 +49,20 @@ describe Spree::Country, type: :model do
       end
     end
   end
+
+  describe '#prices' do
+    let(:country) { create(:country) }
+    subject { country.prices }
+
+    it { is_expected.to be_a(ActiveRecord::Associations::CollectionProxy) }
+
+    context "if the country has associated prices" do
+      let!(:price_one) { create(:price) }
+      let!(:price_two) { create(:price) }
+      let!(:price_three) { create(:price) }
+      let(:country) { create(:country, prices: [price_one, price_two]) }
+
+      it { is_expected.to contain_exactly(price_one, price_two) }
+    end
+  end
 end

data/spec/models/spree/line_item_spec.rb

@@ -207,15 +207,19 @@ describe Spree::LineItem, type: :model do
 
   describe "#options=" do
     it "can handle updating a blank line item with no order" do
-      expect(Spree::Deprecation).not_to receive(:warn)
       line_item.options = { price: 123 }
     end
 
     it "updates the data provided in the options" do
-      expect(Spree::Deprecation).not_to receive(:warn)
       line_item.options = { price: 123 }
       expect(line_item.price).to eq 123
     end
+
+    it "updates the price based on the options provided" do
+      expect(line_item).to receive(:gift_wrap=).with(true)
+      expect(line_item).to receive(:money_price=)
+      line_item.options = { gift_wrap: true }
+    end
   end
 
   describe 'money_price=' do

data/spec/models/spree/preferences/preferable_spec.rb

@@ -117,6 +117,11 @@ describe Spree::Preferences::Preferable, type: :model do
         @a.set_preference(:is_integer, '')
         expect(@a.preferences[:is_integer]).to eq(0)
       end
+
+      it 'does not convert if value is nil' do
+        @a.set_preference(:is_integer, nil)
+        expect(@a.preferences[:is_integer]).to be_nil
+      end
     end
 
     context "converts decimal preferences to BigDecimal values" do

data/spec/models/spree/preferences/statically_configurable_spec.rb

@@ -9,6 +9,10 @@ module Spree
         def initialize
           @preferences = { color: 'blue' }
         end
+
+        def [](key)
+          return @preferences if key == :preferences
+        end
       end
     end
     let(:klass) do

data/spec/models/spree/price_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Spree::Price, type: :model do
+  describe 'searchable columns' do
+    subject { described_class.whitelisted_ransackable_attributes }
+    it 'allows searching by variant_id' do
+      expect(subject).to include("variant_id")
+    end
+  end
+
   describe 'validations' do
     let(:variant) { stub_model Spree::Variant }
     subject { Spree::Price.new variant: variant, amount: amount }
@@ -38,5 +45,87 @@ describe Spree::Price, type: :model do
       let(:amount) { Spree::Price::MAXIMUM_AMOUNT }
       it { is_expected.to be_valid }
     end
+
+    context '#country_iso' do
+      subject(:price) { build(:price, country_iso: country_iso) }
+
+      context 'when country iso is nil' do
+        let(:country_iso) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when country iso is a country code' do
+        let!(:country) { create(:country, iso: "DE") }
+        let(:country_iso) { "DE" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when country iso is not a country code' do
+        let(:country_iso) { "ZZ" }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    describe '#country' do
+      let!(:country) { create(:country, iso: "DE") }
+      let(:price) { create(:price, country_iso: "DE", is_default: false) }
+
+      it 'returns the country object' do
+        expect(price.country).to eq(country)
+      end
+    end
+  end
+
+  describe "#currency" do
+    let(:variant) { stub_model Spree::Variant }
+    subject { Spree::Price.new variant: variant, amount: 10, currency: currency }
+
+    describe "validation" do
+      context "with an invalid currency" do
+        let(:currency) { "XYZ" }
+
+        it { is_expected.to be_invalid }
+
+        it "has an understandable error message" do
+          subject.valid?
+          expect(subject.errors.messages[:currency].first).to eq("is not a valid currency code")
+        end
+      end
+
+      context "with a valid currency" do
+        let(:currency) { "USD" }
+
+        it { is_expected.to be_valid }
+      end
+    end
+  end
+
+  describe 'scopes' do
+    describe '.for_any_country' do
+      let(:country) { create(:country) }
+      let!(:fallback_price) { create(:price, country_iso: nil) }
+      let!(:country_price) { create(:price, country: country) }
+
+      subject { described_class.for_any_country }
+
+      it { is_expected.to include(fallback_price) }
+    end
+  end
+
+  describe 'net_amount' do
+    let(:country) { create(:country, iso: "DE") }
+    let(:zone) { create(:zone, countries: [country]) }
+    let!(:tax_rate) { create(:tax_rate, included_in_price: true, zone: zone, tax_category: variant.tax_category) }
+
+    let(:variant) { create(:product).master }
+
+    let(:price) { variant.prices.create(amount: 20, country: country) }
+
+    subject { price.net_amount }
+
+    it { is_expected.to eq(BigDecimal.new(20) / 1.1) }
   end
 end

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

@@ -42,6 +42,15 @@ module Spree
             expect(subject.shipments.count).to eq(StockLocation.count - 1)
           end
         end
+
+        it "does not unintentionally add shipments to the order" do
+          subject.shipments
+          expect {
+            order.update!
+          }.not_to change {
+            order.shipments.count
+          }
+        end
       end
 
       # regression spec

data/spec/models/spree/stock/splitter/shipping_category_spec.rb

@@ -2,46 +2,44 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    module Splitter
-      describe ShippingCategory, type: :model do
-        let(:order) { create(:order_with_line_items, line_items_count: 1) }
-        let(:line_item) { order.line_items.first }
-        let(:variant1) { build(:variant) }
-        let(:variant2) { build(:variant) }
-        let(:shipping_category_1) { create(:shipping_category, name: 'A') }
-        let(:shipping_category_2) { create(:shipping_category, name: 'B') }
-
-        def inventory_unit1
-          build(:inventory_unit, variant: variant1, order: order, line_item: line_item).tap do |inventory_unit|
-            inventory_unit.variant.product.shipping_category = shipping_category_1
-          end
+    describe Splitter::ShippingCategory, type: :model do
+      let(:order) { create(:order_with_line_items, line_items_count: 1) }
+      let(:line_item) { order.line_items.first }
+      let(:variant1) { build(:variant) }
+      let(:variant2) { build(:variant) }
+      let(:shipping_category_1) { create(:shipping_category, name: 'A') }
+      let(:shipping_category_2) { create(:shipping_category, name: 'B') }
+
+      def inventory_unit1
+        build(:inventory_unit, variant: variant1, order: order, line_item: line_item).tap do |inventory_unit|
+          inventory_unit.variant.product.shipping_category = shipping_category_1
         end
+      end
 
-        def inventory_unit2
-          build(:inventory_unit, variant: variant2, order: order, line_item: line_item).tap do |inventory_unit|
-            inventory_unit.variant.product.shipping_category = shipping_category_2
-          end
+      def inventory_unit2
+        build(:inventory_unit, variant: variant2, order: order, line_item: line_item).tap do |inventory_unit|
+          inventory_unit.variant.product.shipping_category = shipping_category_2
         end
+      end
 
-        let(:packer) { build(:stock_packer) }
+      let(:packer) { build(:stock_packer) }
 
-        subject { ShippingCategory.new(packer) }
+      subject { described_class.new(packer) }
 
-        it 'splits each package by shipping category' do
-          package1 = Package.new(packer.stock_location)
-          4.times { package1.add inventory_unit1 }
-          8.times { package1.add inventory_unit2 }
+      it 'splits each package by shipping category' do
+        package1 = Package.new(packer.stock_location)
+        4.times { package1.add inventory_unit1 }
+        8.times { package1.add inventory_unit2 }
 
-          package2 = Package.new(packer.stock_location)
-          6.times { package2.add inventory_unit1 }
-          9.times { package2.add inventory_unit2, :backordered }
+        package2 = Package.new(packer.stock_location)
+        6.times { package2.add inventory_unit1 }
+        9.times { package2.add inventory_unit2, :backordered }
 
-          packages = subject.split([package1, package2])
-          expect(packages[0].quantity).to eq 4
-          expect(packages[1].quantity).to eq 8
-          expect(packages[2].quantity).to eq 6
-          expect(packages[3].quantity).to eq 9
-        end
+        packages = subject.split([package1, package2])
+        expect(packages[0].quantity).to eq 4
+        expect(packages[1].quantity).to eq 8
+        expect(packages[2].quantity).to eq 6
+        expect(packages[3].quantity).to eq 9
       end
     end
   end

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

@@ -34,13 +34,22 @@ RSpec.describe Spree::Tax::TaxLocation do
         expect(subject.country_id).to eq(country.id)
       end
     end
+  end
 
-    context 'with a state object' do
-      let(:args) { { state: state } }
+  describe "#country" do
+    let(:country) { create(:country) }
+    subject { described_class.new(args).country }
 
-      it "will yield a location with that state's id" do
-        expect(subject.state_id).to eq(state.id)
-      end
+    context 'with a country object' do
+      let(:args) { { country: country } }
+
+      it { is_expected.to eq(country) }
+    end
+
+    context 'with no country object' do
+      let(:args) { { country: nil } }
+
+      it { is_expected.to be nil }
     end
   end
 

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

@@ -43,7 +43,7 @@ RSpec.describe "Taxation system integration tests" do
   context 'selling from germany' do
     let(:germany) { create :country, iso: "DE" }
     # The weird default_tax boolean is what makes this context one with default included taxes
-    let!(:germany_zone) { create :zone, countries: [germany], default_tax: true }
+    let!(:germany_zone) { create :zone, countries: [germany] }
     let(:romania) { create(:country, iso: "RO") }
     let(:romania_zone) { create(:zone, countries: [romania] ) }
     let(:eu_zone) { create(:zone, countries: [romania, germany]) }
@@ -114,6 +114,7 @@ RSpec.describe "Taxation system integration tests" do
     end
 
     before do
+      Spree::Config.admin_vat_country_iso = "DE"
       order.contents.add(variant)
     end
 
@@ -310,7 +311,6 @@ RSpec.describe "Taxation system integration tests" do
         let(:variant) { download }
 
         it 'still has an adjusted price for romania' do
-          pending "waiting for the MOSS refactoring"
           expect(line_item.price).to eq(10.42)
         end
 
@@ -319,12 +319,10 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has 2.02 of included tax' do
-          pending 'waiting for the MOSS refactoring'
           expect(line_item.included_tax_total).to eq(2.02)
         end
 
         it 'has a constant amount pre tax' do
-          pending 'but it changes to 8.06, because Spree thinks both VATs apply'
           expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
         end
       end
@@ -334,19 +332,16 @@ RSpec.describe "Taxation system integration tests" do
 
         before { 2.times { order.next! } }
 
-        it 'it has a shipment with an adjusted price to 2.08' do
-          pending 'Waiting for the MOSS refactoring'
-          expect(shipment.amount).to eq(2.08)
+        it 'it has a shipment with worth 2.00' do
+          expect(shipment.amount).to eq(2.00)
         end
 
         it 'has a shipment with 0.40 included tax' do
-          pending 'But the tax is not created'
-          expect(shipment.included_tax_total).to eq(0.40)
+          expect(shipment.included_tax_total).to eq(0.39)
         end
 
         it 'has a shipping rate that correctly reflects the shipment' do
-          pending 'But the shipping rate is not adjusted'
-          expect(shipping_rate.display_price).to eq("$2.08 (incl. $0.40 Romanian VAT)")
+          expect(shipping_rate.display_price).to eq("$2.00 (incl. $0.39 Romanian VAT)")
         end
       end
     end
@@ -360,22 +355,18 @@ RSpec.describe "Taxation system integration tests" do
         let(:variant) { book }
 
         it 'should sell at the net price' do
-          pending "Prices have to be adjusted"
           expect(line_item.price).to eq(18.69)
         end
 
         it 'is adjusted to the net price' do
-          pending 'This will turn green when the default zone is gone'
           expect(line_item.total).to eq(18.69)
         end
 
         it 'has no tax adjustments' do
-          pending "Right now it gets a refund"
           expect(line_item.adjustments.tax.count).to eq(0)
         end
 
         it 'has no included tax' do
-          pending 'This will turn green when the default zone is gone'
           expect(line_item.included_tax_total).to eq(0)
         end
 
@@ -397,7 +388,6 @@ RSpec.describe "Taxation system integration tests" do
         let(:variant) { book }
 
         it 'should sell at the net price' do
-          pending "Prices have to be adjusted"
           expect(line_item.price).to eq(18.69)
         end
 
@@ -406,7 +396,6 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has no tax adjustments' do
-          pending "Right now it gets a refund"
           expect(line_item.adjustments.tax.count).to eq(0)
         end
 
@@ -415,12 +404,10 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has no additional tax' do
-          pending 'but there is a refund, still'
           expect(line_item.additional_tax_total).to eq(0)
         end
 
         it 'has a constant amount pre tax' do
-          pending 'But it has a discount that abuses the additional tax total'
           expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
         end
 
@@ -429,9 +416,8 @@ RSpec.describe "Taxation system integration tests" do
 
           before { 2.times { order.next! } }
 
-          it 'it has a shipment with an adjusted price to 7.47' do
-            pending 'but prices are not adjusted yet'
-            expect(shipment.amount).to eq(7.47)
+          it 'it has a shipment that costs $8.00' do
+            expect(shipment.amount).to eq(8.00)
           end
 
           it 'has a shipment with no included tax' do
@@ -439,8 +425,7 @@ RSpec.describe "Taxation system integration tests" do
           end
 
           it 'has a shipping rate that correctly reflects the shipment' do
-            pending 'since no tax created, no correct display price'
-            expect(shipping_rate.display_price).to eq("$7.47")
+            expect(shipping_rate.display_price).to eq("$8.00")
           end
         end
       end
@@ -449,12 +434,10 @@ RSpec.describe "Taxation system integration tests" do
         let(:variant) { sweater }
 
         it 'should sell at the net price' do
-          pending 'but prices are not adjusted according to the zone yet'
           expect(line_item.price).to eq(25.21)
         end
 
         it 'has no tax adjustments' do
-          pending 'but it has a refund'
           expect(line_item.adjustments.tax.count).to eq(0)
         end
 
@@ -463,12 +446,10 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has no additional tax' do
-          pending 'but it has a refund for included taxes wtf'
           expect(line_item.additional_tax_total).to eq(0)
         end
 
         it 'has a constant amount pre tax' do
-          pending 'But it has a discount that abuses the additional tax total'
           expect(line_item.discounted_amount - line_item.included_tax_total).to eq(25.21)
         end
 
@@ -477,9 +458,8 @@ RSpec.describe "Taxation system integration tests" do
 
           before { 2.times { order.next! } }
 
-          it 'it has a shipment with an adjusted price to 13.45' do
-            pending 'But prices are not adjusted yet'
-            expect(shipment.amount).to eq(13.45)
+          it 'it has a shipment costing $16.00' do
+            expect(shipment.amount).to eq(16.00)
           end
 
           it 'has a shipment with no included tax' do
@@ -487,8 +467,7 @@ RSpec.describe "Taxation system integration tests" do
           end
 
           it 'has a shipping rate that correctly reflects the shipment' do
-            pending 'since no tax created, no correct display price'
-            expect(shipping_rate.display_price).to eq("$13.45")
+            expect(shipping_rate.display_price).to eq("$16.00")
           end
         end
       end
@@ -497,12 +476,10 @@ RSpec.describe "Taxation system integration tests" do
         let(:variant) { download }
 
         it 'should sell at the net price' do
-          pending 'but prices are not adjusted yet'
           expect(line_item.price).to eq(8.40)
         end
 
         it 'has no tax adjustments' do
-          pending 'but a refund is created'
           expect(line_item.adjustments.tax.count).to eq(0)
         end
 
@@ -511,12 +488,10 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has no additional tax' do
-          pending 'but an tax refund that disguises as additional tax is created'
           expect(line_item.additional_tax_total).to eq(0)
         end
 
         it 'has a constant amount pre tax' do
-          pending 'But it has a discount that abuses the additional tax total'
           expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
         end
       end
@@ -526,9 +501,8 @@ RSpec.describe "Taxation system integration tests" do
 
         before { 2.times { order.next! } }
 
-        it 'it has a shipment with an adjusted price to 1.68' do
-          pending 'but prices are not adjusted yet'
-          expect(shipment.amount).to eq(1.68)
+        it 'it has a shipment costing 2.00' do
+          expect(shipment.amount).to eq(2.00)
         end
 
         it 'has a shipment with no included tax' do
@@ -536,8 +510,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a shipping rate that correctly reflects the shipment' do
-          pending 'since no tax created, no correct display price'
-          expect(shipping_rate.display_price).to eq("$1.68")
+          expect(shipping_rate.display_price).to eq("$2.00")
         end
       end
     end

data/spec/models/spree/variant/{pricer_spec.rb → price_selector_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Variant::Pricer do
+describe Spree::Variant::PriceSelector do
   let(:variant) { build_stubbed(:variant) }
 
   subject { described_class.new(variant) }
@@ -23,6 +23,46 @@ describe Spree::Variant::Pricer do
       it "returns the correct (default) price as a Spree::Money object" do
         expect(subject.price_for(pricing_options)).to eq(Spree::Money.new(12.34, currency: "USD"))
       end
+
+      context "with the another country iso" do
+        let(:country) { create(:country, iso: "DE") }
+
+        let(:pricing_options) do
+          described_class.pricing_options_class.new(currency: "USD", country_iso: "DE")
+        end
+
+        context "with a price for that country present" do
+          before do
+            variant.prices.create(amount: 44.44, country: country, currency: Spree::Config.currency)
+          end
+
+          it "returns the correct price" do
+            expect(subject.price_for(pricing_options)).to eq(Spree::Money.new(44.44, currency: "USD"))
+          end
+        end
+
+        context "with no price for that country present" do
+          context "and no fallback price for the variant present" do
+            before do
+              variant.prices.delete_all
+            end
+
+            it "returns nil" do
+              expect(subject.price_for(pricing_options)).to be_nil
+            end
+          end
+
+          context "and a fallback price for the variant present" do
+            before do
+              variant.prices.create(amount: 55.44, country: nil, currency: Spree::Config.currency)
+            end
+
+            it "returns the fallback price" do
+              expect(subject.price_for(pricing_options)).to eq(Spree::Money.new(55.44, currency: "USD"))
+            end
+          end
+        end
+      end
     end
 
     context "with a different currency" do