solidus_core 2.4.2 → 2.5.0.beta1

data/spec/models/spree/order_inventory_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
       before { Spree::Config.track_inventory_levels = false }
 
       it "creates on hand inventory units" do
-        variant.stock_items.destroy_all
+        variant.stock_items.each(&:really_destroy!)
 
         subject.verify(shipment)
 
@@ -82,7 +82,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
       let(:new_quantity) { 1 }
 
       it "creates on hand inventory units" do
-        variant.stock_items.destroy_all
+        variant.stock_items.each(&:really_destroy!)
 
         subject.verify(shipment)
 

data/spec/models/spree/order_mutex_spec.rb

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::OrderMutex do
+  include ActiveSupport::Testing::TimeHelpers
+
   let(:order) { create(:order) }
 
   context "without an existing lock" do
@@ -42,7 +44,7 @@ RSpec.describe Spree::OrderMutex do
     around do |example|
       Spree::OrderMutex.with_lock!(order) do
         future = Spree::Config[:order_mutex_max_age].seconds.from_now + 1.second
-        Timecop.freeze(future) do
+        travel_to(future) do
           example.run
         end
       end

data/spec/models/spree/order_shipping_spec.rb

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::OrderShipping do
+  include ActiveSupport::Testing::TimeHelpers
+
   let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
 
   def emails
@@ -33,7 +35,8 @@ RSpec.describe Spree::OrderShipping do
     end
 
     it "updates shipment.shipped_at" do
-      Timecop.freeze do |now|
+      now = Time.current
+      travel_to(now) do
         expect { subject }.to change { shipment.shipped_at }.from(nil).to be_within(1.second).of(now)
       end
     end
@@ -41,7 +44,7 @@ RSpec.describe Spree::OrderShipping do
     it "updates order.updated_at" do
       future = 1.minute.from_now
       expect do
-        Timecop.freeze(future) do
+        travel_to(future) do
           subject
         end
       end.to change { order.updated_at }.to be_within(1.second).of(future)
@@ -223,9 +226,9 @@ RSpec.describe Spree::OrderShipping do
     end
 
     context "with stale inventory units (regression test)" do
-      let(:order) { FactoryGirl.create(:order_ready_to_ship, line_items_count: 1) }
+      let(:order) { FactoryBot.create(:order_ready_to_ship, line_items_count: 1) }
       let(:shipment) do
