solidus_core 1.3.0.beta1 → 1.3.0.rc1

data/lib/spree/testing_support/controller_requests.rb

@@ -1,21 +1,36 @@
 module Spree
   module TestingSupport
-    # Use this module to easily test Spree actions within Spree components or
-    # inside your application to test routes for the mounted Spree engine.
+    # A module providing convenience methods to test Solidus controllers
+    # in Rails controller/functional tests. Possibly from inside an
+    # application with a mounted Solidus engine.
     #
-    # Inside your spec_helper.rb, include this module inside the
-    # RSpec.configure block by doing this:
+    # *There is generaly no need* to use this module. Instead, in
+    # a functional/controller test against a Spree controller, just
+    # use standard Rails functionality by including:
+    #
+    #   routes { Spree::Core::Engine.routes }
+    #
+    # And then use standard Rails test `get`, `post` etc methods.
+    #
+    # But some legacy code uses this ControllerRequests helper. It must
+    # be included only in tests against Spree controllers, it will interfere
+    # with tests against local app or other engine controllers, resulting
+    # in ActionController::UrlGenerationError.
+    #
+    # To use this module, inside your spec_helper.rb, include this module inside
+    # the RSpec.configure block by:
     #
     #   require 'spree/testing_support/controller_requests'
     #   RSpec.configure do |c|
-    #     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
+    #     c.include Spree::TestingSupport::ControllerRequests, spree_controller: true
     #   end
     #
-    # Then, in your controller tests, you can access spree routes like this:
+    # Then, in your controller tests against spree controllers, you can access
+    # tag to use this module, and access spree routes like this:
     #
     #   require 'spec_helper'
     #
-    #   describe Spree::ProductsController do
+    #   describe Spree::ProductsController, :spree_controller do
     #     it "can see all the products" do
     #       spree_get :index
     #     end

data/lib/spree/testing_support/factories/state_factory.rb

@@ -8,6 +8,13 @@ FactoryGirl.define do
 
       carmen_subregion do
         carmen_country = Carmen::Country.coded(country.iso)
+
+        # TODO: This condition can be removed after this carmen update is
+        # available: https://github.com/jim/carmen/pull/177
+        if !carmen_country.subregions?
+          fail("Country #{country.iso} has no subregions")
+        end
+
         carmen_country.subregions.coded(state_code) ||
           carmen_country.subregions.sort_by(&:name).first ||
           fail("Country #{country.iso} has no subregions")

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -14,7 +14,10 @@ FactoryGirl.define do
 
     country  { |stock_location| Spree::Country.first || stock_location.association(:country) }
     state do |stock_location|
-      stock_location.country.states.first || stock_location.association(:state, country: stock_location.country)
+      carmen_country = Carmen::Country.coded(stock_location.country.iso)
+      if carmen_country.subregions?
+        stock_location.country.states.first || stock_location.association(:state, country: stock_location.country)
+      end
     end
 
     factory :stock_location_without_variant_propagation do

data/lib/tasks/migrations/create_vat_prices.rake

@@ -0,0 +1,11 @@
+namespace :solidus do
+  namespace :migrations do
+    namespace :create_vat_prices do
+      task up: :environment do
+        print "Creating differentiated prices for VAT countries ... "
+        Spree::PriceMigrator.migrate_default_vat_prices
+        puts "Success."
+      end
+    end
+  end
+end

data/lib/tasks/upgrade.rake

