solidus_core 1.3.2 → 1.4.0.beta1

data/spec/models/spree/item_adjustments_spec.rb

@@ -200,6 +200,7 @@ module Spree
             order_promos[promo_sequence[0]].activate order: order
             order_promos[promo_sequence[1]].activate order: order
 
+            order.update!
             order.reload
             expect(order.all_adjustments.count).to eq(2), "Expected two adjustments (using sequence #{promo_sequence})"
             expect(order.all_adjustments.eligible.count).to eq(1), "Expected one elegible adjustment (using sequence #{promo_sequence})"
@@ -267,5 +268,37 @@ module Spree
         expect(line_item.adjustments.promotion.eligible.first.amount.to_i).to eq(-200)
       end
     end
+
+    context "multiple updates" do
+      let(:adjustment) { create(:tax_adjustment, amount: -10) }
+      let(:item) { adjustment.adjustable }
+
+      def update
+        described_class.new(item).update
+      end
+
+      # "fresh" record from the DB
+      def db_record
+        Spree::LineItem.find(item.id)
+      end
+
+      it "persists each change" do
+        adjustment.source.update_attributes!(amount: 0.1)
+        update
+        expect(item).not_to be_changed
+        expect(db_record).to have_attributes(adjustment_total: 1)
+
+        adjustment.source.update_attributes!(amount: 0.20)
+        item.reload
+        update
+        expect(item).not_to be_changed
+        expect(db_record).to have_attributes(adjustment_total: 2)
+
+        adjustment.source.update_attributes!(amount: 0.10)
+        update
+        expect(item).not_to be_changed
+        expect(db_record).to have_attributes(adjustment_total: 1)
+      end
+    end
   end
 end

data/spec/models/spree/line_item_spec.rb

@@ -26,25 +26,6 @@ describe Spree::LineItem, type: :model do
   end
 
   context "#save" do
-    context "line item changes" do
-      before do
-        line_item.quantity = line_item.quantity + 1
-      end
-
-      it "triggers adjustment total recalculation" do
-        expect(line_item).to receive(:update_tax_charge) # Regression test for https://github.com/spree/spree/issues/4671
-        expect(line_item).to receive(:recalculate_adjustments)
-        line_item.save
-      end
-    end
-
-    context "line item does not change" do
-      it "does not trigger adjustment total recalculation" do
-        expect(line_item).not_to receive(:recalculate_adjustments)
-        line_item.save
-      end
-    end
-
     context "target_shipment is provided" do
       it "verifies inventory" do
         line_item.target_shipment = Spree::Shipment.new
@@ -135,13 +116,13 @@ describe Spree::LineItem, type: :model do
       end
 
       it 'should display a deprecation warning' do
-        expect(ActiveSupport::Deprecation).to receive(:warn)
+        expect(Spree::Deprecation).to receive(:warn)
         Spree::LineItem.new(variant: variant, order: order)
       end
 
       it 'should run the user-defined copy_price method' do
         expect_any_instance_of(Spree::LineItem).to receive(:copy_price).and_call_original
-        ActiveSupport::Deprecation.silence do
+        Spree::Deprecation.silence do
           Spree::LineItem.new(variant: variant, order: order)
         end
       end

data/spec/models/spree/order/checkout_spec.rb

@@ -162,12 +162,14 @@ describe Spree::Order, type: :model do
     end
 
     context "from address" do
-      let(:ship_address) { FactoryGirl.create(:ship_address) }
+      let(:ship_address) { create(:ship_address) }
+      let!(:line_item) { create(:line_item, order: order, price: 10) }
+      let!(:shipping_method) { create(:shipping_method) }
 
       before do
+        order.line_items.reload
         order.state = 'address'
         order.ship_address = ship_address
-        FactoryGirl.create(:shipment, order: order, cost: 10)
         order.email = "user@example.com"
         order.save!
       end
@@ -180,31 +182,24 @@ describe Spree::Order, type: :model do
         end
       end
 
