spree_core 3.0.9 → 3.2.0

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

@@ -1,37 +1,37 @@
 require 'spec_helper'
 require 'spree/testing_support/order_walkthrough'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { Spree::Order.new }
 
   before { create(:store) }
 
   def assert_state_changed(order, from, to)
-    state_change_exists = order.state_changes.where(:previous_state => from, :next_state => to).exists?
+    state_change_exists = order.state_changes.where(previous_state: from, next_state: to).exists?
     assert state_change_exists, "Expected order to transition from #{from} to #{to}, but didn't."
   end
 
   context "with default state machine" do
     let(:transitions) do
       [
-        { :address => :delivery },
-        { :delivery => :payment },
-        { :payment => :confirm },
-        { :confirm => :complete },
-        { :payment => :complete },
-        { :delivery => :complete }
+        { address: :delivery },
+        { delivery: :payment },
+        { payment: :confirm },
+        { confirm: :complete },
+        { payment: :complete },
+        { delivery: :complete }
       ]
     end
 
     it "has the following transitions" do
       transitions.each do |transition|
-        transition = Spree::Order.find_transition(:from => transition.keys.first, :to => transition.values.first)
+        transition = Spree::Order.find_transition(from: transition.keys.first, to: transition.values.first)
         expect(transition).not_to be_nil
       end
     end
 
     it "does not have a transition from delivery to confirm" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       expect(transition).to be_nil
     end
 
@@ -40,7 +40,7 @@ describe Spree::Order, :type => :model do
     end
 
     it '.remove_transition' do
-      options = {:from => transitions.first.keys.first, :to => transitions.first.values.first}
+      options = {from: transitions.first.keys.first, to: transitions.first.values.first}
       expect(Spree::Order).to receive_messages(
         removed_transitions:    [],
         next_event_transitions: transitions.dup
@@ -60,7 +60,7 @@ describe Spree::Order, :type => :model do
     end
 
     it "passes delivery state when transitioning from address over delivery to payment" do
-      allow(order).to receive_messages :payment_required? => true
+      allow(order).to receive_messages payment_required?: true
       order.state = "address"
       expect(order.passed_checkout_step?("delivery")).to be false
       order.state = "delivery"
@@ -72,8 +72,8 @@ describe Spree::Order, :type => :model do
     context "#checkout_steps" do
       context "when confirmation not required" do
         before do
-          allow(order).to receive_messages :confirmation_required? => false
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages confirmation_required?: false
+          allow(order).to receive_messages payment_required?: true
         end
 
         specify do
@@ -83,8 +83,8 @@ describe Spree::Order, :type => :model do
 
       context "when confirmation required" do
         before do
-          allow(order).to receive_messages :confirmation_required? => true
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages confirmation_required?: true
+          allow(order).to receive_messages payment_required?: true
         end
 
         specify do
@@ -93,14 +93,14 @@ describe Spree::Order, :type => :model do
       end
 
       context "when payment not required" do
-        before { allow(order).to receive_messages :payment_required? => false }
+        before { allow(order).to receive_messages payment_required?: false }
         specify do
           expect(order.checkout_steps).to eq(%w(address delivery complete))
         end
       end
 
       context "when payment required" do
-        before { allow(order).to receive_messages :payment_required? => true }
+        before { allow(order).to receive_messages payment_required?: true }
         specify do
           expect(order.checkout_steps).to eq(%w(address delivery payment complete))
         end
@@ -171,18 +171,19 @@ describe Spree::Order, :type => :model do
       before do
         order.state = 'address'
         allow(order).to receive(:has_available_payment)
-        shipment = FactoryGirl.create(:shipment, :order => order)
+        shipment = FactoryGirl.create(:shipment, order: order)
         order.email = "user@example.com"
         order.save!
       end
 
       it "updates totals" do
-        allow(order).to receive_messages(:ensure_available_shipping_rates => true)
-        line_item = FactoryGirl.create(:line_item, :price => 10, :adjustment_total => 10)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
+        line_item = FactoryGirl.create(:line_item, price: 10, adjustment_total: 10)
+        line_item.variant.update_attributes!(price: 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)
+        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"
         order.next!
         expect(order.adjustment_total).to eq(0.5)
@@ -191,8 +192,30 @@ describe Spree::Order, :type => :model do
         expect(order.total).to eq(10.5)
       end
 
+      it 'updates prices' do
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
+        line_item = FactoryGirl.create(:line_item, price: 10, adjustment_total: 10)
+        line_item.variant.update_attributes!(price: 20)
+        order.line_items << line_item
+        tax_rate = create :tax_rate,
+                          included_in_price: true,
+                          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"
+        order.next!
+        expect(order.adjustment_total).to eq(0)
+        expect(order.additional_tax_total).to eq(0)
+        expect(order.included_tax_total).to eq(0.95)
+        expect(order.total).to eq(20)
+      end
+
       it "transitions to delivery" do
-        allow(order).to receive_messages(:ensure_available_shipping_rates => true)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
         order.next!
         assert_state_changed(order, 'address', 'delivery')
         expect(order.state).to eq("delivery")
@@ -200,7 +223,7 @@ describe Spree::Order, :type => :model do
 
       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)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
 
         order.user = FactoryGirl.create(:user)
         order.save!
