solidus_core 2.3.1 → 2.4.0.beta1

data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::ReturnItem::EligibilityValidator::NoReimbursements do
+RSpec.describe Spree::ReturnItem::EligibilityValidator::NoReimbursements do
   let(:validator) { Spree::ReturnItem::EligibilityValidator::NoReimbursements.new(return_item) }
 
   describe "#eligible_for_return?" do

data/spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::ReturnItem::EligibilityValidator::OrderCompleted do
+RSpec.describe Spree::ReturnItem::EligibilityValidator::OrderCompleted do
   let(:inventory_unit) { create(:inventory_unit, order: order) }
   let(:return_item)    { create(:return_item, inventory_unit: inventory_unit) }
   let(:validator)      { Spree::ReturnItem::EligibilityValidator::OrderCompleted.new(return_item) }

data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :model do
+RSpec.describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :model do
   let(:return_item) { create(:return_item) }
   let(:validator) { Spree::ReturnItem::EligibilityValidator::RMARequired.new(return_item) }
 

data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type: :model do
+RSpec.describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type: :model do
   let(:inventory_unit) { create(:inventory_unit, order: create(:shipped_order)) }
   let(:return_item)    { create(:return_item, inventory_unit: inventory_unit) }
   let(:validator)      { Spree::ReturnItem::EligibilityValidator::TimeSincePurchase.new(return_item) }

data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
   module ReturnItem::ExchangeVariantEligibility
-    describe SameOptionValue, type: :model do
+    RSpec.describe SameOptionValue, type: :model do
       describe ".eligible_variants" do
         let(:color_option_type) { create(:option_type, name: "color") }
         let(:waist_option_type) { create(:option_type, name: "waist") }

data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
   module ReturnItem::ExchangeVariantEligibility
-    describe SameProduct, type: :model do
+    RSpec.describe SameProduct, type: :model do
       describe ".eligible_variants" do
         context "product has no variants" do
           it "returns the master variant for the same product" do

data/spec/models/spree/return_item_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-shared_examples "an invalid state transition" do |status, expected_status|
+RSpec.shared_examples "an invalid state transition" do |status, expected_status|
   let(:status) { status }
 
   it "cannot transition to #{expected_status}" do
@@ -8,7 +8,7 @@ shared_examples "an invalid state transition" do |status, expected_status|
   end
 end
 
-describe Spree::ReturnItem, type: :model do
+RSpec.describe Spree::ReturnItem, type: :model do
   all_reception_statuses = Spree::ReturnItem.state_machines[:reception_status].states.map(&:name).map(&:to_s)
   all_acceptance_statuses = Spree::ReturnItem.state_machines[:acceptance_status].states.map(&:name).map(&:to_s)
 
@@ -140,13 +140,13 @@ describe Spree::ReturnItem, type: :model do
     end
   end
 
-  describe "#display_pre_tax_amount" do
+  describe "#display_total_excluding_vat" do
     let(:amount) { 21.22 }
     let(:included_tax_total) { 1.22 }
     let(:return_item) { build(:return_item, amount: amount, included_tax_total: included_tax_total) }
 
     it "returns a Spree::Money" do
-      expect(return_item.display_pre_tax_amount).to eq Spree::Money.new(amount - included_tax_total)
+      expect(return_item.display_total_excluding_vat).to eq Spree::Money.new(amount - included_tax_total)
     end
   end
 
@@ -558,7 +558,7 @@ describe Spree::ReturnItem, type: :model do
     end
   end
 
-  describe "exchange pre_tax_amount" do
+  describe "exchange amount" do
     let(:return_item) { build(:return_item) }
 
     context "the return item is intended to be exchanged" do

data/spec/models/spree/returns_calculator_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe ReturnsCalculator, type: :model do
+  RSpec.describe ReturnsCalculator, type: :model do
     let(:return_item) { build(:return_item) }
     subject { ReturnsCalculator.new }
 

data/spec/models/spree/shipment_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'benchmark'
 
-describe Spree::Shipment, type: :model do
+RSpec.describe Spree::Shipment, type: :model do
   let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
   let(:shipping_method) { create(:shipping_method, name: "UPS") }
   let(:stock_location) { create(:stock_location) }