-      it "updates totals" do
-        line_item = FactoryGirl.create(:line_item, price: 10, adjustment_total: 10)
-        order.line_items << line_item
-        tax_rate = create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05)
-        allow(Spree::TaxRate).to receive_messages match: [tax_rate]
-        FactoryGirl.create(:tax_adjustment, adjustable: line_item, source: tax_rate, order: order)
-        order.email = "user@example.com"
+      it "recalculates tax and updates totals" do
+        create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05, zone: order.tax_zone)
         order.next!
-        expect(order.adjustment_total).to eq(0.5)
-        expect(order.additional_tax_total).to eq(0.5)
-        expect(order.included_tax_total).to eq(0)
-        expect(order.total).to eq(20.5)
+        expect(order).to have_attributes(
+          adjustment_total: 0.5,
+          additional_tax_total: 0.5,
+          included_tax_total: 0,
+          total: 20.5
+        )
       end
 
       it "transitions to delivery" do
-        allow(order).to receive_messages(ensure_available_shipping_rates: true)
         order.next!
         assert_state_changed(order, 'address', 'delivery')
         expect(order.state).to eq("delivery")
       end
 
       it "does not call persist_order_address if there is no address on the order" do
-        # otherwise, it will crash
-        allow(order).to receive_messages(ensure_available_shipping_rates: true)
-
         order.user = FactoryGirl.create(:user)
         order.save!
 
@@ -213,8 +208,6 @@ describe Spree::Order, type: :model do
       end
 
       it "calls persist_order_address on the order's user" do
-        allow(order).to receive_messages(ensure_available_shipping_rates: true)
-
         order.user = FactoryGirl.create(:user)
         order.ship_address = FactoryGirl.create(:address)
         order.bill_address = FactoryGirl.create(:address)
@@ -225,8 +218,6 @@ describe Spree::Order, type: :model do
       end
 
       it "does not call persist_order_address on the order's user for a temporary address" do
-        allow(order).to receive_messages(ensure_available_shipping_rates: true)
-
         order.user = FactoryGirl.create(:user)
         order.temporary_address = true
         order.save!
@@ -506,6 +497,23 @@ describe Spree::Order, type: :model do
       end
     end
 
+    context "with a payment in the pending state" do
+      let(:order) { create :order_ready_to_complete }
+      let(:payment) { create :payment, state: "pending", amount: order.total }
+
+      before do
+        order.payments = [payment]
+        order.save!
+      end
+
+      it "allows the order to complete" do
+        expect { order.complete! }.
+          to change { order.state }.
+          from("confirm").
+          to("complete")
+      end
+    end
+
     context "exchange order completion" do
       before do
         order.email = 'spree@example.org'
@@ -628,27 +636,6 @@ describe Spree::Order, type: :model do
     end
   end
 
-  context "subclassed order" do
-    # This causes another test above to fail, but fixing this test should make
-    #   the other test pass
-    class SubclassedOrder < Spree::Order
-      checkout_flow do
-        go_to_state :payment
-        go_to_state :complete
-      end
-    end
-
-    skip "should only call default transitions once when checkout_flow is redefined" do
-      order = SubclassedOrder.new
-      allow(order).to receive_messages payment_required?: true
-      expect(order).to receive(:process_payments!).once
-      order.state = "payment"
-      order.next!
-      assert_state_changed(order, 'payment', 'complete')
-      expect(order.state).to eq("complete")
-    end
-  end
-
   context "re-define checkout flow" do
     before do
       @old_checkout_flow = Spree::Order.checkout_flow
@@ -794,7 +781,7 @@ describe Spree::Order, type: :model do
     let(:params) { {} }
 
     around do |example|
-      ActiveSupport::Deprecation.silence { example.run }
+      Spree::Deprecation.silence { example.run }
     end
 
     it 'calls update_atributes without order params' do
