solidus_core 2.9.6 → 2.10.0.beta1

data/spec/models/spree/order_inventory_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     let(:new_quantity) { 3 }
 
     before do
-      line_item.update_attributes!(quantity: old_quantity)
+      line_item.update!(quantity: old_quantity)
 
       line_item.update_column(:quantity, new_quantity)
       subject.line_item.reload
@@ -86,7 +86,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     end
 
     context "variant doesnt track inventory" do
-      before { variant.update_attributes!(track_inventory: false) }
+      before { variant.update!(track_inventory: false) }
       let(:new_quantity) { 1 }
 
       it "creates on hand inventory units" do
@@ -164,7 +164,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     let(:new_quantity) { 2 }
 
     before do
-      line_item.update_attributes!(quantity: old_quantity)
+      line_item.update!(quantity: old_quantity)
 
       line_item.update_column(:quantity, new_quantity)
       subject.line_item.reload

data/spec/models/spree/order_shipping_spec.rb

@@ -181,7 +181,7 @@ RSpec.describe Spree::OrderShipping do
     # OrderShipping#ship rather than vice versa
     context "when the tracking number is already on the shipment" do
       before do
-        shipment.update_attributes!(tracking: 'tracking-number')
+        shipment.update!(tracking: 'tracking-number')
       end
 
       it "sets the tracking-number" do

data/spec/models/spree/order_spec.rb

@@ -678,7 +678,7 @@ RSpec.describe Spree::Order, type: :model do
       let!(:payment_method_without_store) { create(:payment_method) }
 
       context 'when the store has payment methods' do