@@ -210,7 +233,7 @@ 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)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
 
         order.user = FactoryGirl.create(:user)
         order.ship_address = FactoryGirl.create(:address)
@@ -222,7 +245,7 @@ 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)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
 
         order.user = FactoryGirl.create(:user)
         order.temporary_address = true
@@ -235,7 +258,7 @@ describe Spree::Order, :type => :model do
       context "cannot transition to delivery" do
         context "with an existing shipment" do
           before do
-            line_item = FactoryGirl.create(:line_item, :price => 10)
+            line_item = FactoryGirl.create(:line_item, price: 10)
             order.line_items << line_item
           end
 
@@ -297,7 +320,7 @@ describe Spree::Order, :type => :model do
 
       context "with payment required" do
         before do
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages payment_required?: true
         end
 
         it "transitions to payment" do
@@ -310,7 +333,7 @@ describe Spree::Order, :type => :model do
 
       context "without payment required" do
         before do
-          allow(order).to receive_messages :payment_required? => false
+          allow(order).to receive_messages payment_required?: false
         end
 
         it "transitions to complete" do
@@ -357,37 +380,6 @@ describe Spree::Order, :type => :model do
       end
     end
 
-    context "to payment" do
-      before do
-        @default_credit_card = FactoryGirl.create(:credit_card)
-        order.user = mock_model(Spree::LegacyUser, default_credit_card: @default_credit_card, email: 'spree@example.org')
-
-        allow(order).to receive_messages(payment_required?: true)
-        allow(order).to receive_messages(total: 20.00)
-        order.state = 'delivery'
-        order.save!
-      end
-
-      it "assigns the user's default credit card" do
-        order.next!
-        order.reload
-
-        expect(order.state).to eq 'payment'
-        expect(order.payments.count).to eq 1
-        expect(order.payments.first.amount).to eq 20.00
-        expect(order.payments.first.source).to eq @default_credit_card
-      end
-
-      it "only generates payment if payment required" do
-        allow(order).to receive_messages(payment_required?: false)
-        order.next!
-        order.reload
-
-        expect(order.state).to eq 'complete'
-        expect(order.payments.count).to eq 0
-      end
-    end
-
     context "from payment" do
       before do
         order.state = 'payment'
@@ -395,7 +387,7 @@ describe Spree::Order, :type => :model do
 
       context "with confirmation required" do
         before do
-          allow(order).to receive_messages :confirmation_required? => true
+          allow(order).to receive_messages confirmation_required?: true
         end
 
         it "transitions to confirm" do
@@ -408,22 +400,40 @@ describe Spree::Order, :type => :model do
       context "without confirmation required" do
         before do
           order.email = "spree@example.com"
-          allow(order).to receive_messages :confirmation_required? => false
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages confirmation_required?: false
+          allow(order).to receive_messages payment_required?: true
           order.payments << FactoryGirl.create(:payment, state: payment_state, order: order)
         end
 
         context 'when there is at least one valid payment' do
           let(:payment_state) { 'checkout' }
 