@@ -32,7 +32,9 @@ describe Spree::Shipment, type: :model do
 
       aggregate_failures("verifying new shipment attributes") do
         expect do
-          shipment.transfer_to_location(variant, 1, stock_location)
+          Spree::Deprecation.silence do
+            shipment.transfer_to_location(variant, 1, stock_location)
+          end
         end.to change { Spree::Shipment.count }.by(1)
 
         new_shipment = order.shipments.last
@@ -103,10 +105,10 @@ describe Spree::Shipment, type: :model do
     end
   end
 
-  context "display_final_price" do
+  context "display_total" do
     it "retuns a Spree::Money" do
-      allow(shipment).to receive(:final_price) { 21.22 }
-      expect(shipment.display_final_price).to eq(Spree::Money.new(21.22))
+      allow(shipment).to receive(:total) { 21.22 }
+      expect(shipment.display_total).to eq(Spree::Money.new(21.22))
     end
   end
 
@@ -143,7 +145,22 @@ describe Spree::Shipment, type: :model do
     shipment = create(:shipment)
     shipment.cost = 10
     shipment.promo_total = -1
-    expect(shipment.discounted_cost).to eq(9)
+    expect(Spree::Deprecation.silence { shipment.discounted_cost }).to eq(9)
+  end
+
+  describe '#total_before_tax' do
+    before do
+      shipment.update_attributes!(cost: 10)
+    end
+    let!(:admin_adjustment) { create(:adjustment, adjustable: shipment, order: shipment.order, amount: -1, source: nil) }
+    let!(:promo_adjustment) { create(:adjustment, adjustable: shipment, order: shipment.order, amount: -2, source: promo_action) }
+    let!(:ineligible_promo_adjustment) { create(:adjustment, eligible: false, adjustable: shipment, order: shipment.order, amount: -4, source: promo_action) }
+    let(:promo_action) { promo.actions[0] }
+    let(:promo) { create(:promotion, :with_line_item_adjustment) }
+
+    it 'returns the amount minus any adjustments' do
+      expect(shipment.total_before_tax).to eq(10 - 1 - 2)
+    end
   end
 
   it "#tax_total with included taxes" do
@@ -160,12 +177,12 @@ describe Spree::Shipment, type: :model do
     expect(shipment.tax_total).to eq(10)
   end
 
-  it "#final_price" do
+  it "#total" do
     shipment = Spree::Shipment.new
     shipment.cost = 10
     shipment.adjustment_total = -2
     shipment.included_tax_total = 1
-    expect(shipment.final_price).to eq(8)
+    expect(shipment.total).to eq(8)
   end
 
   context "manifest" do
@@ -264,13 +281,13 @@ describe Spree::Shipment, type: :model do
     end
   end
 
-  context "#update!" do
+  context "#update_state" do
     shared_examples_for "immutable once shipped" do
       before { shipment.update_columns(state: 'shipped') }
 
       it "should remain in shipped state once shipped" do
         expect {
-          shipment.update!(order)
+          shipment.update_state
         }.not_to change { shipment.state }
       end
     end
@@ -282,7 +299,7 @@ describe Spree::Shipment, type: :model do
 
         allow(shipment).to receive_messages(inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false)])
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
     end
 
@@ -292,7 +309,7 @@ describe Spree::Shipment, type: :model do
         # Set as ready so we can test for change
         shipment.update_attributes!(state: 'ready')
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
     end
 
