spree_core 3.0.10 → 3.1.0.rc1

data/spec/models/spree/gateway_spec.rb

@@ -51,4 +51,11 @@ describe Spree::Gateway, :type => :model do
       expect(has_card.reusable_sources(payment.order)).not_to be_empty
     end
   end
+
+  it "returns exchange multiplier for gateway" do
+    gateway = TestGateway.new
+
+    rate = Spree::Gateway::FROM_DOLLAR_TO_CENT_RATE
+    expect(gateway.exchange_multiplier).to eq rate
+  end
 end

data/spec/models/spree/image_spec.rb

@@ -2,4 +2,7 @@ require 'spec_helper'
 
 describe Spree::Image, :type => :model do
 
+  describe 'callbacks' do
+    it { is_expected.to callback(:find_dimensions).before(:save).if(:attachment_updated_at_changed?) }
+  end
 end

data/spec/models/spree/inventory_unit_spec.rb

@@ -7,7 +7,7 @@ describe Spree::InventoryUnit, :type => :model do
   context "#backordered_for_stock_item" do
     let(:order) do
       order = create(:order, state: 'complete', ship_address: create(:ship_address))
-      order.completed_at = Time.now
+      order.completed_at = Time.current
       create(:shipment, order: order, stock_location: stock_location)
       order.shipments.reload
       create(:line_item, order: order, variant: stock_item.variant)
@@ -102,23 +102,6 @@ describe Spree::InventoryUnit, :type => :model do
 
   end
 
-  context "variants deleted" do
-    let!(:unit) do
-      Spree::InventoryUnit.create(variant: stock_item.variant)
-    end
-
-    it "can still fetch variant" do
-      unit.variant.destroy
-      expect(unit.reload.variant).to be_a Spree::Variant
-    end
-
-    it "can still fetch variants by eager loading (remove default_scope)" do
-      skip "find a way to remove default scope when eager loading associations"
-      unit.variant.destroy
-      expect(Spree::InventoryUnit.joins(:variant).includes(:variant).first.variant).to be_a Spree::Variant
-    end
-  end
-
   context "#finalize_units!" do
     let!(:stock_location) { create(:stock_location) }
     let(:variant) { create(:variant) }

data/spec/models/spree/line_item_spec.rb

@@ -1,11 +1,55 @@
 require 'spec_helper'
 
-describe Spree::LineItem, :type => :model do
+describe Spree::LineItem, type: :model do
   let(:order) { create :order_with_line_items, line_items_count: 1 }
   let(:line_item) { order.line_items.first }
 
   before { create(:store) }
 
+  describe 'Validations' do
+    it { expect(line_item).to validate_numericality_of(:quantity).only_integer.with_message(Spree.t('validation.must_be_int')) }
+  end
+
+  describe '#ensure_valid_quantity' do
+    context 'quantity.nil?' do
+      before do
+        line_item.quantity = nil
+        line_item.valid?
+      end
+
+      it { expect(line_item.quantity).to be_zero }
+    end
+
+    context 'quantity < 0' do
+      before do
+        line_item.quantity = -1
+        line_item.valid?
+      end
+
+      it { expect(line_item.quantity).to be_zero }
+    end
+
+    context 'quantity = 0' do
+      before do
+        line_item.quantity = 0
+        line_item.valid?
+      end
+
+      it { expect(line_item.quantity).to be_zero }
+    end
+
+    context 'quantity > 0' do
+      let(:original_quantity) { 1 }
+
+      before do
+        line_item.quantity = original_quantity
+        line_item.valid?
+      end
+
+      it { expect(line_item.quantity).to eq(original_quantity) }
+    end
+  end
+
   context '#save' do
     it 'touches the order' do
       expect(line_item.order).to receive(:touch)
@@ -13,17 +57,19 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  context '#destroy' do
-    it "fetches deleted products" do
-      line_item.product.destroy
+  context "#discontinued" do
+    it "fetches discontinued products" do
+      line_item.product.discontinue!
       expect(line_item.reload.product).to be_a Spree::Product
     end
 
-    it "fetches deleted variants" do
-      line_item.variant.destroy
+    it "fetches discontinued variants" do
+      line_item.variant.discontinue!
       expect(line_item.reload.variant).to be_a Spree::Variant
     end
+  end
 
+  context "#destroy" do
     it "returns inventory when a line item is destroyed" do
       expect_any_instance_of(Spree::OrderInventory).to receive(:verify)
       line_item.destroy
@@ -67,7 +113,7 @@ describe Spree::LineItem, :type => :model do
     let(:variant) { create(:variant) }
 
     before do
-      create(:tax_rate, :zone => order.tax_zone, :tax_category => variant.tax_category)
+      create(:tax_rate, zone: order.tax_zone, tax_category: variant.tax_category)
     end
 
     context "when order has a tax zone" do
@@ -112,6 +158,16 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
+  # test for copying prices when the vat changes
+  context "#update_price" do
+    it "copies over a variants differing price for another vat zone" do
+      expect(line_item.variant).to receive(:price_including_vat_for).and_return(12)
+      line_item.price = 10
+      line_item.update_price
+      expect(line_item.price).to eq(12)
+    end
+  end
+
   # Test for #3481
   context '#copy_tax_category' do
     it "copies over a variant's tax category" do