-          before do
-            expect(order).to receive(:process_payments!).once { true }
+          context 'line_items are in stock' do
+            before do
+              expect(order).to receive(:process_payments!).once { true }
+            end
+
+            it "transitions to complete" do
+              order.next!
+              assert_state_changed(order, 'payment', 'complete')
+              expect(order.state).to eq('complete')
+            end
           end
 
-          it "transitions to complete" do
-            order.next!
-            assert_state_changed(order, 'payment', 'complete')
-            expect(order.state).to eq('complete')
+          context 'line_items are not in stock' do
+            before do
+              expect(order).to receive(:ensure_line_items_are_in_stock).once { false }
+            end
+
+            it 'should not receive process_payments!' do
+              expect(order).not_to receive(:process_payments!)
+              order.next
+            end
+
+            it 'does not transition to complete' do
+              order.next
+              expect(order.state).to eq('payment')
+            end
           end
         end
 
@@ -443,7 +453,7 @@ describe Spree::Order, :type => :model do
       # Regression test for #2028
       context "when payment is not required" do
         before do
-          allow(order).to receive_messages :payment_required? => false
+          allow(order).to receive_messages payment_required?: false
         end
 
         it "does not call process payments" do
@@ -502,7 +512,7 @@ describe Spree::Order, :type => :model do
 
     skip "should only call default transitions once when checkout_flow is redefined" do
       order = SubclassedOrder.new
-      allow(order).to receive_messages :payment_required? => true
+      allow(order).to receive_messages payment_required?: true
       expect(order).to receive(:process_payments!).once
       order.state = "payment"
       order.next!
@@ -527,7 +537,7 @@ describe Spree::Order, :type => :model do
     end
 
     it "should not keep old event transitions when checkout_flow is redefined" do
-      expect(Spree::Order.next_event_transitions).to eq([{:cart=>:payment}, {:payment=>:complete}])
+      expect(Spree::Order.next_event_transitions).to eq([{cart: :payment}, {payment: :complete}])
     end
 
     it "should not keep old events when checkout_flow is redefined" do
@@ -558,7 +568,7 @@ describe Spree::Order, :type => :model do
     it "does not attempt to process payments" do
       allow(order).to receive_message_chain(:line_items, :present?) { true }
       allow(order).to receive(:ensure_line_items_are_in_stock) { true }
-      allow(order).to receive(:ensure_line_item_variants_are_not_deleted) { true }
+      allow(order).to receive(:ensure_line_item_variants_are_not_discontinued) { true }
       expect(order).not_to receive(:payment_required?)
       expect(order).not_to receive(:process_payments!)
       order.next!
@@ -580,7 +590,7 @@ describe Spree::Order, :type => :model do
     end
 
     it "should maintain removed transitions" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       expect(transition).to be_nil
     end
 
@@ -595,6 +605,10 @@ describe Spree::Order, :type => :model do
         order = Spree::Order.new
         expect(order.checkout_steps).to eq(%w(new_step before_address address delivery complete))
       end
+
+      it 'goes through checkout without raising error' do
+        expect{ OrderWalkthrough.up_to(:complete) }.to_not raise_error
+      end
     end
 
     context "after" do
@@ -608,6 +622,10 @@ describe Spree::Order, :type => :model do
         order = Spree::Order.new
         expect(order.checkout_steps).to eq(%w(new_step address after_address delivery complete))
       end
+
+      it 'goes through checkout without raising error' do
+        expect{ OrderWalkthrough.up_to(:complete) }.to_not raise_error
+      end
     end
   end
 
@@ -624,7 +642,7 @@ describe Spree::Order, :type => :model do
     end
 
     it "should maintain removed transitions" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       expect(transition).to be_nil
     end
 
@@ -689,10 +707,8 @@ describe Spree::Order, :type => :model do
       it "sets request_env on payment" do
         request_env = { "USER_AGENT" => "Firefox" }
 
