solidus_core 2.8.6 → 2.9.0.rc.1

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

@@ -77,7 +77,7 @@ module Spree::Stock
         end
 
         context 'with config.track_inventory_levels=false' do
-          before { Spree::Config.track_inventory_levels = false }
+          before { stub_spree_preferences(track_inventory_levels: false) }
 
           it "has infinite inventory " do
             expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity))

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

@@ -195,13 +195,11 @@ module Spree
               Spree::ShippingRate.new
             end
           end
-          Spree::Config.shipping_rate_selector_class = selector_class
+          stub_spree_preferences(shipping_rate_selector_class: selector_class)
 
           subject.shipping_rates(package)
 
           expect(shipping_rate.selected).to eq(true)
-
-          Spree::Config.shipping_rate_selector_class = nil
         end
 
         it 'uses the configured shipping rate sorter' do
@@ -209,7 +207,8 @@ module Spree
             def initialize(_rates)
             end
           end
-          Spree::Config.shipping_rate_sorter_class = Spree::Stock::TestSorter
+
+          stub_spree_preferences(shipping_rate_sorter_class: Spree::Stock::TestSorter)
 
           sorter = double(:sorter, sort: nil)
           allow(Spree::Stock::TestSorter).to receive(:new) { sorter }
@@ -217,8 +216,6 @@ module Spree
           subject.shipping_rates(package)
 
           expect(sorter).to have_received(:sort)
-
-          Spree::Config.shipping_rate_sorter_class = nil
         end
 
         it 'uses the configured shipping rate taxer' do
@@ -232,7 +229,8 @@ module Spree
               ]
             end
           end
-          Spree::Config.shipping_rate_tax_calculator_class = Spree::Tax::TestTaxCalculator
+
+          stub_spree_preferences(shipping_rate_tax_calculator_class: Spree::Tax::TestTaxCalculator)
 
           expect(Spree::Tax::TestTaxCalculator).to receive(:new).and_call_original
           subject.shipping_rates(package)

data/spec/models/spree/stock/location_filter/active_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+module Spree
+  module Stock
+    module LocationFilter
+      RSpec.describe Active, type: :model do
+        subject { described_class.new(stock_locations, order) }
+
+        let!(:active_stock_location) { create(:stock_location) }
+        let!(:inactive_stock_location) { create(:stock_location, active: false) }
+        let(:stock_locations) { Spree::StockLocation.all }
+        let(:order) { instance_double('Spree::Order') }
+
+        it 'returns only active stock locations' do
+          expect(subject.filter).to eq([active_stock_location])
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/stock/location_sorter/default_first_spec.rb

@@ -8,8 +8,10 @@ module Spree
       RSpec.describe DefaultFirst, type: :model do
         subject { described_class.new(stock_locations) }
 
-        let(:stock_locations) { OpenStruct.new(order_default: sorted_stock_locations) }
-        let(:sorted_stock_locations) { instance_double('Spree::StockLocation::ActiveRecord_Relation') }
+        let!(:first_stock_location) { create(:stock_location, default: false) }
+        let!(:second_stock_location) { create(:stock_location, default: true) }
+        let(:stock_locations) { Spree::StockLocation.all }
+        let(:sorted_stock_locations) { stock_locations.reverse }
 
         it 'returns the default stock location first' do
           expect(subject.sort).to eq(sorted_stock_locations)

data/spec/models/spree/stock/location_sorter/unsorted_spec.rb

@@ -8,7 +8,9 @@ module Spree
       RSpec.describe Unsorted, type: :model do
         subject { described_class.new(stock_locations) }
 
-        let(:stock_locations) { instance_double('Spree::StockLocation::ActiveRecord_Relation') }
+        let!(:first_stock_location) { create(:stock_location) }
+        let!(:second_stock_location) { create(:stock_location) }
+        let(:stock_locations) { Spree::StockLocation.all }
 
         it 'returns the original stock locations unsorted' do
           expect(subject.sort).to eq(stock_locations)

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

@@ -27,7 +27,7 @@ module Spree
         end
 
         context 'when track_inventory_levels is false' do
-          before { configure_spree_preferences { |config| config.track_inventory_levels = false } }
+          before { stub_spree_preferences track_inventory_levels: false }
 
           specify { expect(subject.total_on_hand).to eq(Float::INFINITY) }
 

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

@@ -15,6 +15,11 @@ module Spree
           subject.shipments
         end
 
+        it 'uses the configured stock location filter' do
+          expect(Spree::Config.stock).to receive(:location_filter_class).and_call_original
+          subject.shipments
+        end
+
         it 'uses the configured stock location sorter' do
           expect(Spree::Config.stock).to receive(:location_sorter_class).and_call_original
           subject.shipments

data/spec/models/spree/stock_item_spec.rb