-        before { order.update_attributes!(store: store_with_payment_methods) }
+        before { order.update!(store: store_with_payment_methods) }
 
         it 'returns only the matching payment methods for that store' do
           expect(order.available_payment_methods).to match_array(
@@ -706,7 +706,7 @@ RSpec.describe Spree::Order, type: :model do
       end
 
       context 'when the store does not have payment methods' do
-        before { order.update_attributes!(store: store_without_payment_methods) }
+        before { order.update!(store: store_without_payment_methods) }
 
         it 'returns all matching payment methods regardless of store' do
           expect(order.available_payment_methods).to match_array(
@@ -1443,12 +1443,12 @@ RSpec.describe Spree::Order, type: :model do
 
     describe "#total_applicable_store_credit" do
       context "order is in the confirm state" do
-        before { order.update_attributes(state: 'confirm') }
+        before { order.update(state: 'confirm') }
         include_examples "check total store credit from payments"
       end
 
       context "order is completed" do
-        before { order.update_attributes(state: 'complete') }
+        before { order.update(state: 'complete') }
         include_examples "check total store credit from payments"
       end
 
@@ -1462,7 +1462,7 @@ RSpec.describe Spree::Order, type: :model do
           context "the store credit is more than the order total" do
             let(:order_total) { store_credit.amount - 1 }
 
-            before { order.update_attributes(total: order_total) }
+            before { order.update(total: order_total) }
 
             it "returns the order total" do
               expect(subject.total_applicable_store_credit).to eq order_total
@@ -1472,7 +1472,7 @@ RSpec.describe Spree::Order, type: :model do
           context "the store credit is less than the order total" do
             let(:order_total) { store_credit.amount * 10 }
 
-            before { order.update_attributes(total: order_total) }
+            before { order.update(total: order_total) }
 
             it "returns the store credit amount" do
               expect(subject.total_applicable_store_credit).to eq store_credit.amount

data/spec/models/spree/payment_create_spec.rb

@@ -122,7 +122,7 @@ module Spree
       end
 
       context 'the order has no user' do
-        before { order.update_attributes!(user_id: nil) }
+        before { order.update!(user_id: nil) }
         it 'errors' do
           expect { new_payment }.to raise_error(ActiveRecord::RecordNotFound)
         end
@@ -130,7 +130,7 @@ module Spree
 
       context 'the order and the credit card have no user' do
         before do
-          order.update_attributes!(user_id: nil)
+          order.update!(user_id: nil)
           credit_card.update!(user_id: nil)
         end
         it 'errors' do

data/spec/models/spree/payment_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Spree::Payment, type: :model do
     describe "#process!" do
       context 'with autocapture' do
         before do
-          payment.payment_method.update_attributes!(auto_capture: true)
+          payment.payment_method.update!(auto_capture: true)
         end
 
         it "should purchase" do
@@ -145,11 +145,11 @@ RSpec.describe Spree::Payment, type: :model do
 
       context 'without autocapture' do
         before do
-          payment.payment_method.update_attributes!(auto_capture: false)
+          payment.payment_method.update!(auto_capture: false)
         end
 
         context 'when in the checkout state' do
-          before { payment.update_attributes!(state: 'checkout') }
+          before { payment.update!(state: 'checkout') }
 
           it "authorizes" do
             payment.process!
@@ -158,7 +158,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the processing state' do
-          before { payment.update_attributes!(state: 'processing') }
+          before { payment.update!(state: 'processing') }
 
           it "does not authorize" do
             payment.process!
@@ -167,7 +167,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the pending state' do
-          before { payment.update_attributes!(state: 'pending') }
+          before { payment.update!(state: 'pending') }
 
           it "does not re-authorize" do
             expect(payment).to_not receive(:authorize!)
@@ -177,7 +177,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in a failed state' do
-          before { payment.update_attributes!(state: 'failed') }
+          before { payment.update!(state: 'failed') }
 
           it "raises an exception" do
             expect {
@@ -187,7 +187,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the completed state' do
-          before { payment.update_attributes!(state: 'completed') }
+          before { payment.update!(state: 'completed') }
 
           it "authorizes" do
             payment.process!
@@ -253,7 +253,7 @@ RSpec.describe Spree::Payment, type: :model do
 
         context 'when the source is a credit card without an address' do
           let(:card) { create(:credit_card, address: nil) }
-          before { order.update_attributes!(bill_address: address) }
+          before { order.update!(bill_address: address) }
           let(:address) { create(:address) }
 
           it 'send the order bill address' do
@@ -278,7 +278,7 @@ RSpec.describe Spree::Payment, type: :model do
 
           let(:store_credit_payment) { create(:store_credit_payment) }
           let(:store_credit_payment_method) { create(:store_credit_payment_method) }
-          before { order.update_attributes!(bill_address: address) }
+          before { order.update!(bill_address: address) }
           let(:address) { create(:address) }
 
           it 'send the order bill address' do
@@ -932,7 +932,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'the order has no user' do
-          before { order.update_attributes!(user_id: nil) }
+          before { order.update!(user_id: nil) }
           it 'errors' do
             expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
           end
@@ -940,7 +940,7 @@ RSpec.describe Spree::Payment, type: :model do
 
         context 'the order and the credit card have no user' do
           before do
-            order.update_attributes!(user_id: nil)
+            order.update!(user_id: nil)
             credit_card.update!(user_id: nil)
           end
           it 'errors' do
@@ -976,7 +976,7 @@ RSpec.describe Spree::Payment, type: :model do
       # Sets the payment's order to a different Ruby object entirely
       payment.order = Spree::Order.find(payment.order_id)
       email = 'foo@example.com'
-      order.update_attributes(email: email)
+      order.update(email: email)
       expect(payment.gateway_options[:email]).to eq(email)
     end
   end

data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb

@@ -42,10 +42,10 @@ RSpec.describe Spree::Promotion::Rules::FirstRepeatPurchaseSince do
         let(:order_completion_date_2) { 1.day.ago }
         before do
           old_order_1 = create :completed_order_with_totals, user: user
-          old_order_1.update_attributes(completed_at: order_completion_date_1)
+          old_order_1.update(completed_at: order_completion_date_1)
 
           old_order_2 = create :completed_order_with_totals, user: user
-          old_order_2.update_attributes(completed_at: order_completion_date_2)
+          old_order_2.update(completed_at: order_completion_date_2)
         end
 
         context "the last completed order was greater than the preferred days ago" do

data/spec/models/spree/promotion/rules/nth_order_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe Spree::Promotion::Rules::NthOrder do
       context "when the user has completed orders" do
         before do
           old_order = create :completed_order_with_totals, user: user
-          old_order.update_attributes(completed_at: 1.day.ago)
+          old_order.update(completed_at: 1.day.ago)
         end
 
         context "when this order will be the 'nth' order" do
@@ -49,7 +49,7 @@ RSpec.describe Spree::Promotion::Rules::NthOrder do
 
         context "when this order is completed and is still the 'nth' order" do
           before do
-            order.update_attributes(completed_at: Time.current)
+            order.update(completed_at: Time.current)
           end
 
           it { is_expected.to be true }

data/spec/models/spree/promotion/rules/taxon_spec.rb

@@ -101,7 +101,6 @@ RSpec.describe Spree::Promotion::Rules::Taxon, type: :model do
         before do
           taxon.children << taxon2
           taxon.save!
-          taxon.reload
           product.taxons = [taxon2, taxon3]
           rule.taxons = [taxon, taxon3]
         end

data/spec/models/spree/promotion_spec.rb

@@ -582,7 +582,6 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context "when the promotion's usage limit is exceeded" do
-      let(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) }
       let(:promotion) { FactoryBot.create(:promotion, :with_order_adjustment) }
 
       before do
@@ -599,7 +598,6 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context "when the promotion code's usage limit is exceeded" do
-      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 }
 
@@ -636,8 +634,6 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context "when promotable is a Spree::Order" do
-      let(:promotable) { create :order }
-
       context "and it is empty" do
         it { is_expected.to be true }
       end

data/spec/models/spree/reimbursement_type/original_payment_spec.rb

@@ -63,8 +63,8 @@ module Spree
         let(:refund_payment_methods) { subject.map { |refund| refund.payment.payment_method } }
 
         before do
-          reimbursement.order.payments.first.update_attributes!(amount: 5.0)
-          return_item.update_attributes!(amount: refund_amount)
+          reimbursement.order.payments.first.update!(amount: 5.0)
+          return_item.update!(amount: refund_amount)
         end
 
         it "includes refunds all payment type" do

data/spec/models/spree/return_item_spec.rb

@@ -26,8 +26,8 @@ RSpec.describe Spree::ReturnItem, type: :model do
     let(:return_item) { create(:return_item, inventory_unit: inventory_unit) }
 
     before do
-      inventory_unit.update_attributes!(state: 'shipped')
-      return_item.update_attributes!(reception_status: 'awaiting')
+      inventory_unit.update!(state: 'shipped')
+      return_item.update!(reception_status: 'awaiting')
       allow(return_item).to receive(:eligible_for_return?).and_return(true)
     end
 
@@ -91,9 +91,9 @@ RSpec.describe Spree::ReturnItem, type: :model do
       let(:stock_item) { stock_location.stock_item(inventory_unit.variant) }
 
       before do
-        inventory_unit.update_attributes!(state: 'shipped')
-        return_item.update_attributes!(reception_status: 'awaiting')
-        stock_location.update_attributes!(restock_inventory: true)
+        inventory_unit.update!(state: 'shipped')
+        return_item.update!(reception_status: 'awaiting')
+        stock_location.update!(restock_inventory: true)
       end
 
       it 'increases the count on hand' do
@@ -102,9 +102,9 @@ RSpec.describe Spree::ReturnItem, type: :model do
 
       context 'when variant does not track inventory' do
         before do
-          inventory_unit.update_attributes!(state: 'shipped')
-          inventory_unit.variant.update_attributes!(track_inventory: false)
-          return_item.update_attributes!(reception_status: 'awaiting')
+          inventory_unit.update!(state: 'shipped')
+          inventory_unit.variant.update!(track_inventory: false)
+          return_item.update!(reception_status: 'awaiting')
         end
 
         it 'does not increase the count on hand' do
@@ -114,7 +114,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
 
       context "when the stock location's restock_inventory is false" do
         before do
-          stock_location.update_attributes!(restock_inventory: false)
+          stock_location.update!(restock_inventory: false)
         end
 
         it 'does not increase the count on hand' do
@@ -135,7 +135,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
 
       Spree::ReturnItem::INTERMEDIATE_RECEPTION_STATUSES.each do |status|
         context "when the item was #{status}" do
-          before { return_item.update_attributes!(reception_status: status) }
+          before { return_item.update!(reception_status: status) }
 
           it 'processes the inventory unit' do
             subject
@@ -293,7 +293,7 @@ RSpec.describe Spree::ReturnItem, type: :model do
       subject { return_item.public_send("#{transition}!") }
       context "awaiting status" do
         before do
-          return_item.update_attributes!(reception_status: 'awaiting')
+          return_item.update!(reception_status: 'awaiting')
           allow(return_item).to receive(:eligible_for_return?).and_return(true)
         end
 

data/spec/models/spree/shipment_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe Spree::Shipment, type: :model do
 
   describe '#total_before_tax' do
     before do
-      shipment.update_attributes!(cost: 10)
+      shipment.update!(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) }
@@ -250,7 +250,7 @@ RSpec.describe Spree::Shipment, type: :model do
       end
 
       it "can't get rates without a shipping address" do