-        expected_hash = { "payments_attributes" => [hash_including("request_env" => request_env)] }
-        expect(order).to receive(:update_attributes).with expected_hash
-
         order.update_from_params(params, permitted_params, request_env)
+        expect(order.payments[0].request_env).to eq request_env
       end
 
       it "dont let users mess with others users cards" do
@@ -700,7 +716,7 @@ describe Spree::Order, :type => :model do
 
         expect {
           order.update_from_params(params, permitted_params)
-        }.to raise_error
+        }.to raise_error(Spree.t(:invalid_credit_card))
       end
     end
 
@@ -709,7 +725,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(:update_attributes).with({})
+        expect(order).to receive(:update_attributes).with(ActionController::Parameters.new.permit!)
         order.update_from_params(params, permitted_params)
       end
 
@@ -745,17 +761,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(:update_attributes).with({"good_param" => 'okay'})
-          order.update_from_params(params, permitted_params)
-        end
-      end
-
-      context 'callbacks halt' do
-        before do
-          expect(order).to receive(:update_params_payment_source).and_return false
-        end
-        it 'does not let through unpermitted attributes' do
-          expect(order).not_to receive(:update_attributes).with({})
+          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/currency_updater_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   context 'CurrencyUpdater' do
     context "when changing order currency" do
       let!(:line_item) { create(:line_item) }
@@ -8,8 +8,8 @@ describe Spree::Order, :type => :model do
 
       context "#homogenize_line_item_currencies" do
         it "succeeds without error" do
-          expect { line_item.order.update_attributes!(currency: 'EUR') }.to_not raise_error
-        end      
+          expect { line_item.order.update_attributes!(currency: 'EUR') }.not_to raise_error
+        end
 
         it "changes the line_item currencies" do
           expect { line_item.order.update_attributes!(currency: 'EUR') }.to change{ line_item.reload.currency }.from('USD').to('EUR')
@@ -20,7 +20,7 @@ describe Spree::Order, :type => :model do
         end
 
         it "fails to change the order currency when no prices are available in that currency" do
-          expect { line_item.order.update_attributes!(currency: 'GBP') }.to raise_error
+          expect { line_item.order.update_attributes!(currency: 'GBP') }.to raise_error("no GBP price found for #{line_item.product.name} (#{line_item.variant.sku})")
         end
 
         it "calculates the item total in the order.currency" do

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { stub_model("Spree::Order") }
 
   before { create(:store) }
@@ -63,15 +63,12 @@ describe Spree::Order, :type => :model do
     end
 
     it "should not send duplicate confirmation emails" do
-      allow(order).to receive_messages(:confirmation_delivered? => true)
+      allow(order).to receive_messages(confirmation_delivered?: true)
       expect(Spree::OrderMailer).not_to receive(:confirm_email)
       order.finalize!
     end
 
     it "should freeze all adjustments" do
-      # Stub this method as it's called due to a callback
-      # and it's irrelevant to this test
-      allow(order).to receive :has_available_shipment
       allow(Spree::OrderMailer).to receive_message_chain :confirm_email, :deliver_later
       adjustments = [double]
       expect(order).to receive(:all_adjustments).and_return(adjustments)
@@ -83,7 +80,7 @@ describe Spree::Order, :type => :model do
 
     context "order is considered risky" do
       before do
-        allow(order).to receive_messages :is_risky? => true
+        allow(order).to receive_messages is_risky?: true
       end
 
       it "should change state to risky" do
@@ -93,7 +90,7 @@ describe Spree::Order, :type => :model do
 
       context "and order is approved" do
         before do
-          allow(order).to receive_messages :approved? => true
+          allow(order).to receive_messages approved?: true
         end
 
         it "should leave order in complete state" do
@@ -105,7 +102,7 @@ describe Spree::Order, :type => :model do
 
     context "order is not considered risky" do
       before do
-        allow(order).to receive_messages :is_risky? => false
+        allow(order).to receive_messages is_risky?: false
       end
 
       it "should set completed_at" do

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

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { stub_model(Spree::Order) }
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::Order, :type => :model do
+  describe Spree::Order, type: :model do
     let(:order) { stub_model(Spree::Order) }
     let(:updater) { Spree::OrderUpdater.new(order) }
 