@@ -196,7 +196,7 @@ RSpec.describe Spree::StockItem, type: :model do
 
     context "inventory_cache_threshold is set" do
       before do
-        Spree::Config.inventory_cache_threshold = inventory_cache_threshold
+        stub_spree_preferences(inventory_cache_threshold: inventory_cache_threshold)
       end
 
       let(:inventory_cache_threshold) { 5 }
@@ -241,7 +241,7 @@ RSpec.describe Spree::StockItem, type: :model do
 
     context "when deprecated binary_inventory_cache is used" do
       before do
-        Spree::Config.binary_inventory_cache = binary_inventory_cache
+        stub_spree_preferences(binary_inventory_cache: binary_inventory_cache)
         allow(Spree::Deprecation).to receive(:warn)
         subject.set_count_on_hand(9)
       end
@@ -256,6 +256,7 @@ RSpec.describe Spree::StockItem, type: :model do
 
       context "binary_inventory_cache is set to false" do
         let(:binary_inventory_cache) { false }
+
         it "inventory_cache_threshold remains nil" do
           expect(Spree::Config.inventory_cache_threshold).to be_nil
         end

data/spec/models/spree/stock_movement_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Spree::StockMovement, type: :model do
   end
 
   it 'does not update count on hand when track inventory levels is false' do
-    Spree::Config[:track_inventory_levels] = false
+    stub_spree_preferences(track_inventory_levels: false)
     subject.quantity = 1
     subject.save
     stock_item.reload

data/spec/models/spree/store_credit_spec.rb

@@ -507,7 +507,7 @@ RSpec.describe Spree::StoreCredit do
       let(:auth_code)       { event_auth_code }
 
       context "credit_to_new_allocation is set" do
-        before { Spree::Config[:credit_to_new_allocation] = true }
+        before { stub_spree_preferences(credit_to_new_allocation: true) }
 
         it "returns true" do
           expect(subject).to be true

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

@@ -20,7 +20,7 @@ RSpec.describe Spree::Tax::OrderAdjuster do
     let(:custom_calculator_instance) { double }
 
     before do
-      Spree::Config.tax_calculator_class = custom_calculator_class
+      stub_spree_preferences(tax_calculator_class: custom_calculator_class)
     end
 
     it 'calls the configured tax calculator' do

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

@@ -135,7 +135,7 @@ RSpec.describe "Taxation system integration tests" do
     end
 
     before do
-      Spree::Config.admin_vat_country_iso = "DE"
+      stub_spree_preferences(admin_vat_country_iso: "DE")
       order.contents.add(variant)
     end
 

data/spec/models/spree/tax_category_spec.rb

@@ -26,4 +26,25 @@ RSpec.describe Spree::TaxCategory, type: :model do
       expect(tax_category.is_default).to be true
     end
   end
+
+  context ".discard" do
+    let(:tax_category) { create(:tax_category) }
+
+    it "set deleted_at correctly" do
+      tax_category.discard
+      expect(tax_category.deleted_at).not_to be_blank
+    end
+
+    context "when there are tax_rates associated" do
+      let(:tax_rate) { create(:tax_rate) }
+      let(:tax_category) { tax_rate.tax_categories.first }
+
+      it 'correctly discard association records' do
+        expect { tax_category.discard }
+          .to change { tax_category.tax_rates.size }
+          .from(1)
+          .to(0)
+      end
+    end
+  end
 end

data/spec/models/spree/taxon_spec.rb

@@ -26,6 +26,14 @@ RSpec.describe Spree::Taxon, type: :model do
       expect(taxon.permalink).to eql "ruby-on-rails"
     end
 
+    context "updating a taxon permalink" do
+      it 'parameterizes permalink correctly' do
+        taxon.save!
+        taxon.update_attributes(permalink: 'spécial&charactèrs')
+        expect(taxon.permalink).to eql "special-characters"
+      end
+    end
+
     context "with parent taxon" do
       let(:parent) { FactoryBot.build(:taxon, permalink: "brands") }
       before       { allow(taxon).to receive_messages parent: parent }
@@ -41,6 +49,12 @@ RSpec.describe Spree::Taxon, type: :model do
         expect(taxon.permalink).to eql "brands/rubyonrails"
       end
 
+      it 'parameterizes permalink correctly' do
+        taxon.save!
+        taxon.update_attributes(permalink_part: 'spécial&charactèrs')
+        expect(taxon.reload.permalink).to eql "brands/special-characters"
+      end
+
       # Regression test for https://github.com/spree/spree/issues/3390
       context "setting a new node sibling position via :child_index=" do
         let(:idx) { rand(0..100) }
@@ -121,6 +135,20 @@ RSpec.describe Spree::Taxon, type: :model do
         is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/t1/foo/t2_child')
       end
     end