-        shipment.order.update_attributes!(ship_address: nil)
+        shipment.order.update!(ship_address: nil)
         expect(shipment.refresh_rates).to eq([])
       end
 
@@ -298,7 +298,7 @@ RSpec.describe Spree::Shipment, type: :model do
     shared_examples_for "pending if backordered" do
       it "should have a state of pending if backordered" do
         # Set as ready so we can test for change
-        shipment.update_attributes!(state: 'ready')
+        shipment.update!(state: 'ready')
 
         allow(shipment).to receive_messages(inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false, shipped?: false)])
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
@@ -310,7 +310,7 @@ RSpec.describe Spree::Shipment, type: :model do
       before { allow(order).to receive_messages can_ship?: false }
       it "should result in a 'pending' state" do
         # Set as ready so we can test for change
-        shipment.update_attributes!(state: 'ready')
+        shipment.update!(state: 'ready')
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
         shipment.update_state
       end
@@ -768,8 +768,8 @@ RSpec.describe Spree::Shipment, type: :model do
         .to receive(:new).and_return(inventory_unit_finalizer)
 
       stock_item.set_count_on_hand(10)
-      stock_item.update_attributes!(backorderable: false)
-      inventory_unit.update_attributes!(pending: true)
+      stock_item.update!(backorderable: false)
+      inventory_unit.update!(pending: true)
     end
 
     subject { shipment.finalize! }

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