-        FactoryGirl.create(
+        FactoryBot.create(
           :shipment,
           order: order
         )

data/spec/models/spree/order_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Spree::Order, type: :model do
   let(:user) { create(:user, email: "spree@example.com") }
   let(:order) { create(:order, user: user, store: store) }
   let(:promotion) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :promotion,
       :with_order_adjustment,
       code: "discount"
@@ -43,6 +43,8 @@ RSpec.describe Spree::Order, type: :model do
   end
 
   describe "#cancel!" do
+    subject { order.cancel! }
+
     context "with captured store credit" do
       let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
       let(:order_total) { 500.00 }
@@ -55,7 +57,28 @@ RSpec.describe Spree::Order, type: :model do
         order.capture_payments!
       end
 
-      subject { order.cancel! }
+      it "cancels the order" do
+        expect{ subject }.to change{ order.can_cancel? }.from(true).to(false)
+        expect(order).to be_canceled
+      end
+
+      it "places the order into the canceled scope" do
+        expect{ subject }.to change{ Spree::Order.canceled.include?(order) }.from(false).to(true)
+      end
+
+      it "removes the order from the not_canceled scope" do
+        expect{ subject }.to change{ Spree::Order.not_canceled.include?(order) }.from(true).to(false)
+      end
+    end
+
+    context "with fully refunded payment" do
+      let(:order) { create(:completed_order_with_totals) }
+      let(:payment_amount) { 50 }
+      let(:payment) { create(:payment, order: order, amount: payment_amount, state: 'completed') }
+
+      before do
+        create(:refund, payment: payment, amount: payment_amount)
+      end
 
       it "cancels the order" do
         expect{ subject }.to change{ order.can_cancel? }.from(true).to(false)
@@ -142,7 +165,7 @@ RSpec.describe Spree::Order, type: :model do
     context 'when variant is destroyed' do
       before do
         allow(order).to receive(:restart_checkout_flow)
-        order.line_items.first.variant.destroy
+        order.line_items.first.variant.discard
       end
 
       it 'should restart checkout flow' do
@@ -152,7 +175,7 @@ RSpec.describe Spree::Order, type: :model do
 
       it 'should have error message' do
         subject
-        expect(order.errors[:base]).to include(Spree.t(:deleted_variants_present))
+        expect(order.errors[:base]).to include(I18n.t('spree.deleted_variants_present'))
       end
 
       it 'should be false' do
@@ -497,7 +520,7 @@ RSpec.describe Spree::Order, type: :model do
     end
     it "updates the state column to the first checkout_steps value" do
       order = create(:order_with_totals, state: "delivery")
-      expect(order.checkout_steps).to eql ["address", "delivery", "confirm", "complete"]
+      expect(order.checkout_steps).to eql %w(address delivery payment confirm complete)
       expect{ order.restart_checkout_flow }.to change{ order.state }.from("delivery").to("address")
     end
 
@@ -511,7 +534,7 @@ RSpec.describe Spree::Order, type: :model do
 
   # Regression tests for https://github.com/spree/spree/issues/4072
   context "#state_changed" do
-    let(:order) { FactoryGirl.create(:order) }
+    let(:order) { FactoryBot.create(:order) }
 
     it "logs state changes" do
       order.update_column(:payment_state, 'balance_due')
@@ -581,9 +604,9 @@ RSpec.describe Spree::Order, type: :model do
     context "with more than one payment method" do
       subject { order.available_payment_methods }
 
-      let!(:first_method) { FactoryGirl.create(:payment_method, available_to_users: true,
+      let!(:first_method) { FactoryBot.create(:payment_method, available_to_users: true,
                                                available_to_admin: true) }
-      let!(:second_method) { FactoryGirl.create(:payment_method, available_to_users: true,
+      let!(:second_method) { FactoryBot.create(:payment_method, available_to_users: true,
                                                available_to_admin: true) }
 
       before do
@@ -756,10 +779,10 @@ RSpec.describe Spree::Order, type: :model do
   end
 
   context "#associate_user!" do
-    let!(:user) { FactoryGirl.create(:user) }
+    let!(:user) { FactoryBot.create(:user) }
 
     it "should associate a user with a persisted order" do
-      order = FactoryGirl.create(:order_with_line_items, created_by: nil)
+      order = FactoryBot.create(:order_with_line_items, created_by: nil)
       order.user = nil
       order.email = nil
       order.associate_user!(user)
@@ -776,7 +799,7 @@ RSpec.describe Spree::Order, type: :model do
 
     it "should not overwrite the created_by if it already is set" do
       creator = create(:user)
-      order = FactoryGirl.create(:order_with_line_items, created_by: creator)
+      order = FactoryBot.create(:order_with_line_items, created_by: creator)
 
       order.user = nil
       order.email = nil
@@ -1232,7 +1255,7 @@ RSpec.describe Spree::Order, type: :model do
         context "there are no other payments" do
           it "adds an error to the model" do
             expect(subject).to be false
-            expect(order.errors.full_messages).to include(Spree.t("store_credit.errors.unable_to_fund"))
+            expect(order.errors.full_messages).to include(I18n.t('spree.store_credit.errors.unable_to_fund'))
           end
         end
 
@@ -1545,7 +1568,7 @@ RSpec.describe Spree::Order, type: :model do
     it 'is deprecated' do
       subject.instance_variable_set('@updating_params', {})
       expect(Spree::Deprecation).to receive(:warn)
-      subject.update_params_payment_source
+      subject.send(:update_params_payment_source)
     end
   end
 

data/spec/models/spree/order_taxation_spec.rb

@@ -1,15 +1,15 @@
 require 'rails_helper'
 
 RSpec.describe Spree::OrderTaxation 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::OrderTaxation do
   end
 
   let(:book) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :product,
       price: 20,
       name: "Book",

data/spec/models/spree/order_updater_spec.rb

@@ -2,6 +2,8 @@ require 'rails_helper'
 
 module Spree
   RSpec.describe OrderUpdater, type: :model do
+    include ActiveSupport::Testing::TimeHelpers
+
     let!(:store) { create :store }
     let(:order) { Spree::Order.create }
     let(:updater) { Spree::OrderUpdater.new(order) }
@@ -163,8 +165,8 @@ module Spree
           end
 
           it 'should choose the most recent promotion adjustment when amounts are equal' do
-            # Using Timecop is a regression test
-            Timecop.freeze do
+            # Freezing time is a regression test
+            travel_to(Time.current) do
               create_adjustment('Promotion A', -200)
               create_adjustment('Promotion B', -200)
             end
@@ -177,8 +179,8 @@ module Spree
           end
 
           it 'should choose the most recent promotion adjustment when amounts are equal' do
-            # Using Timecop is a regression test
-            Timecop.freeze do
+            # Freezing time is a regression test
+            travel_to(Time.current) do
               create_adjustment('Promotion A', -200)
               create_adjustment('Promotion B', -200)
             end

data/spec/models/spree/payment/cancellation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Spree::Payment::Cancellation do
   describe '#initialize' do

data/spec/models/spree/payment_create_spec.rb

@@ -62,8 +62,8 @@ module Spree
           expect(new_payment).not_to be_persisted
           expect(new_payment.source).not_to be_persisted
           expect(new_payment.source).not_to be_valid
-          expect(new_payment.source.error_on(:number)).to be_present
-          expect(new_payment.source.error_on(:verification_value).size).to be_present
+          expect(new_payment.source.errors[:number]).to be_present
+          expect(new_payment.source.errors[:verification_value].size).to be_present
         end
       end
     end

data/spec/models/spree/payment_method/store_credit_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines an unknown store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.unable_to_find')
+        expect(subject.message).to include I18n.t('spree.store_credit.unable_to_find')
       end
     end
 
@@ -30,7 +30,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines a store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.insufficient_funds')
+        expect(subject.message).to include I18n.t('spree.store_credit.insufficient_funds')
       end
     end
 
@@ -39,7 +39,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines the credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.currency_mismatch')
+        expect(subject.message).to include I18n.t('spree.store_credit.currency_mismatch')
       end
     end
 
@@ -80,7 +80,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines an unknown store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.unable_to_find')
+        expect(subject.message).to include I18n.t('spree.store_credit.unable_to_find')
       end
     end
 
@@ -93,7 +93,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines a store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.insufficient_authorized_amount')
+        expect(subject.message).to include I18n.t('spree.store_credit.insufficient_authorized_amount')
       end
     end
 
@@ -102,13 +102,13 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines the credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.currency_mismatch')
+        expect(subject.message).to include I18n.t('spree.store_credit.currency_mismatch')
       end
     end
 
     context 'with a valid request' do
       it "captures the store credit" do
-        expect(subject.message).to include Spree.t('store_credit.successful_action', action: Spree::StoreCredit::CAPTURE_ACTION)
+        expect(subject.message).to include I18n.t('spree.store_credit.successful_action', action: Spree::StoreCredit::CAPTURE_ACTION)
         expect(subject.success?).to be true
       end
 
@@ -139,7 +139,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines an unknown store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.unable_to_find')
+        expect(subject.message).to include I18n.t('spree.store_credit.unable_to_find')
       end
     end
 
@@ -153,7 +153,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
     it "voids a valid store credit void request" do
       expect(subject.success?).to be true
-      expect(subject.message).to include Spree.t('store_credit.successful_action', action: Spree::StoreCredit::VOID_ACTION)
+      expect(subject.message).to include I18n.t('spree.store_credit.successful_action', action: Spree::StoreCredit::VOID_ACTION)
     end
 
     context 'with an originator' do
@@ -181,7 +181,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       resp = subject.purchase(amount * 100.0, store_credit, gateway_options)
       expect(resp.success?).to be false
-      expect(resp.message).to include Spree.t('store_credit.unable_to_find')
+      expect(resp.message).to include I18n.t('spree.store_credit.unable_to_find')
     end
 
     it "captures a purchase if it can find a pending credit for the correct amount" do
@@ -194,7 +194,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       resp = subject.purchase(amount * 100.0, store_credit, gateway_options)
       expect(resp.success?).to be true
-      expect(resp.message).to include Spree.t('store_credit.successful_action', action: Spree::StoreCredit::CAPTURE_ACTION)
+      expect(resp.message).to include I18n.t('spree.store_credit.successful_action', action: Spree::StoreCredit::CAPTURE_ACTION)
     end
   end
 
@@ -214,7 +214,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "declines an unknown store credit" do
         expect(subject.success?).to be false
-        expect(subject.message).to include Spree.t('store_credit.unable_to_find')
+        expect(subject.message).to include I18n.t('spree.store_credit.unable_to_find')
       end
     end
 
@@ -231,7 +231,7 @@ RSpec.describe Spree::PaymentMethod::StoreCredit do
 
       it "credits a valid store credit credit request" do
         expect(subject.success?).to be true
-        expect(subject.message).to include Spree.t('store_credit.successful_action', action: Spree::StoreCredit::CREDIT_ACTION)
+        expect(subject.message).to include I18n.t('spree.store_credit.successful_action', action: Spree::StoreCredit::CREDIT_ACTION)
       end
     end
 

data/spec/models/spree/payment_spec.rb

@@ -589,7 +589,7 @@ RSpec.describe Spree::Payment, type: :model do
       end
 
       specify do
-        expect { payment.process! }.to raise_error(Spree::Core::GatewayError, Spree.t(:payment_processing_failed))
+        expect { payment.process! }.to raise_error(Spree::Core::GatewayError, I18n.t('spree.payment_processing_failed'))
       end
     end
   end
@@ -630,6 +630,25 @@ RSpec.describe Spree::Payment, type: :model do
     end
   end
 
+  describe "#fully_refunded?" do
+    subject { payment.fully_refunded? }
+
+    before { payment.amount = 100 }
+
+    context 'before refund' do
+      it { is_expected.to be false }
+    end
+
+    context 'when refund total equals payment amount' do
+      before do
+        create(:refund, payment: payment, amount: 50)
+        create(:refund, payment: payment, amount: 50)
+      end
+
+      it { is_expected.to be true }
+    end
+  end
+
   describe "#save" do
     context "captured payments" do
       it "update order payment total" do
@@ -855,8 +874,8 @@ RSpec.describe Spree::Payment, type: :model do
         payment = Spree::PaymentCreate.new(order, params).build
         expect(payment).not_to be_valid
         expect(payment.source).not_to be_nil
-        expect(payment.source.error_on(:number).size).to eq(1)
-        expect(payment.source.error_on(:verification_value).size).to eq(1)
+        expect(payment.source.errors[:number].size).to eq(1)
+        expect(payment.source.errors[:verification_value].size).to eq(1)
       end
     end
 
@@ -1242,7 +1261,7 @@ RSpec.describe Spree::Payment, type: :model do
       before do
         gateway.save!
         payment.save!
-        gateway.destroy
+        gateway.discard
       end
 
       it "works with a soft deleted payment method" do