solidus_core 2.4.2 → 2.5.0.beta1

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

@@ -26,10 +26,6 @@ module Spree
         it "builds the inventory units as pending" do
           expect(subject.units.map(&:pending).uniq).to eq [true]
         end
-
-        it "associates the inventory units to the order" do
-          expect(subject.units.map(&:order).uniq).to eq [order]
-        end
       end
     end
   end

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

@@ -6,11 +6,12 @@ module Spree
       let(:variant) { build(:variant, weight: 25.0) }
       let(:stock_location) { build(:stock_location) }
       let(:order) { build(:order) }
+      let(:line_item) { build(:line_item, order: order) }
 
       subject { Package.new(stock_location) }
 
       def build_inventory_unit
-        build(:inventory_unit, variant: variant, order: order)
+        build(:inventory_unit, variant: variant, line_item: line_item)
       end
 
       it 'calculates the weight of all the contents' do
@@ -164,7 +165,7 @@ module Spree
 
           it "returns an order" do
             expect(subject.order).to be_a_kind_of Spree::Order
-            expect(subject.order).to eq unit.order
+            expect(subject.order).to eq order
           end
         end
 

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

@@ -109,7 +109,7 @@ module Spree
 
         context 'with no stock locations' do
           let(:location_1_inventory) { 0 }
-          before { variant.stock_items.destroy_all }
+          before { variant.stock_items.each(&:really_destroy!) }
           it_behaves_like "an unfulfillable package"
         end
 
@@ -184,29 +184,6 @@ module Spree
             let(:location_2_inventory) { 5 }
             it_behaves_like "a fulfillable package"
           end
-
-          context "with a location configured package" do
-            before do
-              order.order_stock_locations.create(
-                stock_location: stock_location_2,
-                quantity: 3,
-                variant: variant
-              )
-            end
-            let(:location_quantity) { 3 }
-
-            context "and sufficient inventory" do
-              let(:location_1_inventory) { 5 }
-              let(:location_2_inventory) { 5 }
-              it_behaves_like "a fulfillable package"
-            end
-
-            context "and insufficient inventory" do
-              let(:location_1_inventory) { 0 }
-              let(:location_2_inventory) { 3 }
-              it_behaves_like "an unfulfillable package"
-            end
-          end
         end
 
         context 'with three stock locations' do

data/spec/models/spree/stock_item_spec.rb

@@ -149,12 +149,12 @@ RSpec.describe Spree::StockItem, type: :model do
     before { Spree::StockMovement.create(stock_item: subject, quantity: 1) }
 
     it "doesnt raise ReadOnlyRecord error" do
-      subject.destroy
+      subject.discard
     end
   end
 
   context "destroyed" do
-    before { subject.destroy }
+    before { subject.discard }
 
     it "recreates stock item just fine" do
       stock_location.stock_items.create!(variant: subject.variant)
@@ -277,8 +277,8 @@ RSpec.describe Spree::StockItem, type: :model do
 
   # Regression test for https://github.com/spree/spree/issues/4651
   context "variant" do
-    it "can be found even if the variant is deleted" do
-      subject.variant.destroy
+    it "can be found even if the variant is soft-deleted" do
+      subject.variant.discard
       expect(subject.reload.variant).not_to be_nil
     end
   end
@@ -293,14 +293,14 @@ RSpec.describe Spree::StockItem, type: :model do
       shared_examples_for 'valid count_on_hand' do
         it 'has :no errors_on' do
           expect(subject).to be_valid
-          expect(subject.errors_on(:count_on_hand).size).to eq(0)
+          expect(subject.errors[:count_on_hand].size).to eq(0)
         end
       end
 
       shared_examples_for 'invalid count_on_hand' do
         it 'has the correct error on count_on_hand' do
           expect(subject).not_to be_valid
-          expect(subject.error_on(:count_on_hand).size).to eq(1)
+          expect(subject.errors[:count_on_hand].size).to eq(1)
           expect(subject.errors[:count_on_hand]).to include('must be greater than or equal to 0')
         end
       end

data/spec/models/spree/stock_location_spec.rb

@@ -95,7 +95,7 @@ module Spree
     describe '#stock_item_or_create' do
       before do
         variant = create(:variant)
-        variant.stock_items.destroy_all
+        variant.stock_items.each(&:really_destroy!)
         variant.save
       end
 