@@ -300,7 +317,7 @@ describe Spree::Shipment, type: :model do
       before { allow(order).to receive_messages paid?: true }
       it "should result in a 'ready' state" do
         expect(shipment).to receive(:update_columns).with(state: 'ready', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
       it_should_behave_like 'immutable once shipped'
       it_should_behave_like 'pending if backordered'
@@ -313,7 +330,7 @@ describe Spree::Shipment, type: :model do
 
       it "should result in a 'ready' state" do
         expect(shipment).to receive(:update_columns).with(state: 'ready', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
       it_should_behave_like 'immutable once shipped'
       it_should_behave_like 'pending if backordered'
@@ -324,7 +341,7 @@ describe Spree::Shipment, type: :model do
       it "should result in a 'pending' state" do
         shipment.state = 'ready'
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
       it_should_behave_like 'immutable once shipped'
       it_should_behave_like 'pending if backordered'
@@ -335,7 +352,7 @@ describe Spree::Shipment, type: :model do
       it "should result in a 'ready' state" do
         shipment.state = 'pending'
         expect(shipment).to receive(:update_columns).with(state: 'ready', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
       it_should_behave_like 'immutable once shipped'
       it_should_behave_like 'pending if backordered'
@@ -347,7 +364,7 @@ describe Spree::Shipment, type: :model do
         expect(shipment).to receive :after_ship
         allow(shipment).to receive_messages determine_state: 'shipped'
         expect(shipment).to receive(:update_columns).with(state: 'shipped', updated_at: kind_of(Time))
-        shipment.update!(order)
+        shipment.update_state
       end
 
       # Regression test for https://github.com/spree/spree/issues/4347

data/spec/models/spree/shipping_calculator_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe ShippingCalculator, type: :model do
+  RSpec.describe ShippingCalculator, type: :model do
     let(:variant1) { build(:variant, price: 10) }
     let(:variant2) { build(:variant, price: 20) }
 

data/spec/models/spree/shipping_manifest_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe ShippingManifest, type: :model do
+  RSpec.describe ShippingManifest, type: :model do
     let!(:store) { create :store }
     let(:order) { Order.create! }
     let(:variant) { create :variant }

data/spec/models/spree/shipping_method_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 class DummyShippingCalculator < Spree::ShippingCalculator
 end
 
-describe Spree::ShippingMethod, type: :model do
+RSpec.describe Spree::ShippingMethod, type: :model do
   # Regression test for https://github.com/spree/spree/issues/4492
   context "#shipments" do
     let!(:shipping_method) { create(:shipping_method) }

data/spec/models/spree/shipping_rate_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::ShippingRate, type: :model do
+RSpec.describe Spree::ShippingRate, type: :model do
   let(:address) { create(:address) }
   let(:foreign_address) { create :address, country_iso_code: "DE" }
   let(:order) { create :order, ship_address: address }
@@ -19,9 +19,8 @@ describe Spree::ShippingRate, type: :model do
   end
 
   context "#display_price" do
-    let!(:default_zone) { create :zone, countries: [address.country], default_tax: default_tax }
+    let!(:default_zone) { create :zone, countries: [address.country] }
     let!(:other_zone) { create :zone, countries: [foreign_address.country] }
-    let(:default_tax) { false }
 
     before do
       allow(order).to receive(:tax_address).and_return(order_address)
@@ -57,39 +56,6 @@ describe Spree::ShippingRate, type: :model do
       end
     end
 
-    context 'with one tax rate that will be refunded' do
-      let(:default_tax) { true }
-      let!(:tax_rate) do
-        create :tax_rate,
-        included_in_price: true,
-        name: "VAT",
-        zone: default_zone,
-        tax_categories: [tax_category]
-      end
-
-      let(:order_address) { foreign_address }
-
-      before do
-        Spree::Deprecation.silence do
-          Spree::Tax::ShippingRateTaxer.new.tax(shipping_rate)
-        end
-      end
-
-      it "shows correct tax amount" do
-        expect(shipping_rate.display_price.to_s).to eq("$10.00 (excl. $0.91 #{tax_rate.name})")
-      end
-
-      context "when cost is zero" do
-        before do
-          shipping_rate.cost = 0
-        end
-
-        it "shows no tax amount" do
-          expect(shipping_rate.display_price.to_s).to eq("$0.00")
-        end
-      end
-    end
-
     context 'with one additional tax rate' do
       let!(:tax_rate) do
         create :tax_rate,

data/spec/models/spree/shipping_rate_tax_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
   RSpec.describe ShippingRateTax, type: :model do
@@ -55,12 +55,6 @@ module Spree
 
       context 'with an included tax rate' do
         let(:tax_rate) { build_stubbed(:tax_rate, included_in_price: true, name: "VAT") }
-        context 'with a negative amount' do
-          let(:amount) { -2.2 }
-          it 'labels a refund' do
-            expect(subject).to eq("excl. $2.20 VAT")
-          end
-        end
 
         context 'with a positive amount' do
           let(:amount) { 2.2 }

data/spec/models/spree/state_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::State, type: :model do
+RSpec.describe Spree::State, type: :model do
   describe '.with_name_or_abbr' do
     subject do
       Spree::State.with_name_or_abbr(search_term)

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

@@ -0,0 +1,127 @@
+require 'rails_helper'
+
+module Spree::Stock
+  RSpec.describe Availability do
+    let(:variants) { Spree::Variant.all.to_a }
+    let(:infinity) { Float::INFINITY }
+
+    let(:availability) { described_class.new(variants: variants) }
+
+    let!(:stock_location1) { create(:stock_location) }
+
+    subject { availability }
+
+    describe "#on_hand_by_stock_location_id" do
+      subject { availability.on_hand_by_stock_location_id }
+
+      context 'with a single variant' do
+        let!(:variant) { create(:master_variant) }
+        let(:stock_item) { variant.stock_items[0] }
+
+        context 'with count_on_hand positive' do
+          before { stock_item.set_count_on_hand(2) }
+
+          it "returns the correct value" do
+            expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => 2))
+          end
+
+          context 'and backorderable false' do
+            before { stock_item.update!(backorderable: false) }
+
+            it "returns the correct value" do
+              expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => 2))
+            end
+          end
+        end
+
+        context 'with count_on_hand 0' do
+          before { stock_item.set_count_on_hand(0) }
+
+          it "returns zero on_hand" do
+            expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => 0))
+          end
+        end
+
+        context 'with count_on_hand negative' do
+          before { stock_item.set_count_on_hand(-1) }
+
+          it "returns zero on_hand" do
+            expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => 0))
+          end
+        end
+
+        context 'with no stock_item' do
+          before { stock_item.destroy! }
+
+          it "returns empty hash" do
+            expect(subject).to eq({})
+          end
+        end
+
+        context 'with track_inventory=false' do
+          before { variant.update!(track_inventory: false) }
+
+          it "has infinite inventory " do
+            expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity))
+          end
+        end
+
+        context 'with config.track_inventory_levels=false' do
+          before { Spree::Config.track_inventory_levels = false }
+
+          it "has infinite inventory " do
+            expect(subject).to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity))
+          end
+        end
+      end
+    end
+
+    describe "#backorderable_by_stock_location_id" do
+      subject { availability.backorderable_by_stock_location_id }
+
+      context 'with a single variant' do
+        let!(:variant) { create(:master_variant) }
+        let(:stock_item) { variant.stock_items[0] }
+
+        context 'with backorderable false' do
+          before { stock_item.update!(backorderable: false) }
+
+          context 'and positive count_on_hand' do
+            before { stock_item.set_count_on_hand(2) }
+            it { is_expected.to eq({}) }
+          end
+
+          context 'and 0 count_on_hand' do
+            before { stock_item.set_count_on_hand(0) }
+            it { is_expected.to eq({}) }
+          end
+        end
+
+        context 'with backorderable true' do
+          before { stock_item.update!(backorderable: true) }
+
+          context 'and positive count_on_hand' do
+            before { stock_item.set_count_on_hand(2) }
+            it { is_expected.to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity)) }
+          end
+
+          context 'and 0 count_on_hand' do
+            before { stock_item.set_count_on_hand(0) }
+            it { is_expected.to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity)) }
+          end
+
+          context 'and negative count_on_hand' do
+            before { stock_item.set_count_on_hand(-1) }
+            it { is_expected.to eq(stock_location1.id => Spree::StockQuantities.new(variant => infinity)) }
+          end
+        end
+
+        context 'with no stock_item' do
+          before { stock_item.destroy! }
+
+          it { is_expected.to eq({}) }
+        end
+      end
+    end
+  end
+end