solidus_core 2.3.1 → 2.4.0.beta1

data/spec/models/spree/order_contents_spec.rb

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

data/spec/models/spree/order_inventory_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::OrderInventory, type: :model do
+RSpec.describe Spree::OrderInventory, type: :model do
   let(:order) { create :completed_order_with_totals }
   let(:line_item) { order.line_items.first }
   let(:shipment) { order.shipments.first }

data/spec/models/spree/order_merger_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # Regression tests for https://github.com/spree/spree/issues/2179
 module Spree
-  describe OrderMerger, type: :model do
+  RSpec.describe OrderMerger, type: :model do
     let(:variant) { create(:variant) }
     let!(:store) { create(:store, default: true) }
     let(:order_1) { Spree::Order.create }

data/spec/models/spree/order_mutex_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::OrderMutex do
+RSpec.describe Spree::OrderMutex do
   let(:order) { create(:order) }
 
   context "without an existing lock" do

data/spec/models/spree/order_promotion_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::OrderPromotion do
+RSpec.describe Spree::OrderPromotion do
   subject do
     order_promotion
   end

data/spec/models/spree/order_shipping_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::OrderShipping do
+RSpec.describe Spree::OrderShipping do
   let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
 
   def emails

data/spec/models/spree/order_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Order, type: :model do
+RSpec.describe Spree::Order, type: :model do
   let(:store) { create(:store) }
   let(:user) { create(:user, email: "spree@example.com") }
   let(:order) { create(:order, user: user, store: store) }
@@ -180,7 +180,7 @@ describe Spree::Order, type: :model do
       create(:shipment, order: order)
       create(:adjustment, adjustable: order, order: order)
       promotion.activate(order: order, promotion_code: code)
-      order.update!
+      order.recalculate
 
       # Make sure we are asserting changes
       expect(order.line_items).not_to be_empty
@@ -313,7 +313,7 @@ describe Spree::Order, type: :model do
     it "calls hook during update" do
       order = create(:order)
       expect(order).to receive(:add_awesome_sauce)
-      order.update!
+      order.recalculate
     end
 
     it "calls hook during finalize" do
@@ -646,15 +646,15 @@ describe Spree::Order, type: :model do
     end
   end
 