@@ -868,7 +855,7 @@ describe Spree::Order, type: :model do
       let(:params) { ActionController::Parameters.new(order: { bad_param: 'okay' } ) }
 
       it 'does not let through unpermitted attributes' do
-        expect(order).to receive(:assign_attributes).with({})
+        expect(order).to receive(:assign_attributes).with(ActionController::Parameters.new.permit!)
         order.update_from_params(params, permitted_params)
       end
 
@@ -876,7 +863,7 @@ describe Spree::Order, type: :model do
         let(:params) { ActionController::Parameters.new(order: { good_param: 'okay' } ) }
 
         it 'accepts permitted attributes' do
-          expect(order).to receive(:assign_attributes).with({ "good_param" => 'okay' })
+          expect(order).to receive(:assign_attributes).with(ActionController::Parameters.new("good_param" => 'okay').permit!)
           order.update_from_params(params, permitted_params)
         end
       end

data/spec/models/spree/order/payment_spec.rb

@@ -45,7 +45,6 @@ module Spree
       it "does not use failed payments" do
         payment_1 = create(:payment, amount: 50)
         payment_2 = create(:payment, amount: 50, state: 'failed')
-        allow(order).to receive(:pending_payments).and_return([payment_1])
 
         expect(payment_2).not_to receive(:process!)
 
@@ -53,13 +52,6 @@ module Spree
       end
     end
 
-    context "with no payments" do
-      it "should return falsy" do
-        expect(order).to receive_messages total: 100
-        expect(order.process_payments!).to be_falsy
-      end
-    end
-
     context "with payments completed" do
       it "should not fail transitioning to complete when paid" do
         expect(order).to receive_messages total: 100, payment_total: 100
@@ -84,7 +76,7 @@ module Spree
 
       # For the reason of this test, please see spree/spree_gateway#132
       it "keeps source attributes on assignment" do
-        ActiveSupport::Deprecation.silence do
+        Spree::Deprecation.silence do
           order.update_attributes(payments_attributes: [payment_attributes])
         end
         expect(order.unprocessed_payments.last.source.number).to be_present
@@ -118,13 +110,6 @@ module Spree
         expect(order.process_payments!).to be_truthy
       end
 
-      # Regression spec for https://github.com/spree/spree/issues/5436
-      it 'should raise an error if there are no payments to process' do
-        allow(order).to receive_messages unprocessed_payments: []
-        expect(payment).to_not receive(:process!)
-        expect(order.process_payments!).to be_falsey
-      end
-
       context "when a payment raises a GatewayError" do
         before { expect(payment).to receive(:process!).and_raise(Spree::Core::GatewayError) }
 

data/spec/models/spree/order_cancellations_spec.rb

@@ -131,13 +131,12 @@ describe Spree::OrderCancellations do
 
     context "when rounding is required" do
       let(:order) { create(:order_ready_to_ship, line_items_count: 1, line_items_price: 0.83) }
-      let(:line_item) { order.line_items.first }
+      let(:line_item) { order.line_items.to_a.first }
       let(:inventory_unit_1) { line_item.inventory_units[0] }
       let(:inventory_unit_2) { line_item.inventory_units[1] }
 
       before do
         order.contents.add(line_item.variant)
-        line_item.reload
 
         # make the total $1.67 so it divides unevenly
         Spree::Adjustment.tax.create!(
@@ -153,7 +152,13 @@ describe Spree::OrderCancellations do
       it "generates the correct total amount" do
         order.cancellations.short_ship([inventory_unit_1])
         order.cancellations.short_ship([inventory_unit_2])
-        expect(line_item.adjustments.non_tax.sum(:amount)).to eq(-1.67)
+        expect(line_item.adjustments.map(&:amount)).to match_array(
+          [
+            0.01, # tax adjustment
+            -0.84, # short ship 1
+            -0.83, # short ship 2
+          ]
+        )
         expect(line_item.total).to eq 0
       end
     end

data/spec/models/spree/order_contents_spec.rb

@@ -224,6 +224,54 @@ describe Spree::OrderContents, type: :model do
       }.to change { subject.order.total }
     end
 