@@ -213,7 +213,20 @@ module Spree
 
         it 'zero on_hand and backordered' do
           subject
-          variant.stock_items.destroy_all
+          variant.stock_items.each(&:really_destroy!)
+          on_hand, backordered = subject.fill_status(variant, 1)
+          expect(on_hand).to eq 0
+          expect(backordered).to eq 0
+        end
+      end
+
+      context 'with soft-deleted stock_items' do
+        subject { create(:stock_location) }
+        let(:variant) { create(:base_variant) }
+
+        it 'zero on_hand and backordered' do
+          subject
+          variant.stock_items.discard_all
           on_hand, backordered = subject.fill_status(variant, 1)
           expect(on_hand).to eq 0
           expect(backordered).to eq 0
@@ -247,7 +260,7 @@ module Spree
       end
 
       context "no stock item exists" do
-        before { subject.stock_items.destroy_all }
+        before { subject.stock_items.each(&:really_destroy!) }
         context "positive movement" do
           let(:quantity) { 1 }
           it "creates a stock item" do

data/spec/models/spree/store_credit_spec.rb

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::StoreCredit do
+  include ActiveSupport::Testing::TimeHelpers
+
   let(:currency) { "TEST" }
   let(:store_credit) { build(:store_credit, store_credit_attrs) }
   let(:store_credit_attrs) { {} }
@@ -10,12 +12,16 @@ RSpec.describe Spree::StoreCredit do
 
     context "amount used is greater than zero" do
       let(:store_credit) { create(:store_credit, amount: 100, amount_used: 1) }
-      subject { store_credit.destroy }
 
-      it 'can not delete the store credit' do
-        subject
-        expect(store_credit.reload).to eq store_credit
-        expect(store_credit.errors[:amount_used]).to include("is greater than zero. Can not delete store credit")
+      describe "#discard" do
+        subject { store_credit.discard }
+
+        it 'can not delete the store credit' do
+          subject
+          expect(store_credit.reload).to eq store_credit
+          expect(store_credit.errors[:amount_used]).to include("is greater than zero. Can not delete store credit")
+          expect(store_credit).not_to be_discarded
+        end
       end
     end
 
@@ -839,7 +845,7 @@ RSpec.describe Spree::StoreCredit do
 
     it "sets the invalidated_at field to the current time" do
       invalidated_at = 2.minutes.from_now
-      Timecop.freeze(invalidated_at) do
+      travel_to(invalidated_at) do
         subject
         expect(store_credit.invalidated_at).to be_within(1.second).of invalidated_at
       end

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

@@ -646,16 +646,16 @@ RSpec.describe "Taxation system integration tests" do
           expect(line_item.additional_tax_total).to eq(3)
         end
 
-        it "should delete adjustments for open order when taxrate is deleted" do
-          new_york_books_tax.destroy!
-          federal_books_tax.destroy!
+        it "should delete adjustments for open order when taxrate is soft-deleted" do
+          new_york_books_tax.discard
+          federal_books_tax.discard
           expect(line_item.adjustments.count).to eq(0)
         end
 
-        it "should not delete adjustments for complete order when taxrate is deleted" do
+        it "should not delete adjustments for complete order when taxrate is soft-deleted" do
           order.update_column :completed_at, Time.now
-          new_york_books_tax.destroy!
-          federal_books_tax.destroy!
+          new_york_books_tax.discard
+          federal_books_tax.discard
           expect(line_item.adjustments.count).to eq(2)
         end
 

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

@@ -1,15 +1,15 @@
 require 'rails_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(:shipping_address) { FactoryBot.create(:address, state: new_york) }