-  context "#apply_free_shipping_promotions" do
-    it "calls out to the FreeShipping promotion handler" do
-      expect_any_instance_of(Spree::PromotionHandler::FreeShipping).to(
+  context "#apply_shipping_promotions" do
+    it "calls out to the Shipping promotion handler" do
+      expect_any_instance_of(Spree::PromotionHandler::Shipping).to(
         receive(:activate)
       ).and_call_original
 
       expect(order.updater).to receive(:update).and_call_original
 
-      order.apply_free_shipping_promotions
+      order.apply_shipping_promotions
     end
   end
 
@@ -995,14 +995,14 @@ describe Spree::Order, type: :model do
     end
   end
 
-  describe "#pre_tax_item_amount" do
+  describe "#item_total_excluding_vat" do
     it "sums all of the line items' pre tax amounts" do
       subject.line_items = [
         Spree::LineItem.new(price: 10, quantity: 2, included_tax_total: 15.0),
         Spree::LineItem.new(price: 30, quantity: 1, included_tax_total: 16.0)
       ]
       # (2*10)-15 + 30-16 = 5 + 14 = 19
-      expect(subject.pre_tax_item_amount).to eq 19.0
+      expect(subject.item_total_excluding_vat).to eq 19.0
     end
   end
 
@@ -1066,7 +1066,7 @@ describe Spree::Order, type: :model do
     subject(:order) { create(:order) }
     it "assigns the coordinator returned shipments to its shipments" do
       shipment = build(:shipment)
-      allow_any_instance_of(Spree::Stock::Coordinator).to receive(:shipments).and_return([shipment])
+      allow_any_instance_of(Spree::Stock::SimpleCoordinator).to receive(:shipments).and_return([shipment])
       subject.create_proposed_shipments
       expect(subject.shipments).to eq [shipment]
     end
@@ -1177,12 +1177,29 @@ describe Spree::Order, type: :model do
             expect(order.payments.first.amount).to eq order_total
           end
         end
+      end
+
+      context 'there is store credit in another currency' do
+        let(:order) { create(:order_with_totals, user: user, line_items_price: order_total).tap(&:recalculate) }
+        let!(:store_credit_usd) { create(:store_credit, user: user, amount: 1, currency: 'USD') }
+        let!(:store_credit_gbp) { create(:store_credit, user: user, amount: 1, currency: 'GBP') }
+        let(:user) { create(:user) }
 
+        it 'only adds the credit in the matching currency' do
+          expect {
+            order.add_store_credit_payments
+          }.to change {
+            order.payments.count
+          }.by(1)
+
+          applied_store_credits = order.payments.store_credits.map(&:source)
+          expect(applied_store_credits).to match_array([store_credit_usd])
+        end
       end
 
       context "there is enough store credit to pay for the entire order" do
         let(:store_credit) { create(:store_credit, amount: order_total) }
-        let(:order) { create(:order_with_totals, user: store_credit.user, line_items_price: order_total).tap(&:update!) }
+        let(:order) { create(:order_with_totals, user: store_credit.user, line_items_price: order_total).tap(&:recalculate) }
 
         context "there are no other payments" do
           before do
@@ -1210,7 +1227,7 @@ describe Spree::Order, type: :model do
         let(:order_total) { 500 }
         let(:store_credit_total) { order_total - 100 }
         let(:store_credit)       { create(:store_credit, amount: store_credit_total) }
-        let(:order) { create(:order_with_totals, user: store_credit.user, line_items_price: order_total).tap(&:update!) }
+        let(:order) { create(:order_with_totals, user: store_credit.user, line_items_price: order_total).tap(&:recalculate) }
 
         context "there are no other payments" do
           it "adds an error to the model" do
@@ -1219,6 +1236,15 @@ describe Spree::Order, type: :model do
           end
         end
 
+        context "there is a completed credit card payment" do
+          let!(:cc_payment) { create(:payment, order: order, state: "completed", amount: 100) }
+
+          it "successfully creates the store credit payments" do
+            expect { subject }.to change { order.payments.count }.from(1).to(2)
+            expect(order.errors).to be_empty
+          end
+        end
+
         context "there is a credit card payment" do
           let!(:cc_payment) { create(:payment, order: order, state: "checkout") }
 
@@ -1255,7 +1281,7 @@ describe Spree::Order, type: :model do
           let(:amount_difference)       { 100 }
           let!(:primary_store_credit)   { create(:store_credit, amount: (order_total - amount_difference)) }
           let!(:secondary_store_credit) { create(:store_credit, amount: order_total, user: primary_store_credit.user, credit_type: create(:secondary_credit_type)) }
-          let(:order) { create(:order_with_totals, user: primary_store_credit.user, line_items_price: order_total).tap(&:update!) }
+          let(:order) { create(:order_with_totals, user: primary_store_credit.user, line_items_price: order_total).tap(&:recalculate) }
 
           before do
             subject
@@ -1277,65 +1303,43 @@ describe Spree::Order, type: :model do
     end
 
     describe "#covered_by_store_credit" do
-      context "order doesn't have an associated user" do
-        subject { create(:order, user: nil) }
-
-        it "returns false" do
-          expect(subject.covered_by_store_credit).to be false
-        end
+      subject do
+        order.covered_by_store_credit
       end
 
-      context "order has an associated user" do
-        let(:user) { create(:user) }
+      let(:order) { create(:order_with_line_items, user: user, store: store) }
 
-        subject    { create(:order, user: user) }
+      context "order doesn't have an associated user" do
+        let(:user) { nil }
+        it { is_expected.to eq(false) }
+      end
 
+      context "order has an associated user" do
         context "user has enough store credit to pay for the order" do
-          before do
-            allow(user).to receive_messages(total_available_store_credit: 10.0)
-            allow(subject).to receive_messages(total: 5.0)
-          end
-
-          it "returns true" do
-            expect(subject.covered_by_store_credit).to be true
-          end
+          let!(:credit) { create(:store_credit, user: user, amount: 1000) }
+          it { is_expected.to eq(true) }
         end
 
         context "user does not have enough store credit to pay for the order" do
-          before do
-            allow(user).to receive_messages(total_available_store_credit: 0.0)
-            allow(subject).to receive_messages(total: 5.0)
-          end
-
-          it "returns false" do
-            expect(subject.covered_by_store_credit).to be false
-          end
+          let!(:credit) { create(:store_credit, user: user, amount: 1) }
+          it { is_expected.to eq(false) }
         end
       end
     end
 
     describe "#total_available_store_credit" do
-      context "order does not have an associated user" do
-        subject { create(:order, user: nil) }
+      subject do
+        order.total_available_store_credit
+      end
 
-        it "returns 0" do
-          expect(subject.total_available_store_credit).to be_zero
-        end
+      context "order does not have an associated user" do
+        let(:user) { nil }
+        it { is_expected.to eq(0) }
       end
 
       context "order has an associated user" do
-        let(:user)                   { create(:user) }
-        let(:available_store_credit) { 25.0 }
-
-        subject { create(:order, user: user) }
-
-        before do
-          allow(user).to receive_messages(total_available_store_credit: available_store_credit)
-        end
-
-        it "returns the user's available store credit" do
-          expect(subject.total_available_store_credit).to eq available_store_credit
-        end
+        let!(:credit) { create(:store_credit, user: user, amount: 25) }
+        it { is_expected.to eq(25) }
       end
     end
 
@@ -1544,56 +1548,4 @@ describe Spree::Order, type: :model do
       subject.update_params_payment_source
     end
   end
-
-  describe "#validate_payments_attributes" do
-    let(:attributes) { [ActionController::Parameters.new(payment_method_id: payment_method.id)] }
-    subject do
-      order.validate_payments_attributes(attributes)
-    end
-
-    context "with empty array" do
-      let(:attributes) { [] }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with no payment method specified" do
-      let(:attributes) { [ActionController::Parameters.new({})] }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with valid payment method" do
-      let(:payment_method) { create(:check_payment_method) }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with inactive payment method" do
-      let(:payment_method) { create(:check_payment_method, active: false) }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-
-    context "with unavailable payment method" do
-      let(:payment_method) { create(:check_payment_method, available_to_users: false) }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-
-    context "with soft-deleted payment method" do
-      let(:payment_method) { create(:check_payment_method, deleted_at: Time.current) }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-  end
 end

data/spec/models/spree/order_stock_location_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe OrderStockLocation do
+  RSpec.describe OrderStockLocation do
     describe ".fulfill_for_order_with_stock_location" do
       subject { OrderStockLocation.fulfill_for_order_with_stock_location(order, stock_location) }
 

data/spec/models/spree/order_taxation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Spree::OrderTaxation do
   let(:shipping_address) { FactoryGirl.create(:address, state: new_york) }

data/spec/models/spree/order_update_attributes_spec.rb

@@ -1,9 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
   RSpec.describe OrderUpdateAttributes do
     let(:order) { create(:order) }
-    let(:payment_method) { create(:payment_method) }
     let(:request_env) { nil }
     let(:update) { described_class.new(order, attributes, request_env: request_env) }
 
@@ -26,10 +25,7 @@ module Spree
       let(:attributes) do
         {
           payments_attributes: [
-            {
-              payment_method_id: payment_method.id,
-              source_attributes: attributes_for(:credit_card)
-            }
+            { source_attributes: attributes_for(:credit_card) }
           ]
         }
       end

data/spec/models/spree/order_updater_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe OrderUpdater, type: :model do
+  RSpec.describe OrderUpdater, type: :model do
     let!(:store) { create :store }
     let(:order) { Spree::Order.create }
     let(:updater) { Spree::OrderUpdater.new(order) }
@@ -92,13 +92,13 @@ module Spree
 
           before do
             promotion.activate(order: order)
-            order.update!
+            order.recalculate
             line_item.update!(quantity: 2)
           end
 
           it 'updates the promotion amount' do
             expect {
-              order.update!
+              order.recalculate
             }.to change {
               line_item.promo_total
             }.from(-1).to(-2)
@@ -117,7 +117,7 @@ module Spree
           end
 
           it 'uses the defined promotion chooser' do
-            expect { order.update! }.to raise_error('Custom promotion chooser')
+            expect { order.recalculate }.to raise_error('Custom promotion chooser')
           end
         end
 
@@ -156,7 +156,7 @@ module Spree
                                 label: 'Some other credit')
             line_item.adjustments.each { |a| a.update_column(:eligible, true) }
 