@@ -3,7 +3,8 @@ namespace :solidus do
     desc "Upgrade Solidus to version 1.3"
     task one_point_three: [
         'solidus:migrations:assure_store_on_orders:up',
-        'solidus:migrations:migrate_shipping_rate_taxes:up'
+        'solidus:migrations:migrate_shipping_rate_taxes:up',
+        'solidus:migrations:create_vat_prices'
       ] do
       puts "Your Solidus install is ready for Solidus 1.3."
     end

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

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+module ClassConstantizerTest
+  ClassA = Class.new
+  ClassB = Class.new
+
+  def self.reload
+    [:ClassA, :ClassB].each do |klass|
+      remove_const(klass)
+      const_set(klass, Class.new)
+    end
+  end
+end
+
+describe Spree::Core::ClassConstantizer::Set do
+  let(:set) { described_class.new }
+
+  describe "#concat" do
+    it "can add one item" do
+      set.concat(['ClassConstantizerTest::ClassA'])
+      expect(set).to include(ClassConstantizerTest::ClassA)
+    end
+
+    it "can add two items" do
+      set.concat(['ClassConstantizerTest::ClassA', ClassConstantizerTest::ClassB])
+      expect(set).to include(ClassConstantizerTest::ClassA)
+      expect(set).to include(ClassConstantizerTest::ClassB)
+    end
+  end
+
+  describe "<<" do
+    it "can add by string" do
+      set << "ClassConstantizerTest::ClassA"
+      expect(set).to include(ClassConstantizerTest::ClassA)
+    end
+
+    it "can add by class" do
+      set << ClassConstantizerTest::ClassA
+      expect(set).to include(ClassConstantizerTest::ClassA)
+    end
+
+    describe "class redefinition" do
+      shared_examples "working code reloading" do
+        it "works with a class" do
+          original = ClassConstantizerTest::ClassA
+
+          ClassConstantizerTest.reload
+
+          # Sanity check
+          expect(original).not_to eq(ClassConstantizerTest::ClassA)
+
+          expect(set).to include(ClassConstantizerTest::ClassA)
+          expect(set).to_not include(original)
+        end
+      end
+
+      context "with a class" do
+        before { set << ClassConstantizerTest::ClassA }
+        it_should_behave_like "working code reloading"
+      end
+
+      context "with a string" do
+        before { set << "ClassConstantizerTest::ClassA" }
+        it_should_behave_like "working code reloading"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+class DummyClass
+  include Spree::Core::EnvironmentExtension
+end
+
+class C1; end
+class C2; end
+class C3; end
+
+describe Spree::Core::EnvironmentExtension do
+  subject { DummyClass.new }
+
+  before { subject.add_class('random_name') }
+
+  describe 'Basis' do
+    it { respond_to?(:random_name) }
+    it { respond_to?(:random_name=) }
+  end
+
+  describe '#getter' do
+    it { expect(subject.random_name).to be_empty }
+    it { expect(subject.random_name).to be_kind_of Spree::Core::ClassConstantizer::Set }
+  end
+
+  describe '#setter' do
+    before { subject.random_name = [C1, C2]; @set = subject.random_name.to_a }
+
+    it { expect(@set).to include(C1) }
+    it { expect(@set).to include(C2) }
+    it { expect(@set).not_to include(C3) }
+  end
+end

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