+  let(:order) { FactoryBot.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(:new_york) { FactoryBot.create(:state, state_code: "NY") }
+  let(:new_york_zone) { FactoryBot.create(:zone, states: [new_york]) }
 
-  let(:books_category) { FactoryGirl.create(:tax_category, name: "Books") }
+  let(:books_category) { FactoryBot.create(:tax_category, name: "Books") }
   let!(:book_tax_rate) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :tax_rate,
       name: "New York Sales Tax",
       tax_categories: [books_category],
@@ -20,7 +20,7 @@ RSpec.describe Spree::TaxCalculator::Default do
   end
 
   before do
-    book = FactoryGirl.create(
+    book = FactoryBot.create(
       :product,
       price: 20,
       name: "Book",

data/spec/models/spree/taxon_spec.rb

@@ -4,28 +4,22 @@ require 'rails_helper'
 
 RSpec.describe Spree::Taxon, type: :model do
   describe '#to_param' do
-    let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") }
+    let(:taxon) { FactoryBot.build(:taxon, name: "Ruby on Rails") }
 
     subject { super().to_param }
     it { is_expected.to eql taxon.permalink }
   end
 
   context "set_permalink" do
-    let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") }
+    let(:taxon) { FactoryBot.build(:taxon, name: "Ruby on Rails") }
 
     it "should set permalink correctly when no parent present" do
       taxon.set_permalink
       expect(taxon.permalink).to eql "ruby-on-rails"
     end
 
-    it "should support Chinese characters" do
-      taxon.name = "你好"
-      taxon.set_permalink
-      expect(taxon.permalink).to eql 'ni-hao'
-    end
-
     context "with parent taxon" do
-      let(:parent) { FactoryGirl.build(:taxon, permalink: "brands") }
+      let(:parent) { FactoryBot.build(:taxon, permalink: "brands") }
       before       { allow(taxon).to receive_messages parent: parent }
 
       it "should set permalink correctly when taxon has parent" do
@@ -39,12 +33,6 @@ RSpec.describe Spree::Taxon, type: :model do
         expect(taxon.permalink).to eql "brands/rubyonrails"
       end
 
-      it "should support Chinese characters" do
-        taxon.name = "我"
-        taxon.set_permalink
-        expect(taxon.permalink).to eql "brands/wo"
-      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) }
@@ -80,7 +68,7 @@ RSpec.describe Spree::Taxon, type: :model do
       end
 
       it "changes child's permalink" do
-        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/t1/t2/t2-child')
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/t1/t2/t2_child')
       end
     end
 
@@ -94,7 +82,7 @@ RSpec.describe Spree::Taxon, type: :model do
       end
 
       it "changes child's permalink" do
-        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/foo/t2-child')
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/foo/t2_child')
       end
     end
 
@@ -108,7 +96,7 @@ RSpec.describe Spree::Taxon, type: :model do
       end
 
       it "changes child's permalink" do
-        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/foo/t2-child')
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/foo/t2_child')
       end
     end
 
@@ -122,7 +110,7 @@ RSpec.describe Spree::Taxon, type: :model do
       end
 
       it "changes child's permalink" do
-        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/t1/foo/t2-child')
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2_child').to('t/t1/foo/t2_child')
       end
     end
   end
@@ -135,4 +123,39 @@ RSpec.describe Spree::Taxon, type: :model do
       taxonomy.root.children.unscoped.where(name: "Some name").first_or_create
     end
   end
+
+  context 'leaves of the taxon tree' do
+    let(:taxonomy) { create(:taxonomy, name: 't') }
+    let(:root) { taxonomy.root }
+    let(:taxon) { create(:taxon, name: 't1', taxonomy: taxonomy, parent: root) }
+    let(:child) { create(:taxon, name: 'child taxon', taxonomy: taxonomy, parent: taxon) }
+    let(:grandchild) { create(:taxon, name: 'grandchild taxon', taxonomy: taxonomy, parent: child) }
+    let(:product1) { create(:product) }
+    let(:product2) { create(:product) }
+    let(:product3) { create(:product) }
+    before do
+      product1.taxons << taxon
+      product2.taxons << child
+      product3.taxons << grandchild
+      taxon.reload
+
+      [product1, product2, product3].each { |p| 2.times.each { create(:variant, product: p) } }
+    end
+
+    describe '#all_products' do
+      it 'returns all descendant products' do
+        products = taxon.all_products
+        expect(products.count).to eq(3)
+        expect(products).to match_array([product1, product2, product3])
+      end
+    end
+
+    describe '#all_variants' do
+      it 'returns all descendant variants' do
+        variants = taxon.all_variants
+        expect(variants.count).to eq(9)
+        expect(variants).to match_array([product1, product2, product3].map{ |p| p.variants_including_master }.flatten)
+      end
+    end
+  end
 end

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

@@ -35,7 +35,7 @@ RSpec.describe Spree::Variant::VatPriceGenerator do
 
     # We need to remove the price for FR from the database so it is created in memory, and then run VatPriceGenerator twice to trigger the duplicate price issue.
     it "will not build duplicate prices on multiple runs" do
-      variant.prices.where(country_iso: "FR").destroy_all
+      variant.prices.where(country_iso: "FR").each(&:really_destroy!)
       variant.reload
       described_class.new(variant).run
       expect { subject }.not_to change { variant.prices.size }

data/spec/models/spree/variant_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe Spree::Variant, type: :model do
   context "product has other variants" do
     describe "option value accessors" do
       before {
-        @multi_variant = FactoryGirl.create :variant, product: variant.product
+        @multi_variant = FactoryBot.create :variant, product: variant.product
         variant.product.reload
       }
 
@@ -145,7 +145,7 @@ RSpec.describe Spree::Variant, type: :model do
       context "and a variant is soft-deleted" do
         let!(:old_options_text) { variant.options_text }
 
-        before { variant.destroy }
+        before { variant.discard }
 
         it "still keeps the option values for that variant" do
           expect(variant.reload.options_text).to eq(old_options_text)
@@ -654,19 +654,43 @@ RSpec.describe Spree::Variant, type: :model do
     end
   end
 
-  describe "deleted_at scope" do
-    let!(:previous_variant_price) { variant.display_price }
+  describe "#discard" do
+    it "discards related associations" do
+      variant.images = [create(:image)]
 
-    before { variant.destroy }
+      expect(variant.stock_items).not_to be_empty
+      expect(variant.prices).not_to be_empty
+      expect(variant.currently_valid_prices).not_to be_empty
 
-    it "should keep its price if deleted" do
-      expect(variant.display_price).to eq(previous_variant_price)
+      variant.discard
+
+      expect(variant.images).to be_empty
+      expect(variant.stock_items).to be_empty
+      expect(variant.prices).to be_empty
+      expect(variant.currently_valid_prices).to be_empty
     end
 
-    context 'when loading with pre-fetching of default_price' do
-      it 'also keeps the previous price' do
-        reloaded_variant = Spree::Variant.with_deleted.includes(:default_price).find_by(id: variant.id)
-        expect(reloaded_variant.display_price).to eq(previous_variant_price)
+    describe 'default_price' do
+      let!(:previous_variant_price) { variant.display_price }
+
+      it "should discard default_price" do
+        variant.discard
+        variant.reload
+        expect(variant.default_price).to be_discarded
+      end
+
+      it "should keep its price if deleted" do
+        variant.discard
+        variant.reload
+        expect(variant.display_price).to eq(previous_variant_price)
+      end
+
+      context 'when loading with pre-fetching of default_price' do
+        it 'also keeps the previous price' do
+          variant.discard
+          reloaded_variant = Spree::Variant.with_deleted.includes(:default_price).find_by(id: variant.id)
+          expect(reloaded_variant.display_price).to eq(previous_variant_price)
+        end
       end
     end
   end
@@ -730,6 +754,40 @@ RSpec.describe Spree::Variant, type: :model do
     end
   end
 
+  describe ".suppliable" do
+    subject { Spree::Variant.suppliable }
+    let!(:in_stock_variant) { create(:variant) }
+    let!(:out_of_stock_variant) { create(:variant) }
+    let!(:backordered_variant) { create(:variant) }
+    let!(:stock_location) { create(:stock_location) }
+
+    before do
+      in_stock_variant.stock_items.update_all(count_on_hand: 10)
+      backordered_variant.stock_items.update_all(count_on_hand: 0, backorderable: true)
+      out_of_stock_variant.stock_items.update_all(count_on_hand: 0, backorderable: false)
+    end
+
+    it "includes the in stock variant" do
+      expect( subject ).to include(in_stock_variant)
+    end
+
+    it "includes out of stock variant" do
+      expect( subject ).to include(backordered_variant)
+    end
+
+    it "does not include out of stock variant" do
+      expect( subject ).not_to include(out_of_stock_variant)
+    end
+
+    context "inventory levels globally not tracked" do
+      before { Spree::Config.track_inventory_levels = false }
+
+      it "includes all variants" do
+        expect( subject ).to include(in_stock_variant, backordered_variant, out_of_stock_variant)
+      end
+    end
+  end
+
   describe "#display_image" do
     subject { variant.display_image }