solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -1,31 +1,32 @@
 require 'spec_helper'
 require 'spree/testing_support/order_walkthrough'
 
-describe Spree::Order, :type => :model do
-  let(:order) { Spree::Order.new }
+describe Spree::Order, type: :model do
+  let!(:store) { create(:store) }
+  let(:order) { Spree::Order.new(store: 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
     transitions = [
-      { :address => :delivery },
-      { :delivery => :payment },
-      { :payment => :confirm },
-      { :delivery => :confirm },
+      { address: :delivery },
+      { delivery: :payment },
+      { payment: :confirm },
+      { delivery: :confirm }
     ]
 
     transitions.each do |transition|
       it "transitions from #{transition.keys.first} to #{transition.values.first}" do
-        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 '.find_transition when contract was broken' do
-      expect(Spree::Order.find_transition({foo: :bar, baz: :dog})).to be_falsey
+      expect(Spree::Order.find_transition({ foo: :bar, baz: :dog })).to be_falsey
     end
 
     describe "remove_transition" do
@@ -34,7 +35,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 }
         allow(Spree::Order).to receive(:next_event_transition).and_return([options])
         expect(Spree::Order.remove_transition(options)).to be_truthy
       end
@@ -50,7 +51,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"
@@ -62,7 +63,7 @@ describe Spree::Order, :type => :model do
     context "#checkout_steps" do
       context "when confirmation not required" do
         before do
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages payment_required?: true
         end
 
         specify do
@@ -72,7 +73,7 @@ describe Spree::Order, :type => :model do
 
       context "when confirmation required" do
         before do
-          allow(order).to receive_messages :payment_required? => true
+          allow(order).to receive_messages payment_required?: true
         end
 
         specify do
@@ -81,14 +82,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 confirm 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 confirm complete))
         end
@@ -166,7 +167,7 @@ describe Spree::Order, :type => :model do
       before do
         order.state = 'address'
         order.ship_address = ship_address
-        shipment = FactoryGirl.create(:shipment, :order => order, :cost => 10)
+        FactoryGirl.create(:shipment, order: order, cost: 10)
         order.email = "user@example.com"
         order.save!
       end
@@ -180,11 +181,11 @@ describe Spree::Order, :type => :model do
       end
 
       it "updates totals" do
-        line_item = FactoryGirl.create(:line_item, :price => 10, :adjustment_total => 10)
+        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)
+        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)
@@ -194,7 +195,7 @@ describe Spree::Order, :type => :model do
       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")
@@ -202,7 +203,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!
@@ -212,7 +213,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)
@@ -224,7 +225,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
@@ -245,9 +246,11 @@ describe Spree::Order, :type => :model do
       context 'when order has default selected_shipping_rate_id' do
         let(:shipment) { create(:shipment, order: order) }
         let(:shipping_method) { create(:shipping_method) }
-        let(:shipping_rate) { [
+        let(:shipping_rate) {
+          [
           Spree::ShippingRate.create!(shipping_method: shipping_method, cost: 10.00, shipment: shipment)
-        ] }
+        ]
+        }
 
         before do
           order.state = 'address'
@@ -301,7 +304,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
@@ -314,7 +317,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
@@ -420,7 +423,7 @@ describe Spree::Order, :type => :model do
       # Regression test for https://github.com/spree/spree/issues/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
@@ -463,7 +466,7 @@ describe Spree::Order, :type => :model do
         order.line_items << FactoryGirl.create(:line_item)
         order.line_items.first.variant.stock_items.each do |si|
           si.set_count_on_hand(0)
-          si.update_attributes(:backorderable => false)
+          si.update_attributes(backorderable: false)
         end
 
         Spree::OrderUpdater.new(order).update
@@ -536,7 +539,7 @@ describe Spree::Order, :type => :model do
 
         context 'when the exchange is not for an unreturned item' do
           it 'does not allow the order to completed' do
-            expect { order.complete! }.to raise_error  Spree::Order::InsufficientStock
+            expect { order.complete! }.to raise_error Spree::Order::InsufficientStock
             expect(order.payments.first.state).to eq('checkout')
           end
         end
@@ -618,7 +621,7 @@ describe Spree::Order, :type => :model do
       let(:order) { create(:order_with_line_items) }
 
       it 'can complete the order' do
-        payment = create(:payment, state: 'completed', order: order, amount: order.total)
+        create(:payment, state: 'completed', order: order, amount: order.total)
         order.update!
         expect(order.complete).to eq(true)
       end
@@ -637,7 +640,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!
@@ -662,7 +665,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
@@ -692,10 +695,15 @@ describe Spree::Order, :type => :model do
       Spree::Order.checkout_flow(&@old_checkout_flow)
     end
 