@@ -12,8 +12,8 @@ module Spree
 
         before do
           stock_item.set_count_on_hand(10)
-          stock_item.update_attributes!(backorderable: false)
-          inventory_unit.update_attributes!(pending: true)
+          stock_item.update!(backorderable: false)
+          inventory_unit.update!(pending: true)
         end
 
         subject { described_class.new([inventory_unit]).run! }
@@ -42,8 +42,8 @@ module Spree
         before do
           stock_item.set_count_on_hand(10)
           stock_item_2.set_count_on_hand(10)
-          inventory_unit.update_attributes!(pending: true)
-          inventory_unit_2.update_attributes!(pending: true)
+          inventory_unit.update!(pending: true)
+          inventory_unit_2.update!(pending: true)
         end
 
         subject { described_class.new([inventory_unit, inventory_unit_2]).run! }

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

@@ -49,7 +49,7 @@ module Spree
         end
 
         context 'when stock item prevents backordering' do
-          before { stock_item.update_attributes(backorderable: false) }
+          before { stock_item.update(backorderable: false) }
 
           specify { expect(subject.backorderable?).to be false }
 
@@ -81,7 +81,7 @@ module Spree
         end
 
         context 'when all stock items prevent backordering' do
-          before { stock_item.update_attributes(backorderable: false) }
+          before { stock_item.update(backorderable: false) }
 
           specify { expect(subject.backorderable?).to be false }
 

data/spec/models/spree/store_credit_spec.rb

@@ -120,7 +120,7 @@ RSpec.describe Spree::StoreCredit do
       let!(:store_credit) { create(:store_credit) }
       let!(:test_category) { create(:store_credit_category, name: "Testing") }
 
-      subject { store_credit.update_attributes(category: test_category) }
+      subject { store_credit.update(category: test_category) }
 
       it "returns false" do
         expect(subject).to eq false
@@ -170,7 +170,7 @@ RSpec.describe Spree::StoreCredit do
       context "the authorized amount is defined" do
         let(:authorized_amount) { 15.00 }
 
-        before { store_credit.update_attributes(amount_authorized: authorized_amount) }
+        before { store_credit.update(amount_authorized: authorized_amount) }
 
         it "subtracts the authorized amount from the credited amount" do
           expect(store_credit.amount_remaining).to eq(store_credit.amount - authorized_amount)
@@ -181,7 +181,7 @@ RSpec.describe Spree::StoreCredit do
     context "the amount_used is defined" do
       let(:amount_used) { 10.0 }
 
-      before { store_credit.update_attributes(amount_used: amount_used) }
+      before { store_credit.update(amount_used: amount_used) }
 
       context "the authorized amount is not defined" do
         it "subtracts the amount used from the credited amount" do