@@ -0,0 +1,356 @@
+require 'spec_helper'
+
+describe Spree::PriceMigrator do
+  let(:order) { create :order, ship_address: shipping_address, state: "delivery" }
+  let(:book_product) do
+    create :product,
+           price: 20,
+           name: "Book",
+           tax_category: books_category,
+           shipping_category: books_shipping_category
+  end
+  let(:download_product) do
+    create :product,
+           price: 10,
+           name: "Download",
+           tax_category: digital_category,
+           shipping_category: digital_shipping_category
+  end
+  let(:sweater_product) do
+    create :product,
+           price: 30,
+           name: "Download",
+           tax_category: normal_category,
+           shipping_category: normal_shipping_category
+  end
+
+  let!(:book) { book_product.master }
+  let!(:download) { download_product.master }
+  let!(:sweater) { sweater_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(:books_shipping_category) { create :shipping_category, name: "Book Shipping" }
+  let(:normal_shipping_category) { create :shipping_category, name: "Normal Shipping" }
+  let(:digital_shipping_category) { create :shipping_category, name: "Digital Premium Download" }
+
+  let(:line_item) { order.line_items.first }
+  let(:shipment) { order.shipments.first }
+  let(:shipping_rate) { shipment.shipping_rates.first }
+
+  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(:romania) { create(:country, iso: "RO") }
+    let(:romania_zone) { create(:zone, countries: [romania] ) }
+    let(:eu_zone) { create(:zone, countries: [romania, germany]) }
+    let(:world_zone) { create(:zone, :with_country) }
+
+    let!(:german_book_vat) do
+      create(
+        :tax_rate,
+        name: "German reduced VAT",
+        included_in_price: true,
+        amount: 0.07,
+        tax_category: books_category,
+        zone: eu_zone
+      )
+    end
+    let!(:german_normal_vat) do
+      create(
+        :tax_rate,
+        name: "German VAT",
+        included_in_price: true,
+        amount: 0.19,
+        tax_category: normal_category,
+        zone: eu_zone
+      )
+    end
+    let!(:german_digital_vat) do
+      create(
+        :tax_rate,
+        name: "German VAT",
+        included_in_price: true,
+        amount: 0.19,
+        tax_category: digital_category,
+        zone: germany_zone
+      )
+    end
+    let!(:romanian_digital_vat) do
+      create(
+        :tax_rate,
+        name: "Romanian VAT",
+        included_in_price: true,
+        amount: 0.24,
+        tax_category: digital_category,
+        zone: romania_zone
+      )
+    end
+    let!(:book_shipping_method) do
+      create :shipping_method,
+             cost: 8.00,
+             shipping_categories: [books_shipping_category],
+             tax_category: books_category,
+             zones: [eu_zone, world_zone]
+    end
+
+    let!(:sweater_shipping_method) do
+      create :shipping_method,
+             cost: 16.00,
+             shipping_categories: [normal_shipping_category],
+             tax_category: normal_category,
+             zones: [eu_zone, world_zone]
+    end
+
+    let!(:premium_download_shipping_method) do
+      create :shipping_method,
+             cost: 2.00,
+             shipping_categories: [digital_shipping_category],
+             tax_category: digital_category,
+             zones: [eu_zone, world_zone]
+    end
+
+    before do
+      Spree::PriceMigrator.migrate_default_vat_prices
+      order.contents.add(variant)
+    end
+
+    context 'to germany' do
+      let(:shipping_address) { create :address, country_iso_code: "DE" }
+
+      context 'an order with a book' do
+        let(:variant) { book }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(20)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 1.13 cents of included tax' do
+          expect(line_item.included_tax_total).to eq(1.31)
+        end
+      end
+
+      context 'an order with a sweater' do
+        let(:variant) { sweater }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(30)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 4,78 of included tax' do
+          expect(line_item.included_tax_total).to eq(4.79)
+        end
+      end
+
+      context 'an order with a download' do
+        let(:variant) { download }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(10)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 1.60 of included tax' do
+          expect(line_item.included_tax_total).to eq(1.60)
+        end
+      end
+    end
+
+    context 'to romania' do
+      let(:shipping_address) { create :address, country_iso_code: "RO" }
+
+      context 'an order with a book' do
+        let(:variant) { book }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(20)
+        end
+
+        it 'is adjusted to the original price' do
+          expect(line_item.total).to eq(20)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 1.13 cents of included tax' do
+          expect(line_item.included_tax_total).to eq(1.31)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+        end
+      end
+
+      context 'an order with a sweater' do
+        let(:variant) { sweater }
+
+        it 'still has the original price' do
+          expect(line_item.price).to eq(30)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 4.79 of included tax' do
+          expect(line_item.included_tax_total).to eq(4.79)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(25.21)
+        end
+      end
+
+      context 'an order with a download' do
+        let(:variant) { download }
+
+        it 'still has an adjusted price for romania' do
+          expect(line_item.price).to eq(10.42)
+        end
+
+        it 'has one tax adjustment' do
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+
+        it 'has 2.02 of included tax' do
+          expect(line_item.included_tax_total).to eq(2.02)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
+        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
+      let(:shipping_address) { create :address, country_iso_code: "IT" }
+
+      context 'an order with a book' do
+        let(:variant) { book }
+
+        it 'should sell at the net price' do
+          expect(line_item.price).to eq(18.69)
+        end
+
+        it 'is adjusted to the net price' do
+          expect(line_item.total).to eq(18.69)
+        end
+
+        it 'has no tax adjustments' do
+          expect(line_item.adjustments.tax.count).to eq(0)
+        end
+
+        it 'has no included tax' do
+          expect(line_item.included_tax_total).to eq(0)
+        end
+
+        it 'has no additional tax' do
+          expect(line_item.additional_tax_total).to eq(0)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+        end
+      end
+    end
+
+    # International delivery, no tax applies whatsoever
+    context 'to anywhere else in the world' do
+      let(:shipping_address) { create :address, country: world_zone.countries.first }
+
+      context 'an order with a book' do
+        let(:variant) { book }
+
+        it 'should sell at the net price' do
+          expect(line_item.price).to eq(18.69)
+        end
+
+        it 'is adjusted to the net price' do
+          expect(line_item.total).to eq(18.69)
+        end
+
+        it 'has no tax adjustments' do
+          expect(line_item.adjustments.tax.count).to eq(0)
+        end
+
+        it 'has no included tax' do
+          expect(line_item.included_tax_total).to eq(0)
+        end
+
+        it 'has no additional tax' do
+          expect(line_item.additional_tax_total).to eq(0)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+        end
+      end
+
+      context 'an order with a sweater' do
+        let(:variant) { sweater }
+
+        it 'should sell at the net price' do
+          expect(line_item.price).to eq(25.21)
+        end
+
+        it 'has no tax adjustments' do
+          expect(line_item.adjustments.tax.count).to eq(0)
+        end
+
+        it 'has no included tax' do
+          expect(line_item.included_tax_total).to eq(0)
+        end
+
+        it 'has no additional tax' do
+          expect(line_item.additional_tax_total).to eq(0)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(25.21)
+        end
+      end
+
+      context 'an order with a download' do
+        let(:variant) { download }
+
+        it 'should sell at the net price' do
+          expect(line_item.price).to eq(8.40)
+        end
+
+        it 'has no tax adjustments' do
+          expect(line_item.adjustments.tax.count).to eq(0)
+        end
+
+        it 'has no included tax' do
+          expect(line_item.included_tax_total).to eq(0)
+        end
+
+        it 'has no additional tax' do
+          expect(line_item.additional_tax_total).to eq(0)
+        end
+
+        it 'has a constant amount pre tax' do
+          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
+        end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,7 @@ RSpec.describe 'state factory' do
 
   describe 'when given a country iso code' do
     let(:state) { build(:state, country_iso: "DE") }
+
     it 'creates the first state for that country it finds in carmen' do
       expect(state.abbr).to eq("BW")
       expect(state.name).to eq("Baden-Württemberg")
@@ -45,4 +46,12 @@ RSpec.describe 'state factory' do
       expect{ build(:state, country_iso: "ZZ") }.to raise_error(RuntimeError, 'Unknown country iso code: "ZZ"')
     end
   end
+
+  context 'with a country that does not have subregions' do
+    it 'raises an exception' do
+      expect {
+        create(:state, country_iso: 'HK')
+      }.to raise_error('Country HK has no subregions')
+    end
+  end
 end

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

@@ -21,4 +21,13 @@ RSpec.describe 'stock location factory' do
 
     it_behaves_like 'a working factory'
   end
+
+  describe 'stock location for a country without subregions' do
+    let(:country) { create(:country, iso: 'HK') }
+    it 'succeeds' do
+      expect(
+        create(:stock_location, country: country)
+      ).to be_a(Spree::StockLocation)
+    end
+  end
 end

data/spec/lib/spree/money_spec.rb

@@ -8,6 +8,81 @@ describe Spree::Money do
     end
   end
 
+  describe '#initialize' do
+    subject do
+      Spree::Deprecation.silence do
+        described_class.new(amount, currency: currency, with_currency: true).to_s
+      end
+    end
+
+    context 'with no currency' do
+      let(:currency) { nil }
+      let(:amount){ 10 }
+      it { should == "$10.00 USD" }
+    end
+
+    context 'with currency' do
+      let(:currency){ 'USD' }
+
+      context "CAD" do
+        let(:amount){ '10.00' }
+        let(:currency){ 'CAD' }
+        it { should == "$10.00 CAD" }
+      end
+
+      context "with string amount" do
+        let(:amount){ '10.00' }
+        it { should == "$10.00 USD" }
+      end
+
+      context "with no decimal point" do
+        let(:amount){ '10' }
+        it { should == "$10.00 USD" }
+      end
+
+      context "with symbol" do
+        let(:amount){ '$10.00' }
+        it { should == "$10.00 USD" }
+      end
+
+      context "with extra currency" do
+        let(:amount){ '$10.00 USD' }
+        it { should == "$10.00 USD" }
+      end
+
+      context "with different currency" do
+        let(:currency){ 'USD' }
+        let(:amount){ '$10.00 CAD' }
+        it { should == "$10.00 CAD" }
+      end
+
+      context "with commas" do
+        let(:amount){ '1,000.00' }
+        it { should == "$1,000.00 USD" }
+      end
+
+      context "with comma for decimal point" do
+        let(:amount){ '10,00' }
+        it { should == "$10.00 USD" }
+      end
+
+      context 'with fixnum' do
+        let(:amount){ 10 }
+        it { should == "$10.00 USD" }
+      end
+
+      context 'with float' do
+        let(:amount){ 10.00 }
+        it { should == "$10.00 USD" }
+      end
+
+      context 'with BigDecimal' do
+        let(:amount){ BigDecimal.new('10.00') }
+        it { should == "$10.00 USD" }
+      end
+    end
+  end
+
   it "formats correctly" do
     money = Spree::Money.new(10)
     expect(money.to_s).to eq("$10.00")

data/spec/models/spree/app_configuration_spec.rb

@@ -20,16 +20,16 @@ describe Spree::AppConfiguration, type: :model do
     expect(prefs.variant_search_class).to eq Spree::Core::Search::Variant
   end
 
-  it "uses variant pricer class by default" do
-    expect(prefs.variant_pricer_class).to eq Spree::Variant::Pricer
+  it "uses variant price selector class by default" do
+    expect(prefs.variant_price_selector_class).to eq Spree::Variant::PriceSelector
   end
 
-  it "has a getter for the pricing options class provided by the variant pricer class" do
-    expect(prefs.pricing_options_class).to eq Spree::Variant::Pricer.pricing_options_class
+  it "has a getter for the pricing options class provided by the variant price selector class" do
+    expect(prefs.pricing_options_class).to eq Spree::Variant::PriceSelector.pricing_options_class
   end
 
   it "has an instacached getter for the default pricing options" do
-    expect(prefs.default_pricing_options).to be_a Spree::Variant::Pricer.pricing_options_class
+    expect(prefs.default_pricing_options).to be_a Spree::Variant::PriceSelector.pricing_options_class
     expect(prefs.default_pricing_options.object_id).to eq prefs.default_pricing_options.object_id
   end