+
+    context 'changing parent permalink with special characters ' do
+      subject do
+        -> { taxon2.update!(permalink: 'spécial&charactèrs') }
+      end
+
+      it 'changes own permalink with parameterized characters' do
+        is_expected.to change{ taxon2.reload.permalink }.from('t/t2').to('t/special-characters')
+      end
+
+      it 'changes child permalink with parameterized characters' do
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/special-characters/t2_child')
+      end
+    end
   end
 
   # Regression test for https://github.com/spree/spree/issues/2620

data/spec/models/spree/unit_cancel_spec.rb

@@ -76,5 +76,46 @@ RSpec.describe Spree::UnitCancel do
         expect(line_item.reload.total.to_d).to eq(0)
       end
     end
+
+    context 'when line item has additional taxes' do
+      let(:world_zone) { create(:zone, :with_country) }
+      let(:tax_category) { create :tax_category }
+      let(:product) { create :product, tax_category: tax_category }
+      let!(:additional_tax_rate) do
+        create(
+          :tax_rate,
+          name: 'Additional tax',
+          tax_categories: [tax_category],
+          zone: world_zone,
+          included_in_price: false,
+          amount: 0.15
+        )
+      end
+      let(:shipping_category) { create :shipping_category }
+      let(:shipping_method) do
+        create :shipping_method,
+               cost: 8.00,
+               shipping_categories: [shipping_category],
+               tax_category: tax_category,
+               zones: [world_zone]
+      end
+      let(:shipping_address) { create :address, country_iso_code: world_zone.countries.first.iso }
+      let(:order) do
+        create(
+          :order_with_line_items,
+          ship_address: shipping_address,
+          line_items_attributes: [{ product: product }]
+        )
+      end
+      let(:line_item) { order.line_items.first }
+      let(:inventory_unit) { line_item.inventory_units.first }
+
+      before { order.recalculate }
+
+      it 'does not include line item additional taxes' do
+        expect(line_item.additional_tax_total).not_to eq 0
+        expect(subject).to eq(-5.0)
+      end
+    end
   end
 end

data/spec/models/spree/user_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Spree::LegacyUser, type: :model do
 
     context "with completable_order_created_cutoff set" do
       before do
-        Spree::Config.completable_order_created_cutoff_days = 1
+        stub_spree_preferences(completable_order_created_cutoff_days: 1)
       end
 
       it "excludes orders updated outside of the cutoff date" do
@@ -47,7 +47,7 @@ RSpec.describe Spree::LegacyUser, type: :model do
 
     context "with completable_order_created_cutoff set" do
       before do
-        Spree::Config.completable_order_updated_cutoff_days = 1
+        stub_spree_preferences(completable_order_updated_cutoff_days: 1)
       end
 
       it "excludes orders updated outside of the cutoff date" do
@@ -142,7 +142,7 @@ RSpec.describe Spree.user_class, type: :model do
     describe "#order_count" do
       before { load_orders }
       it "returns the count of completed orders for the user" do
-        expect(subject.order_count).to eq BigDecimal(order_count)
+        expect(subject.order_count).to eq order_count
       end
     end
 

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

@@ -70,6 +70,29 @@ RSpec.describe Spree::Variant::PricingOptions do
     end
   end
 
+  context ".from_context" do
+    let(:view_context) { double(ApplicationController, current_store: store) }
+    subject { described_class.from_context(view_context) }
+
+    context "if the store has not defined default_currency" do
+      let(:store) { FactoryBot.create :store, default_currency: nil, cart_tax_country_iso: nil }
+
+      it "fallbacks to Spree::Config.currency" do
+        expect(Spree::Variant::PricingOptions).to receive(:new).with(currency: Spree::Config.currency, country_iso: nil)
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'if the store has default_currency and cart_tax_country_iso' do
+      let(:store) { FactoryBot.create :store, default_currency: 'MXN' }
+
+      it "uses current_store information" do
+        expect(Spree::Variant::PricingOptions).to receive(:new).with(currency: store.default_currency, country_iso: store.cart_tax_country_iso)
+        expect(subject).to be_nil
+      end
+    end
+  end
+
   describe '#desired_attributes' do
     context "when called with no arguments" do
       it "returns the default pricing options" do

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

@@ -18,7 +18,7 @@ RSpec.describe Spree::Variant::VatPriceGenerator do
     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"
+      stub_spree_preferences(admin_vat_country_iso: "DE")
     end
 
     it "builds a correct price including VAT for all VAT countries" do

data/spec/models/spree/variant_spec.rb

@@ -516,7 +516,7 @@ RSpec.describe Spree::Variant, type: :model do
 
   describe '#in_stock?' do
     before do
-      Spree::Config.track_inventory_levels = true
+      stub_spree_preferences(track_inventory_levels: true)
     end
 
     context 'when stock_items are not backorderable' do