@@ -192,7 +192,7 @@ RSpec.describe Spree::StoreCredit do
       context "the authorized amount is defined" do
         let(:authorized_amount) { 15.00 }
 
-        before { store_credit.update_attributes(amount_authorized: authorized_amount) }
+        before { store_credit.update(amount_authorized: authorized_amount) }
 
         it "subtracts the amount used and the authorized amount from the credited amount" do
           expect(store_credit.amount_remaining).to eq(store_credit.amount - amount_used - authorized_amount)
@@ -208,7 +208,7 @@ RSpec.describe Spree::StoreCredit do
       let(:originator) { nil }
 
       context "amount has not been authorized yet" do
-        before { store_credit.update_attributes(amount_authorized: authorization_amount) }
+        before { store_credit.update(amount_authorized: authorization_amount) }
 
         it "returns true" do
           expect(store_credit.authorize(store_credit.amount - authorization_amount, store_credit.currency)).to be_truthy
@@ -234,7 +234,7 @@ RSpec.describe Spree::StoreCredit do
       context "authorization has already happened" do
         let!(:auth_event) { create(:store_credit_auth_event, store_credit: store_credit) }
 
-        before { store_credit.update_attributes(amount_authorized: store_credit.amount) }
+        before { store_credit.update(amount_authorized: store_credit.amount) }
 
         it "returns true" do
           expect(store_credit.authorize(store_credit.amount, store_credit.currency, action_authorization_code: auth_event.authorization_code)).to be true
@@ -816,7 +816,7 @@ RSpec.describe Spree::StoreCredit do
     context "amount is valid" do
       let(:amount) { 10.0 }
 
-      before { store_credit.update_attributes!(amount: 30.0) }
+      before { store_credit.update!(amount: 30.0) }
 
       it "returns true" do
         expect(subject).to eq true

data/spec/models/spree/tax_category_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Spree::TaxCategory, type: :model do
     end
 
     it "should undefault the previous default tax category" do
-      new_tax_category.update_attributes({ is_default: true })
+      new_tax_category.update({ is_default: true })
       expect(new_tax_category.is_default).to be true
 
       tax_category.reload

data/spec/models/spree/taxon_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Spree::Taxon, type: :model do
     context "updating a taxon permalink" do
       it 'parameterizes permalink correctly' do
         taxon.save!
-        taxon.update_attributes(permalink: 'spécial&charactèrs')
+        taxon.update(permalink: 'spécial&charactèrs')
         expect(taxon.permalink).to eql "special-characters"
       end
     end
@@ -51,7 +51,7 @@ RSpec.describe Spree::Taxon, type: :model do
 
       it 'parameterizes permalink correctly' do
         taxon.save!
-        taxon.update_attributes(permalink_part: 'spécial&charactèrs')
+        taxon.update(permalink_part: 'spécial&charactèrs')
         expect(taxon.reload.permalink).to eql "brands/special-characters"
       end
 

data/spec/models/spree/unit_cancel_spec.rb

@@ -48,6 +48,11 @@ RSpec.describe Spree::UnitCancel do
       it "divides the line item total by the uncanceled units size" do
         expect(subject).to eq(-10.0)
       end
+
+      it "raises an error if dividing by 0" do
+        inventory_unit.cancel!
+        expect { subject }.to raise_error ZeroDivisionError, "Line Item does not have any inventory units available to cancel"
+      end
     end
 
     context "it is called with a line item that doesnt belong to the inventory unit" do

data/spec/models/spree/user_spec.rb

@@ -200,12 +200,12 @@ RSpec.describe Spree.user_class, type: :model do
       context "part of the store credit has been used" do
         let(:amount_used) { 35.00 }
 
-        before { store_credit.update_attributes(amount_used: amount_used) }
+        before { store_credit.update(amount_used: amount_used) }
 
         context "part of the store credit has been authorized" do
           let(:authorized_amount) { 10 }
 
-          before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
+          before { additional_store_credit.update(amount_authorized: authorized_amount) }
 
           it "returns sum of amounts minus used amount and authorized amount" do
             expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - amount_used - authorized_amount)
@@ -223,7 +223,7 @@ RSpec.describe Spree.user_class, type: :model do
         context "part of the store credit has been authorized" do
           let(:authorized_amount) { 10 }
 
-          before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
+          before { additional_store_credit.update(amount_authorized: authorized_amount) }
 
           it "returns sum of amounts minus authorized amount" do
             expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - authorized_amount)