@@ -121,28 +177,28 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  describe '.discounted_amount' do
+  describe '#discounted_amount' do
     it "returns the amount minus any discounts" do
       line_item.price = 10
       line_item.quantity = 2
-      line_item.promo_total = -5
+      line_item.taxable_adjustment_total = -5
       expect(line_item.discounted_amount).to eq(15)
     end
   end
 
-  describe "#discounted_money" do
-    it "should return a money object with the discounted amount" do
-      expect(line_item.discounted_money.to_s).to eq "$10.00"
-    end
-  end
-
   describe '.currency' do
     it 'returns the globally configured currency' do
       line_item.currency == 'USD'
     end
   end
 
-  describe ".money" do
+  describe "#discounted_money" do
+    it "should return a money object with the discounted amount" do
+      expect(line_item.discounted_money.to_s).to eq "$10.00"
+    end
+  end
+
+  describe "#money" do
     before do
       line_item.price = 3.50
       line_item.quantity = 2
@@ -153,8 +209,12 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  describe '.single_money' do
-    before { line_item.price = 3.50 }
+  describe '#single_money' do
+    before do
+      line_item.price = 3.50
+      line_item.quantity = 2
+    end
+
     it "returns a Spree::Money representing the price for one variant" do
       expect(line_item.single_money.to_s).to eq("$3.50")
     end

data/spec/models/spree/option_type_spec.rb

@@ -8,7 +8,7 @@ describe Spree::OptionType, :type => :model do
       product = product_option_type.product
       product.update_column(:updated_at, 1.day.ago)
       option_type.touch
-      expect(product.reload.updated_at).to be_within(3.seconds).of(Time.now)
+      expect(product.reload.updated_at).to be_within(3.seconds).of(Time.current)
     end
   end
-end
+end

data/spec/models/spree/option_value_spec.rb

@@ -1,13 +1,18 @@
 require 'spec_helper'
 
-describe Spree::OptionValue, :type => :model do
+describe Spree::OptionValue, type: :model do
+  describe 'delegate' do
+    it { is_expected.to delegate_method(:name).to(:option_type).with_prefix }
+    it { is_expected.to delegate_method(:presentation).to(:option_type).with_prefix }
+  end
+
   context "touching" do
     it "should touch a variant" do
       variant = create(:variant)
       option_value = variant.option_values.first
       variant.update_column(:updated_at, 1.day.ago)
       option_value.touch
-      expect(variant.reload.updated_at).to be_within(3.seconds).of(Time.now)
+      expect(variant.reload.updated_at).to be_within(3.seconds).of(Time.current)
     end
   end
-end
+end

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

@@ -179,6 +179,7 @@ describe Spree::Order, :type => :model do
       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)
+        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]
@@ -191,6 +192,28 @@ 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)
         order.next!
@@ -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'
@@ -416,14 +408,32 @@ describe Spree::Order, :type => :model do
         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
 
@@ -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!
@@ -700,7 +710,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
 

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

@@ -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

@@ -69,9 +69,6 @@ describe Spree::Order, :type => :model do
     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)

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

@@ -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/state_machine_spec.rb

@@ -16,7 +16,6 @@ describe Spree::Order, type: :model do
         order.run_callbacks(:create)
         allow(order).to receive_messages payment_required?: true
         allow(order).to receive_messages process_payments!: true
-        allow(order).to receive :has_available_shipment
       end
 
       context "when payment processing succeeds" do
@@ -126,7 +125,6 @@ describe Spree::Order, type: :model do
     it "should send a cancel email" do
       # Stub methods that cause side-effects in this test
       allow(shipment).to receive(:cancel!)
-      allow(order).to receive :has_available_shipment
       allow(order).to receive :restock_items!
       mail_message = double "Mail::Message"
       order_id = nil
@@ -146,7 +144,6 @@ describe Spree::Order, type: :model do
         allow(Spree::OrderMailer).to receive(:cancel_email).and_return(mail_message = double)
         allow(mail_message).to receive :deliver
 
-        allow(order).to receive :has_available_shipment
       end
     end
 
@@ -158,7 +155,6 @@ describe Spree::Order, type: :model do
         # Stubs methods that cause unwanted side effects in this test
         allow(Spree::OrderMailer).to receive(:cancel_email).and_return(mail_message = double)
         allow(mail_message).to receive :deliver_later
-        allow(order).to receive :has_available_shipment
         allow(order).to receive :restock_items!
         allow(shipment).to receive(:cancel!)
         allow(payment).to receive(:cancel!)
@@ -166,6 +162,7 @@ describe Spree::Order, type: :model do
         allow(order).to receive_message_chain(:payments, :completed).and_return([payment])
         allow(order).to receive_message_chain(:payments, :completed, :includes).and_return([payment])
         allow(order).to receive_message_chain(:payments, :last).and_return(payment)
+        allow(order).to receive_message_chain(:payments, :store_credits, :pending).and_return([])
       end
 
       context "without shipped items" do
@@ -209,8 +206,6 @@ describe Spree::Order, type: :model do
       allow(order).to receive_messages state: "canceled"
       allow(order).to receive_messages allow_resume?: true
 
-      # Stubs method that cause unwanted side effects in this test
-      allow(order).to receive :has_available_shipment
     end
   end
 end