@@ -11,12 +11,12 @@ module Spree
         Spree::Config[:auto_capture] = true
 
         allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
-        allow(order).to receive_messages :total => 100
+        allow(order).to receive_messages total: 100
       end
 
       it 'processes all checkout payments' do
-        payment_1 = create(:payment, :amount => 50)
-        payment_2 = create(:payment, :amount => 50)
+        payment_1 = create(:payment, amount: 50)
+        payment_2 = create(:payment, amount: 50)
         allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2])
 
         order.process_payments!
@@ -28,9 +28,9 @@ module Spree
       end
 
       it 'does not go over total for order' do
-        payment_1 = create(:payment, :amount => 50)
-        payment_2 = create(:payment, :amount => 50)
-        payment_3 = create(:payment, :amount => 50)
+        payment_1 = create(:payment, amount: 50)
+        payment_2 = create(:payment, amount: 50)
+        payment_3 = create(:payment, amount: 50)
         allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2, payment_3])
 
         order.process_payments!
@@ -43,8 +43,8 @@ module Spree
       end
 
       it "does not use failed payments" do
-        payment_1 = create(:payment, :amount => 50)
-        payment_2 = create(:payment, :amount => 50, :state => 'failed')
+        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!)
@@ -63,14 +63,14 @@ module Spree
         persisted_order = Spree::Order.create
         credit_card_payment_method = create(:credit_card_payment_method)
         attributes = {
-          :payments_attributes => [
+          payments_attributes: [
             {
-              :payment_method_id => credit_card_payment_method.id,
-              :source_attributes => {
-                :name => "Ryan Bigg",
-                :number => "41111111111111111111",
-                :expiry => "01 / 15",
-                :verification_value => "123"
+              payment_method_id: credit_card_payment_method.id,
+              source_attributes: {
+                name: "Ryan Bigg",
+                number: "41111111111111111111",
+                expiry: "01 / 15",
+                verification_value: "123"
               }
             }
           ]
@@ -113,12 +113,12 @@ module Spree
         before { expect(payment).to receive(:process!).and_raise(Spree::Core::GatewayError) }
 
         it "should return true when configured to allow checkout on gateway failures" do
-          Spree::Config.set :allow_checkout_on_gateway_error => true
+          Spree::Config.set allow_checkout_on_gateway_error: true
           expect(order.process_payments!).to be true
         end
 
         it "should return false when not configured to allow checkout on gateway failures" do
-          Spree::Config.set :allow_checkout_on_gateway_error => false
+          Spree::Config.set allow_checkout_on_gateway_error: false
           expect(order.process_payments!).to be false
         end
       end
@@ -126,7 +126,7 @@ module Spree
 
     context "#authorize_payments!" do
       let(:payment) { stub_model(Spree::Payment) }
-      before { allow(order).to receive_messages :unprocessed_payments => [payment], :total => 10 }
+      before { allow(order).to receive_messages unprocessed_payments: [payment], total: 10 }
       subject { order.authorize_payments! }
 
       it "processes payments with attempt_authorization!" do
@@ -139,7 +139,7 @@ module Spree
 
     context "#capture_payments!" do
       let(:payment) { stub_model(Spree::Payment) }
-      before { allow(order).to receive_messages :unprocessed_payments => [payment], :total => 10 }
+      before { allow(order).to receive_messages unprocessed_payments: [payment], total: 10 }
       subject { order.capture_payments! }
 
       it "processes payments with attempt_authorization!" do
@@ -172,7 +172,7 @@ module Spree
                         reimbursement: reimbursement
         order = reimbursement.order.reload
         # Update the order totals so payment_total goes to 0 reflecting the refund..
-        order.update!
+        order.update_with_updater!
         # Order Total - (Payment Total + Reimbursed)
         # 10 - (0 + 10) = 0
         expect(order.outstanding_balance).to eq 0

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { stub_model('Spree::Order') }
 
   describe ".is_risky?" do