+    context "given an order with existing addresses" do
+      let(:default_address) { create :address, state_code: "NY", zipcode: "17402" }
+      let(:order_with_address ) { create :order, ship_address: default_address, bill_address: default_address }
+
+      subject { described_class.new(order_with_address) }
+
+      context "when an address in a potentially different tax zone is supplied " do
+        let(:updated_address) { build :address, state_code: "AL",  zipcode: "64092" }
+
+        let(:params) do
+          { ship_address_attributes: updated_address.value_attributes, bill_address_attributes: updated_address.value_attributes }
+        end
+
+        it "updates tax adjustments" do
+          expect(subject.order).to receive(:create_tax_charge!)
+          subject.update_cart params
+        end
+      end
+
+      context "when an address in potentially the same tax zone is supplied" do
+        let(:updated_address) { build :address, state_code: "NY", zipcode: "17402", firstname: 'Robert' }
+
+        let(:params) do
+          { ship_address_attributes: updated_address.value_attributes, bill_address_attributes: updated_address.value_attributes }
+        end
+
+        it "does not updates tax adjustments" do
+          expect(subject.order).not_to receive(:create_tax_charge!)
+          subject.update_cart params
+        end
+      end
+    end
+
+    context "given an order with no existing addresses" do
+      context "when an address is supplied" do
+        let(:updated_address) { build :address, state_code: "CA", zipcode: "14902" }
+
+        let(:params) do
+          { ship_address_attributes: updated_address.attributes, bill_address_attributes: updated_address.value_attributes }
+        end
+
+        it "does not updates tax adjustments" do
+          expect(subject.order).not_to receive(:create_tax_charge!)
+          subject.update_cart params
+        end
+      end
+    end
+
     context "submits item quantity 0" do
       let(:params) do
         { line_items_attributes: {

data/spec/models/spree/order_merger_spec.rb

@@ -104,15 +104,17 @@ module Spree
 
       specify do
         subject.merge!(order_2)
-        line_items = order_1.line_items.reload
-        expect(line_items.count).to eq(2)
+
+        # Both in memory and in DB line items
+        expect(order_1.line_items.length).to eq(2)
+        expect(order_1.line_items.count).to eq(2)
 
         expect(order_1.item_count).to eq 2
-        expect(order_1.item_total).to eq line_items.map(&:amount).sum
+        expect(order_1.item_total).to eq order_1.line_items.map(&:amount).sum
 
         # No guarantee on ordering of line items, so we do this:
-        expect(line_items.pluck(:quantity)).to match_array([1, 1])
-        expect(line_items.pluck(:variant_id)).to match_array([variant.id, variant_2.id])
+        expect(order_1.line_items.pluck(:quantity)).to match_array([1, 1])
+        expect(order_1.line_items.pluck(:variant_id)).to match_array([variant.id, variant_2.id])
       end
     end
 
@@ -126,6 +128,7 @@ module Spree
 
       it "should create errors with invalid line items" do
         variant_2.really_destroy!
+        order_2.line_items.to_a.first.reload # so that it registers as invalid
         subject.merge!(order_2)
         expect(order_1.errors.full_messages).not_to be_empty
       end

data/spec/models/spree/order_shipping_spec.rb

@@ -57,7 +57,7 @@ describe Spree::OrderShipping do
     let(:shipment) { order.shipments.to_a.first }
     let(:inventory_units) { shipment.inventory_units }
     let(:stock_location) { shipment.stock_location }
-    let(:address) { shipment.address }
+    let(:address) { order.ship_address }
     let(:shipping_method) { shipment.shipping_method }
 
     it_behaves_like 'shipment shipping'
@@ -190,7 +190,7 @@ describe Spree::OrderShipping do
         order.shipping.ship(
           inventory_units: shipped_inventory,
           stock_location: shipment.stock_location,
-          address: shipment.address,
+          address: order.ship_address,
           shipping_method: shipment.shipping_method
         )
       end
@@ -223,8 +223,7 @@ describe Spree::OrderShipping do
       let(:shipment) do
         FactoryGirl.create(
           :shipment,
-          order: order,
-          address: FactoryGirl.create(:address)
+          order: order
         )
       end
 

data/spec/models/spree/order_spec.rb

@@ -40,6 +40,28 @@ describe Spree::Order, type: :model do
     end
   end
 
+  describe "#cancel!" do
+    context "with captured store credit" do
+      let!(:store_credit_payment_method) { create(:store_credit_payment_method) }
+      let(:order_total) { 500.00 }
+      let(:store_credit) { create(:store_credit, amount: order_total) }
+      let(:order) { create(:order_with_line_items, user: store_credit.user, line_items_price: order_total) }
+
+      before do
+        order.add_store_credit_payments
+        order.finalize!
+        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
+    end
+  end
+
   context "#canceled_by" do
     let(:admin_user) { create :admin_user }
     let(:order) { create :order }
@@ -1021,7 +1043,7 @@ describe Spree::Order, type: :model do
     let(:payment) { Spree::Payment.new(amount: 10) }
 
     around do |example|
-      ActiveSupport::Deprecation.silence do
+      Spree::Deprecation.silence do
         example.run
       end
     end
@@ -1114,12 +1136,6 @@ describe Spree::Order, type: :model do
           end
         end
 
-        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"))
-          end
-        end
       end
 
       context "there is enough store credit to pay for the entire order" do
@@ -1476,56 +1492,4 @@ describe Spree::Order, type: :model do
       end
     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, display_on: "back_end") }
