solidus_core 2.4.2 → 2.5.0.beta1

data/spec/models/spree/promotion_spec.rb

@@ -232,7 +232,7 @@ RSpec.describe Spree::Promotion, type: :model do
           let(:usage_limit) { 1 }
           context "on a different order" do
             before do
-              FactoryGirl.create(
+              FactoryBot.create(
                 :completed_order_with_promotion,
                 promotion: promotion
               )
@@ -253,7 +253,7 @@ RSpec.describe Spree::Promotion, type: :model do
 
     context "with an order-level adjustment" do
       let(:promotion) do
-        FactoryGirl.create(
+        FactoryBot.create(
           :promotion,
           :with_order_adjustment,
           code: "discount",
@@ -261,7 +261,7 @@ RSpec.describe Spree::Promotion, type: :model do
         )
       end
       let(:promotable) do
-        FactoryGirl.create(
+        FactoryBot.create(
           :completed_order_with_promotion,
           promotion: promotion
         )
@@ -271,7 +271,7 @@ RSpec.describe Spree::Promotion, type: :model do
 
     context "with an item-level adjustment" do
       let(:promotion) do
-        FactoryGirl.create(
+        FactoryBot.create(
           :promotion,
           :with_line_item_adjustment,
           code: "discount",
@@ -286,7 +286,7 @@ RSpec.describe Spree::Promotion, type: :model do
         })
       end
       context "when there are multiple line items" do
-        let(:order) { FactoryGirl.create(:order_with_line_items, line_items_count: 2) }
+        let(:order) { FactoryBot.create(:order_with_line_items, line_items_count: 2) }
         describe "the first item" do
           let(:promotable) { order.line_items.first }
           it_behaves_like "it should"
@@ -297,7 +297,7 @@ RSpec.describe Spree::Promotion, type: :model do
         end
       end
       context "when there is a single line item" do
-        let(:order) { FactoryGirl.create(:order_with_line_items) }
+        let(:order) { FactoryBot.create(:order_with_line_items) }
         let(:promotable) { order.line_items.first }
         it_behaves_like "it should"
       end
@@ -306,7 +306,7 @@ RSpec.describe Spree::Promotion, type: :model do
 
   describe "#usage_count" do
     let(:promotion) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :promotion,
         :with_order_adjustment,
         code: "discount"
@@ -316,13 +316,13 @@ RSpec.describe Spree::Promotion, type: :model do
     subject { promotion.usage_count }
 
     context "when the code is applied to a non-complete order" do
-      let(:order) { FactoryGirl.create(:order_with_line_items) }
+      let(:order) { FactoryBot.create(:order_with_line_items) }
       before { promotion.activate(order: order, promotion_code: promotion.codes.first) }
       it { is_expected.to eq 0 }
     end
     context "when the code is applied to a complete order" do
       let!(:order) do
-        FactoryGirl.create(
+        FactoryBot.create(
           :completed_order_with_promotion,
           promotion: promotion
         )
@@ -487,11 +487,11 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context "when the promotion's usage limit is exceeded" do
-      let(:order) { FactoryGirl.create(:completed_order_with_promotion, promotion: promotion) }
-      let(:promotion) { FactoryGirl.create(:promotion, :with_order_adjustment) }
+      let(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) }
+      let(:promotion) { FactoryBot.create(:promotion, :with_order_adjustment) }
 
       before do
-        FactoryGirl.create(
+        FactoryBot.create(
           :completed_order_with_promotion,
           promotion: promotion
         )
@@ -504,12 +504,12 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context "when the promotion code's usage limit is exceeded" do
-      let(:order) { FactoryGirl.create(:completed_order_with_promotion, promotion: promotion) }
+      let(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) }
       let(:promotion) { create(:promotion, :with_order_adjustment, code: 'abc123', per_code_usage_limit: 1) }
       let(:promotion_code) { promotion.codes.first }
 
       before do
-        FactoryGirl.create(
+        FactoryBot.create(
           :completed_order_with_promotion,
           promotion: promotion
         )

data/spec/models/spree/refund_spec.rb

@@ -145,7 +145,7 @@ RSpec.describe Spree::Refund, type: :model do
       end
 
       it 'raises Spree::Core::GatewayError' do
-        expect { subject }.to raise_error(Spree::Core::GatewayError, Spree.t(:unable_to_connect_to_gateway))
+        expect { subject }.to raise_error(Spree::Core::GatewayError, I18n.t('spree.unable_to_connect_to_gateway'))
       end
     end
 

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

@@ -24,7 +24,7 @@ RSpec.describe Spree::ReturnItem::EligibilityValidator::InventoryShipped do
 
       it "sets an error" do
         subject
-        expect(validator.errors[:inventory_unit_shipped]).to eq Spree.t('return_item_inventory_unit_ineligible')
+        expect(validator.errors[:inventory_unit_shipped]).to eq I18n.t('spree.return_item_inventory_unit_ineligible')
       end
     end
   end

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

@@ -16,7 +16,7 @@ RSpec.describe Spree::ReturnItem::EligibilityValidator::NoReimbursements do
 
       it "sets an error" do
         subject
-        expect(validator.errors[:inventory_unit_reimbursed]).to eq Spree.t('return_item_inventory_unit_reimbursed')
+        expect(validator.errors[:inventory_unit_reimbursed]).to eq I18n.t('spree.return_item_inventory_unit_reimbursed')
       end
 
       context "but the return item has been expired" do

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

@@ -1,7 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::OrderCompleted do
-  let(:inventory_unit) { create(:inventory_unit, order: order) }
+  let(:shipment)       { create(:shipment, order: order) }
+  let(:inventory_unit) { create(:inventory_unit, shipment: shipment) }
   let(:return_item)    { create(:return_item, inventory_unit: inventory_unit) }
   let(:validator)      { Spree::ReturnItem::EligibilityValidator::OrderCompleted.new(return_item) }
 
@@ -25,7 +26,7 @@ RSpec.describe Spree::ReturnItem::EligibilityValidator::OrderCompleted do
 
       it "sets an error" do
         subject
-        expect(validator.errors[:order_not_completed]).to eq Spree.t('return_item_order_not_completed')
+        expect(validator.errors[:order_not_completed]).to eq I18n.t('spree.return_item_order_not_completed')
       end
     end
   end

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

@@ -22,7 +22,7 @@ RSpec.describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :mode
 
       it "sets an error" do
         subject
-        expect(validator.errors[:rma_required]).to eq Spree.t('return_item_rma_ineligible')
+        expect(validator.errors[:rma_required]).to eq I18n.t('spree.return_item_rma_ineligible')
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type: :model do
-  let(:inventory_unit) { create(:inventory_unit, order: create(:shipped_order)) }
+  let(:inventory_unit) { create(:inventory_unit, shipment: create(:shipped_order).shipments.first) }
   let(:return_item)    { create(:return_item, inventory_unit: inventory_unit) }
   let(:validator)      { Spree::ReturnItem::EligibilityValidator::TimeSincePurchase.new(return_item) }
 
@@ -28,7 +28,7 @@ RSpec.describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type:
 
       it "sets an error" do
         subject
-        expect(validator.errors[:number_of_days]).to eq Spree.t('return_item_time_period_ineligible')
+        expect(validator.errors[:number_of_days]).to eq I18n.t('spree.return_item_time_period_ineligible')
       end
     end
   end

data/spec/models/spree/return_item_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
   describe '#receive!' do
     let(:now)            { Time.current }
     let(:order)          { create(:shipped_order) }
-    let(:inventory_unit) { create(:inventory_unit, order: order, state: 'shipped') }
+    let(:inventory_unit) { create(:inventory_unit, state: 'shipped') }
     let!(:customer_return) { create(:customer_return_without_return_items, return_items: [return_item], stock_location_id: inventory_unit.shipment.stock_location_id) }
     let(:return_item) { create(:return_item, inventory_unit: inventory_unit) }
 
@@ -45,7 +45,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
       let!(:return_item_with_dupe_inventory_unit) { create(:return_item, inventory_unit: inventory_unit, reception_status: 'received') }
 
       before do
-        assert_raises(StateMachines::InvalidTransition) { subject }
+        expect { subject }.to raise_error { StateMachines::InvalidTransition }
       end
 
       it 'does not receive the return item' do
@@ -58,7 +58,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
     end
 
     context 'when the received item is actually the exchange (aka customer changed mind about exchange)' do
-      let(:exchange_inventory_unit) { create(:inventory_unit, order: order, state: 'shipped') }
+      let(:exchange_inventory_unit) { create(:inventory_unit, state: 'shipped') }
       let!(:return_item_with_exchange) { create(:return_item, inventory_unit: inventory_unit, exchange_inventory_unit: exchange_inventory_unit) }
       let!(:return_item_in_lieu) { create(:return_item, inventory_unit: exchange_inventory_unit) }
 
@@ -112,7 +112,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
       end
 
       context "when the inventory unit's variant does not yet have a stock item for the stock location it was returned to" do
-        before { inventory_unit.variant.stock_items.destroy_all }
+        before { inventory_unit.variant.stock_items.each(&:really_destroy!) }
 
         it "creates a new stock item for the inventory unit with a count of 1" do
           expect { subject }.to change(Spree::StockItem, :count).by(1)
@@ -222,7 +222,8 @@ RSpec.describe Spree::ReturnItem, type: :model do
   end
 
   describe "#receive" do
-    let(:inventory_unit) { create(:inventory_unit, order: create(:shipped_order)) }
+    let(:order) { create(:shipped_order) }
+    let(:inventory_unit) { create(:inventory_unit, shipment: order.shipments.first) }
     let(:return_item)    { create(:return_item, reception_status: status, inventory_unit: inventory_unit) }
 
     subject { return_item.receive! }
@@ -602,7 +603,6 @@ RSpec.describe Spree::ReturnItem, type: :model do
           expect(subject).not_to be_persisted
           expect(subject.original_return_item).to eq return_item
           expect(subject.line_item).to eq return_item.inventory_unit.line_item
-          expect(subject.order).to eq return_item.inventory_unit.order
         end
       end
     end

data/spec/models/spree/shipment_spec.rb

@@ -196,7 +196,7 @@ RSpec.describe Spree::Shipment, type: :model do
     end
 
     context "variant was removed" do
-      before { variant.destroy }
+      before { variant.discard }
 
       it "still returns variant expected" do
         expect(shipment.manifest.first.variant).to eq variant
@@ -264,6 +264,7 @@ RSpec.describe Spree::Shipment, type: :model do
         end
 
         before do
+          allow(line_item).to receive(:order) { order }
           allow(shipment).to receive(:inventory_units) { inventory_units }
           allow(inventory_units).to receive_message_chain(:includes, :joins).and_return inventory_units
         end
@@ -525,14 +526,6 @@ RSpec.describe Spree::Shipment, type: :model do
           allow(shipment).to receive_messages(require_inventory: false, update_order: true, state: state)
         end
 
-        it "should call fulfill_order_with_stock_location" do
-          expect(Spree::OrderStockLocation).to(
-            receive(:fulfill_for_order_with_stock_location).
-            with(order, stock_location)
-          )
-          shipment.ship!
-        end
-
         it "finalizes adjustments" do
           shipment.adjustments.each do |adjustment|
             expect(adjustment).to receive(:finalize!)
@@ -658,7 +651,7 @@ RSpec.describe Spree::Shipment, type: :model do
     let(:inventory_units) { double }
 
     let(:params) do
-      { variant_id: variant.id, state: 'on_hand', order_id: order.id, line_item_id: line_item.id }
+      { variant_id: variant.id, state: 'on_hand', line_item_id: line_item.id }
     end
 
     before { allow(shipment).to receive_messages inventory_units: inventory_units }
@@ -816,6 +809,14 @@ RSpec.describe Spree::Shipment, type: :model do
     let!(:air_shipping_method) { create(:shipping_method, name: "Air") }
     let(:new_rate) { shipment.shipping_rates.create!(shipping_method: air_shipping_method) }
 
+    context 'selecting the same id' do
+      it 'keeps the same shipping rate selected' do
+        expect {
+          shipment.selected_shipping_rate_id = shipping_rate.id
+        }.not_to change { shipping_rate.selected }.from(true)
+      end
+    end
+
     context 'when the id exists' do
       it 'sets the new shipping rate as selected' do
         expect {
@@ -835,6 +836,9 @@ RSpec.describe Spree::Shipment, type: :model do
         expect {
           shipment.selected_shipping_rate_id = -1
         }.to raise_error(ArgumentError)
+
+        # Should not change selection
+        expect(shipping_rate.reload).to be_selected
       end
     end
   end

data/spec/models/spree/shipping_manifest_spec.rb

@@ -6,16 +6,14 @@ module Spree
     let(:order) { Order.create! }
     let(:variant) { create :variant }
     let!(:shipment) { create(:shipment, state: 'pending', order: order) }
-    let(:manifest) { described_class.new(inventory_units: inventory_units) }
+    subject(:manifest) { described_class.new(inventory_units: inventory_units) }
 
     def build_unit(variant, attrs = {})
-      attrs = { order: order, variant: variant, shipment: shipment }.merge(attrs)
-      attrs[:line_item] = attrs[:order].contents.add(attrs[:variant])
+      attrs = { variant: variant, shipment: shipment }.merge(attrs)
+      attrs[:line_item] = order.contents.add(variant)
       InventoryUnit.new(attrs)
     end
 
-    subject{ manifest }
-
     describe "#items" do
       context 'empty' do
         let(:inventory_units) { [] }
@@ -68,9 +66,15 @@ module Spree
     end
 
     describe "#for_order" do
-      let!(:order2) { Order.create! }
+      let!(:order2) { create(:order_with_line_items) }
       context 'single unit' do
-        let(:inventory_units) { [build_unit(variant)] }
+        let(:inventory_units) { [inventory_unit] }
+        let(:inventory_unit) { build_unit(variant) }
+
+        before do
+          allow(inventory_unit).to receive(:order_id) { order.id }
+        end
+
         it "has single ManifestItem in correct order" do
           expect(manifest.for_order(order).items.count).to eq 1
         end
@@ -81,13 +85,22 @@ module Spree
       end
 
       context 'one units in each order' do
-        let(:inventory_units) { [build_unit(variant), build_unit(variant, order: order2)] }
+        let(:order_2) { build_stubbed(:order) }
+        let(:inventory_units) { [inventory_unit_one, inventory_unit_two] }
+        let(:inventory_unit_one) { build_unit(variant) }
+        let(:inventory_unit_two) { build_unit(variant) }
+
+        before do
+          allow(inventory_unit_one).to receive(:order_id) { order.id }
+          allow(inventory_unit_two).to receive(:order_id) { order_2.id }
+        end
+
         it "has single ManifestItem in first order" do
           expect(manifest.for_order(order).items.count).to eq 1
         end
 
         it "has single ManifestItem in second order" do
-          expect(manifest.for_order(order2).items.count).to eq 1
+          expect(manifest.for_order(order_2).items.count).to eq 1
         end
       end
     end

data/spec/models/spree/shipping_method_spec.rb

@@ -22,17 +22,21 @@ RSpec.describe Spree::ShippingMethod, type: :model do
     before { subject.valid? }
 
     it "validates presence of name" do
-      expect(subject.error_on(:name).size).to eq(1)
+      expect(subject.errors[:name].size).to eq(1)
     end
 
     context "shipping category" do
       it "validates presence of at least one" do
-        expect(subject.error_on(:base).size).to eq(1)
+        expect(subject.errors[:base].size).to eq(1)
       end
 
       context "one associated" do
-        before { subject.shipping_categories.push create(:shipping_category) }
-        it { expect(subject.error_on(:base).size).to eq(0) }
+        before do
+          subject.shipping_categories.push create(:shipping_category)
+          subject.valid?
+        end
+
+        it { expect(subject.errors[:base].size).to eq(0) }
       end
     end
   end
@@ -59,7 +63,7 @@ RSpec.describe Spree::ShippingMethod, type: :model do
   context "soft deletion" do
     let(:shipping_method) { create(:shipping_method) }
     it "soft-deletes when destroy is called" do
-      shipping_method.destroy
+      shipping_method.discard
       expect(shipping_method.deleted_at).not_to be_blank
     end
   end

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

@@ -51,7 +51,15 @@ module Spree::Stock
         end
 
         context 'with no stock_item' do
-          before { stock_item.destroy! }
+          before { stock_item.really_destroy! }
+
+          it "returns empty hash" do
+            expect(subject).to eq({})
+          end
+        end
+
+        context 'with soft-deleted stock_item' do
+          before { stock_item.discard }
 
           it "returns empty hash" do
             expect(subject).to eq({})
@@ -116,8 +124,14 @@ module Spree::Stock
           end
         end
 
+        context 'with soft-deleted stock_item' do
+          before { stock_item.discard }
+
+          it { is_expected.to eq({}) }
+        end
+
         context 'with no stock_item' do
-          before { stock_item.destroy! }
+          before { stock_item.really_destroy! }
 
           it { is_expected.to eq({}) }
         end

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

@@ -83,7 +83,7 @@ module Spree
         end
 
         it "sorts shipping rates by cost" do
-          ShippingMethod.destroy_all
+          ShippingMethod.all.each(&:really_destroy!)
           create(:shipping_method, cost: 5)
           create(:shipping_method, cost: 3)
           create(:shipping_method, cost: 4)
@@ -92,7 +92,7 @@ module Spree
         end
 
         context "general shipping methods" do
-          before { Spree::ShippingMethod.destroy_all }
+          before { Spree::ShippingMethod.all.each(&:really_destroy!) }
 
           context 'with two shipping methods of different cost' do
             let!(:shipping_methods) do
@@ -125,7 +125,7 @@ module Spree
         end
 
         context "involves backend only shipping methods" do
-          before{ Spree::ShippingMethod.destroy_all }
+          before{ Spree::ShippingMethod.all.each(&:really_destroy!) }
           let!(:backend_method) { create(:shipping_method, available_to_users: false, cost: 0.00) }
           let!(:generic_method) { create(:shipping_method, cost: 5.00) }
 
@@ -189,20 +189,19 @@ module Spree
         end
 
         it 'uses the configured shipping rate taxer' do
-          class Spree::Tax::TestTaxer
-            def initialize
+          class Spree::Tax::TestTaxCalculator
+            def initialize(_order)
             end
 
-            def tax(_)
-              Spree::ShippingRate.new
+            def calculate(_shipping_rate)
+              [
+                Spree::Tax::ItemTax.new(label: "TAX", amount: 5)
+              ]
             end
           end
-          Spree::Config.shipping_rate_taxer_class = Spree::Tax::TestTaxer
-
-          shipping_rate = Spree::ShippingRate.new
-          allow(Spree::ShippingRate).to receive(:new).and_return(shipping_rate)
+          Spree::Config.shipping_rate_tax_calculator_class = Spree::Tax::TestTaxCalculator
 
-          expect(Spree::Tax::TestTaxer).to receive(:new).and_call_original
+          expect(Spree::Tax::TestTaxCalculator).to receive(:new).and_call_original
           subject.shipping_rates(package)
         end
       end