-            order.update!
+            order.recalculate
 
             expect(line_item.adjustments.promotion.eligible.count).to eq(1)
             expect(line_item.adjustments.promotion.eligible.first.label).to eq('Promotion C')
@@ -170,7 +170,7 @@ module Spree
             end
             line_item.adjustments.each { |a| a.update_column(:eligible, true) }
 
-            order.update!
+            order.recalculate
 
             expect(line_item.adjustments.promotion.eligible.count).to eq(1)
             expect(line_item.adjustments.promotion.eligible.first.label).to eq('Promotion B')
@@ -184,7 +184,7 @@ module Spree
             end
             line_item.adjustments.each { |a| a.update_column(:eligible, true) }
 
-            order.update!
+            order.recalculate
 
             expect(line_item.adjustments.promotion.eligible.count).to eq(1)
             expect(line_item.adjustments.promotion.eligible.first.label).to eq('Promotion B')
@@ -212,7 +212,7 @@ module Spree
                   order_promos[promo_sequence[0]].activate order: order
                   order_promos[promo_sequence[1]].activate order: order
 
-                  order.update!
+                  order.recalculate
                   order.reload
                   expect(order.all_adjustments.count).to eq(2), 'Expected two adjustments'
                   expect(order.all_adjustments.eligible.count).to eq(1), 'Expected one elegible adjustment'