+    it "does not attempt to check shipping rates" do
+      order.email = 'user@example.com'
+      expect(order).not_to receive(:ensure_available_shipping_rates)
+      order.next!
+      assert_state_changed(order, 'cart', 'complete')
+    end
+
     it "does not attempt to process payments" do
       order.email = 'user@example.com'
-      order.store = FactoryGirl.build(:store)
-      allow(order).to receive(:ensure_available_shipping_rates).and_return(true)
       allow(order).to receive(:ensure_promotions_eligible).and_return(true)
       allow(order).to receive(:ensure_line_item_variants_are_not_deleted).and_return(true)
       allow(order).to receive_message_chain(:line_items, :present?).and_return(true)
@@ -705,7 +713,6 @@ describe Spree::Order, :type => :model do
       order.next!
       assert_state_changed(order, 'cart', 'complete')
     end
-
   end
 
   context "insert checkout step" do
@@ -724,7 +731,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
 
@@ -771,7 +778,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
 
@@ -793,7 +800,7 @@ describe Spree::Order, :type => :model do
     it 'calls update_atributes without order params' do
       expect {
         order.update_from_params( params, permitted_params)
-      }.not_to change{order.attributes}
+      }.not_to change{ order.attributes }
     end
 
     it 'runs the callbacks' do
@@ -815,12 +822,12 @@ describe Spree::Order, :type => :model do
             payments_attributes: [
               {
                 payment_method_id: 1,
-                source_attributes: attributes_for(:credit_card),
-              },
+                source_attributes: attributes_for(:credit_card)
+              }
             ],
-            existing_card: credit_card.id,
+            existing_card: credit_card.id
           },
-          cvc_confirm: "737",
+          cvc_confirm: "737"
         )
       end
 
@@ -857,8 +864,8 @@ describe Spree::Order, :type => :model do
     end
 
     context 'has params' do
-      let(:permitted_params) { [ :good_param ] }
-      let(:params) { ActionController::Parameters.new(order: {  bad_param: 'okay' } ) }
+      let(:permitted_params) { [:good_param] }
+      let(:params) { ActionController::Parameters.new(order: { bad_param: 'okay' } ) }
 
       it 'does not let through unpermitted attributes' do
         expect(order).to receive(:assign_attributes).with({})
@@ -866,10 +873,10 @@ describe Spree::Order, :type => :model do
       end
 
       context 'has allowed params' do
-        let(:params) { ActionController::Parameters.new(order: {  good_param: 'okay' } ) }
+        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({ "good_param" => 'okay' })
           order.update_from_params(params, permitted_params)
         end
       end

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { stub_model("Spree::Order") }
 
   context "#finalize!" do
+    let!(:store) { create(:store) }
     let(:order) { Spree::Order.create(email: 'test@example.com', store: store) }
-    let(:store) { FactoryGirl.build(:store) }
 
     before do
       order.update_column :state, 'complete'
@@ -35,15 +35,14 @@ describe Spree::Order, :type => :model do
       Spree::Shipment.create(order: order)
       order.shipments.reload
 
-      allow(order).to receive_messages(:paid? => true, :complete? => true)
+      allow(order).to receive_messages(paid?: true, complete?: true)
       order.finalize!
       order.reload # reload so we're sure the changes are persisted
       expect(order.shipment_state).to eq('ready')
     end
 
-    after { Spree::Config.set :track_inventory_levels => true }
     it "should not sell inventory units if track_inventory_levels is false" do
-      Spree::Config.set :track_inventory_levels => false
+      Spree::Config.set track_inventory_levels: false
       expect(Spree::InventoryUnit).not_to receive(:sell_units)
       order.finalize!
     end
@@ -62,7 +61,7 @@ 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
@@ -81,12 +80,12 @@ 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
 
       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
@@ -98,7 +97,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/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!)
@@ -72,12 +72,12 @@ module Spree
       let(:payment_method){ create(:credit_card_payment_method) }
       let(:payment_attributes) do
         {
-          :payment_method_id => payment_method.id,
-          :source_attributes => {
-            :name => "Ryan Bigg",
-            :number => "41111111111111111111",
-            :expiry => "01 / 15",
-            :verification_value => "123"
+          payment_method_id: payment_method.id,
+          source_attributes: {
+            name: "Ryan Bigg",
+            number: "41111111111111111111",
+            expiry: "01 / 15",
+            verification_value: "123"
           }
         }
       end
@@ -129,12 +129,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
@@ -142,7 +142,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
@@ -155,7 +155,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
@@ -198,7 +198,7 @@ module Spree
           before { order.update_attributes(state: 'canceled') }
 
           it "it should be a negative amount incorporating reimbursements" do
-            expect(order.outstanding_balance).to eq -10
+            expect(order.outstanding_balance).to eq(-10)
           end
         end
 

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