spree_core 3.0.9 → 3.2.0

data/spec/models/spree/line_item_spec.rb

@@ -1,11 +1,72 @@
 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')) }
+    it { expect(line_item).to validate_presence_of(:order) }
+
+    describe 'ensure_proper_currency' do
+      context 'order is present' do
+        context "when line_item's currency matches with order's" do
+          it { expect(line_item).to be_valid }
+        end
+
+        context "when line_item's currency does not matches with order's" do
+          before do
+            line_item.currency = "Invalid Currency"
+          end
+
+          it { expect(line_item).not_to be_valid }
+        end
+      end
+    end
+  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,20 +74,22 @@ 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
+    let!(:line_item) { order.line_items.first }
     it "returns inventory when a line item is destroyed" do
-      expect_any_instance_of(Spree::OrderInventory).to receive(:verify)
-      line_item.destroy
+      is_expected.to callback(:verify_order_inventory).before(:destroy)
     end
 
     it "deletes inventory units" do
@@ -67,7 +130,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 +175,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 +194,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 +226,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
@@ -258,9 +335,11 @@ describe Spree::LineItem, :type => :model do
   end
 
   describe "precision of pre_tax_amount" do
-    let!(:line_item) { create :line_item, pre_tax_amount: 4.2051 }
+    let(:line_item) { create :line_item, pre_tax_amount: 4.2051 }
 
     it "keeps four digits of precision even when reloading" do
+      # prevent it from updating pre_tax_amount
+      allow_any_instance_of(Spree::LineItem).to receive(:update_tax_charge)
       expect(line_item.reload.pre_tax_amount).to eq(4.2051)
     end
   end

data/spec/models/spree/option_type_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::OptionType, :type => :model do
+describe Spree::OptionType, type: :model do
   context "touching" do
     it "should touch a product" do
       product_option_type = create(:product_option_type)
@@ -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/address_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { Spree::Order.new }
 
   context 'validation' do

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

@@ -13,7 +13,7 @@ describe Spree::Order do
 
     before do
       # Don't care about available payment methods in this test
-      allow(persisted_order).to receive_messages(:has_available_payment => false)
+      allow(persisted_order).to receive_messages(has_available_payment: false)
       persisted_order.line_items << line_item
       create(:adjustment, amount: -line_item.amount, label: "Promotion", adjustable: line_item, order: persisted_order)
       persisted_order.state = 'delivery'

data/spec/models/spree/order/callbacks_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 do
     Spree::Order.define_state_machine!
@@ -19,10 +19,10 @@ describe Spree::Order, :type => :model do
 
   context "#save" do
     context "when associated with a registered user" do
-      let(:user) { double(:user, :email => "test@example.com") }
+      let(:user) { double(:user, email: "test@example.com") }
 
       before do
-        allow(order).to receive_messages :user => user
+        allow(order).to receive_messages user: user
       end
 
       it "should assign the email address of the user" do