-
-      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_update_attributes_spec.rb

@@ -3,7 +3,6 @@ require 'spec_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

@@ -47,6 +47,7 @@ module Spree
           updater.update
           create(:adjustment, source: promotion_action, adjustable: order, order: order)
           create(:line_item, order: order, price: 10) # in addition to the two already created
+          order.line_items.reload # need to pick up the extra line item
           updater.update
         end
 
@@ -56,17 +57,13 @@ module Spree
       end
 
       it "update order adjustments" do
-        # A line item will not have both additional and included tax,
-        # so please just humour me for now.
-        order.line_items.first.update_columns({
-          adjustment_total: 10.05,
-          additional_tax_total: 0.05,
-          included_tax_total: 0.05
-        })
-        updater.update_adjustment_total
-        expect(order.adjustment_total).to eq(10.05)
-        expect(order.additional_tax_total).to eq(0.05)
-        expect(order.included_tax_total).to eq(0.05)
+        create(:adjustment, adjustable: order, order: order, source: nil, amount: 10)
+
+        expect {
+          updater.update_adjustment_total
+        }.to change {
+          order.adjustment_total
+        }.from(0).to(10)
       end
     end
 
@@ -277,5 +274,36 @@ module Spree
         updater.update
       end
     end
+
+    describe 'updating in-memory items' do
+      let(:order) do
+        create(:order_with_line_items, line_items_count: 1, line_items_price: 10)
+      end
+      let(:line_item) { order.line_items.first }
+      let(:promotion) { create(:promotion, :with_line_item_adjustment, adjustment_rate: 1) }
+
+      it 'updates in-memory items' do
+        promotion.activate(order: order)
+
+        expect(line_item.promo_total).to eq(0)
+        expect(order.promo_total).to eq(0)
+
+        order.update!
+
+        expect(line_item.promo_total).to eq(-1)
+        expect(order.promo_total).to eq(-1)
+      end
+    end
+
+    context "with item with no adjustment and incorrect totals" do
+      let!(:line_item) { create(:line_item, order: order, price: 10) }
+
+      it "updates the totals" do
+        line_item.update!(adjustment_total: 100)
+        expect {
+          order.update!
+        }.to change { line_item.reload.adjustment_total }.from(100).to(0)
+      end
+    end
   end
 end