@@ -263,7 +263,7 @@ module Spree
 
             # regression for https://github.com/spree/spree/issues/3274
             it 'still makes the previous best eligible adjustment valid' do
-              order.update!
+              order.recalculate
               expect(line_item.adjustments.promotion.eligible.first.label).to eq('Promotion A')
             end
           end
@@ -273,7 +273,7 @@ module Spree
             create_adjustment('Promotion B', -200)
             create_adjustment('Promotion C', -200)
 
-            order.update!
+            order.recalculate
 
             expect(line_item.adjustments.promotion.eligible.count).to eq(1)
             expect(line_item.adjustments.promotion.eligible.first.amount.to_i).to eq(-200)
@@ -305,7 +305,7 @@ module Spree
 
           it 'updates the promotion amount' do
             expect {
-              order.update!
+              order.recalculate
             }.to change {
               line_item.additional_tax_total
             }.from(1).to(2)
@@ -327,7 +327,7 @@ module Spree
               Spree::Tax::OrderTax.new(order_id: order.id, line_item_taxes: [], shipment_taxes: [])
             )
 
-            order.update!
+            order.recalculate
           end
         end
       end
@@ -483,7 +483,7 @@ module Spree
         let(:shipment){ order.shipments[0] }
 
         it "updates each shipment" do
-          expect(shipment).to receive(:update!)
+          expect(shipment).to receive(:update_state)
           updater.update
         end
 
@@ -535,7 +535,7 @@ module Spree
         expect(line_item.promo_total).to eq(0)
         expect(order.promo_total).to eq(0)
 
-        order.update!
+        order.recalculate
 
         expect(line_item.promo_total).to eq(-1)
         expect(order.promo_total).to eq(-1)
@@ -548,7 +548,7 @@ module Spree
       it "updates the totals" do
         line_item.update!(adjustment_total: 100)
         expect {
-          order.update!
+          order.recalculate
         }.to change { line_item.reload.adjustment_total }.from(100).to(0)
       end
     end