@@ -597,7 +597,7 @@ RSpec.describe Spree::Variant, type: :model do
 
   describe '#total_on_hand' do
     it 'should be infinite if track_inventory_levels is false' do
-      Spree::Config[:track_inventory_levels] = false
+      stub_spree_preferences(track_inventory_levels: false)
       expect(build(:variant).total_on_hand).to eql(Float::INFINITY)
     end
 
@@ -640,19 +640,19 @@ RSpec.describe Spree::Variant, type: :model do
 
   describe "#should_track_inventory?" do
     it 'should not track inventory when global setting is off' do
-      Spree::Config[:track_inventory_levels] = false
+      stub_spree_preferences(track_inventory_levels: false)
 
       expect(build(:variant).should_track_inventory?).to eq(false)
     end
 
     it 'should not track inventory when variant is turned off' do
-      Spree::Config[:track_inventory_levels] = true
+      stub_spree_preferences(track_inventory_levels: true)
 
       expect(build(:on_demand_variant).should_track_inventory?).to eq(false)
     end
 
     it 'should track inventory when global and variant are on' do
-      Spree::Config[:track_inventory_levels] = true
+      stub_spree_preferences(track_inventory_levels: true)
 
       expect(build(:variant).should_track_inventory?).to eq(true)
     end
@@ -749,8 +749,7 @@ RSpec.describe Spree::Variant, type: :model do
     end
 
     context "inventory levels globally not tracked" do
-      before { Spree::Config.track_inventory_levels = false }
-      after { Spree::Config.track_inventory_levels = true }
+      before { stub_spree_preferences(track_inventory_levels: false) }
 
       it 'includes items without inventory' do
         expect( subject ).to include out_of_stock_variant
@@ -783,8 +782,12 @@ RSpec.describe Spree::Variant, type: :model do
       expect( subject ).not_to include(out_of_stock_variant)
     end
 
+    it "includes variants only once" do
+      expect(subject.to_a.count(in_stock_variant)).to be 1
+    end
+
     context "inventory levels globally not tracked" do
-      before { Spree::Config.track_inventory_levels = false }
+      before { stub_spree_preferences(track_inventory_levels: false) }
 
       it "includes all variants" do
         expect( subject ).to include(in_stock_variant, backordered_variant, out_of_stock_variant)

data/spec/models/spree/wallet_payment_source_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe Spree::WalletPaymentSource, type: :model do
   subject { Spree::WalletPaymentSource }
 
   describe "validation" do
+    let(:user) { create(:user) }
+
     context 'with a non-PaymentSource model' do
       with_model 'NonPaymentSource', scope: :all do
         model do
@@ -19,28 +21,55 @@ RSpec.describe Spree::WalletPaymentSource, type: :model do
       it "errors when `payment_source` is not a `Spree::PaymentSource`" do
         wallet_payment_source = Spree::WalletPaymentSource.new(
           payment_source: payment_source,
-          user: create(:user)
+          user: user
         )
 
         expect(wallet_payment_source).not_to be_valid
         expect(wallet_payment_source.errors.messages).to eq(
-          { payment_source: ["has to be a Spree::PaymentSource"] }
+          { payment_source: ["is not a valid payment source"] }
         )
       end
     end
 
+    it "is invalid if `payment_source` is already in the user's wallet" do
+      credit_card = create(:credit_card, user: user)
+      Spree::WalletPaymentSource.create(
+        payment_source: credit_card,
+        user: user
+      )
+      wallet_payment_source = subject.new(
+        payment_source: credit_card,
+        user: user
+      )
+      expect(wallet_payment_source).not_to be_valid
+      expect(wallet_payment_source.errors.messages).to eq(
+        { user_id: ["already has this payment source in their wallet"] }
+      )
+    end
+
+    it "is invalid when `payment_source` is not owned by the user" do
+      wallet_payment_source = subject.new(
+        payment_source: create(:credit_card),
+        user: user
+      )
+      expect(wallet_payment_source).not_to be_valid
+      expect(wallet_payment_source.errors.messages).to eq(
+        { payment_source: ["does not belong to the user associated with the order"] }
+      )
+    end
+
     it "is valid with a `credit_card` as `payment_source`" do
       valid_attrs = {
-        payment_source: create(:credit_card),
-        user: create(:user)
+        payment_source: create(:credit_card, user: user),
+        user: user
       }
       expect(subject.new(valid_attrs)).to be_valid
     end
 
     it "is valid with `store_credit` as `payment_source`" do
       valid_attrs = {
-        payment_source: create(:store_credit),
-        user: create(:user)
+        payment_source: create(:store_credit, user: user),
+        user: user
       }
       expect(subject.new(valid_attrs)).to be_valid
     end