spree_core 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f35feac4376cd13546d618115a69843e88fc1cd5
-  data.tar.gz: 4c8e8813de79c6000a63d75fba52a2e3c446474b
+  metadata.gz: 92d2afeeba8bb057bcc78631c40187c1a5e77670
+  data.tar.gz: 80cbb5297dc213e88e6e6a77d159a1ef6c5bea9a
 SHA512:
-  metadata.gz: 2681d8f8676b8d42aabdca0ee04058a36375a3407d2321173b5aa72faee19ae644b0e32b2a4df917adb26c40986c1125fa50801222d7ca14a1ff09c0143d1fc5
-  data.tar.gz: 1223897e7344f28e241967b864994bc4958056d0faa40b1ac430cfc8b18a31be28ef3ee1cad0314a4446e5ca0ccdc80b687c05066a92edbfc4922d9ddb36970f
+  metadata.gz: 062f9429e4900f53a5f5925a29188ecdd56a63820f84fdbe43454a83393011c8e144b7e6349732a21cef8cf6fc02de2a94a7dc5b52eef0ddc78fb20aa4653404
+  data.tar.gz: ace59dff074f95170b53c700edf77f15313e9b52eb42666f656fe0acdc99dff915b79f4330df4e6783326de0fce2d71def5e1bd2df26b4923cbf7c841b5930ec

data/app/models/spree/order.rb

@@ -417,8 +417,8 @@ module Spree
     # If so add error and restart checkout.
     def ensure_line_item_variants_are_not_discontinued
       if line_items.any?{ |li| !li.variant || li.variant.discontinued? }
-        errors.add(:base, Spree.t(:discontinued_variants_present))
         restart_checkout_flow
+        errors.add(:base, Spree.t(:discontinued_variants_present))
         false
       else
         true
@@ -427,8 +427,8 @@ module Spree
 
     def ensure_line_items_are_in_stock
       if insufficient_stock_lines.present?
-        errors.add(:base, Spree.t(:insufficient_stock_lines_present))
         restart_checkout_flow
+        errors.add(:base, Spree.t(:insufficient_stock_lines_present))
         false
       else
         true

data/app/models/spree/shipment.rb

@@ -17,9 +17,9 @@ module Spree
       has_many :adjustments, as: :adjustable
       has_many :inventory_units, inverse_of: :shipment
       has_many :shipping_rates, -> { order(:cost) }
+      has_many :state_changes, as: :stateful
     end
     has_many :shipping_methods, through: :shipping_rates
-    has_many :state_changes, as: :stateful
 
     after_save :update_adjustments
 

data/config/locales/en.yml

@@ -350,10 +350,6 @@ en:
           attributes:
             base:
               cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
-        spree/shipping_method:
-          attributes:
-            base:
-              cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
 
   devise:
     confirmations:

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.0"
+    "3.1.1"
   end
 end

data/spec/lib/spree/core/importer/order_spec.rb

@@ -588,7 +588,7 @@ module Spree
           ]
         }
         order = Importer::Order.import(user, params)
-        expect(order.payments.first.created_at).to be_within(0.1).of created_at
+        expect(order.payments.first.created_at).to be_within(1).of created_at
       end
 
       context "raises error" do

data/spec/models/spree/asset_spec.rb

@@ -3,12 +3,15 @@ require 'spec_helper'
 describe Spree::Asset, :type => :model do
   describe "#viewable" do
     it "touches association" do
-      product = create(:custom_product)
-      asset = Spree::Asset.create! { |a| a.viewable = product.master }
+      Timecop.scale(3600) do
 
-      expect do
-        asset.touch
-      end.to change { product.reload.updated_at }
+        product = create(:custom_product)
+        asset   = Spree::Asset.create! { |a| a.viewable = product.master }
+
+        expect do
+          asset.touch
+        end.to change { product.reload.updated_at }
+      end
     end
   end
 

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

@@ -96,10 +96,13 @@ describe 'Order' do
         let(:order) { create(:order, user: primary_store_credit.user, total: order_total) }
 
         before do
+          Timecop.scale(3600)
           subject
           order.reload
         end
 
+        after { Timecop.return }
+
         it 'uses the primary store credit type over the secondary' do
           primary_payment = order.payments.first
           secondary_payment = order.payments.last

data/spec/models/spree/order_spec.rb

@@ -238,7 +238,6 @@ describe Spree::Order, :type => :model do
 
     context 'when variant is destroyed' do
       before do
-        allow(order).to receive(:restart_checkout_flow)
         order.line_items.first.variant.discontinue!
       end
 
@@ -272,14 +271,14 @@ describe Spree::Order, :type => :model do
   describe '#ensure_line_items_are_in_stock' do
     subject { order.ensure_line_items_are_in_stock }
 
-    let(:line_item) { mock_model Spree::LineItem, :insufficient_stock? => true }
+    let(:line_item) { create(:line_item, order: order) }
 
     before do
-      allow(order).to receive(:restart_checkout_flow)
-      allow(order).to receive_messages(:line_items => [line_item])
+      allow(order).to receive(:insufficient_stock_lines).and_return([true])
     end
 
     it 'should restart checkout flow' do
+      allow(order).to receive(:restart_checkout_flow)
       expect(order).to receive(:restart_checkout_flow).once
       subject
     end
@@ -290,6 +289,7 @@ describe Spree::Order, :type => :model do
     end
 
     it 'should be false' do
+      allow(order).to receive(:restart_checkout_flow)
       expect(subject).to be_falsey
     end
   end

data/spec/models/spree/product_spec.rb

@@ -21,6 +21,21 @@ describe Spree::Product, :type => :model do
       is_expected.to have_many(:possible_promotions).
         class_name('Spree::Promotion').through(:promotion_rules).source(:promotion)
     end
+
+    it do
+      is_expected.to have_many(:variants).
+        class_name('Spree::Variant').
+        inverse_of(:product).
+        conditions(is_master: false).
+        order(:position)
+    end
+
+    it do
+      is_expected.to have_many(:variants_including_master).
+        class_name('Spree::Variant').
+        inverse_of(:product).
+        order(:position)
+    end
   end
 
   context 'product instance' do
@@ -182,22 +197,6 @@ describe Spree::Product, :type => :model do
       end
     end
 
-    describe 'Variants sorting' do
-      ORDER_REGEXP = /ORDER BY (\`|\")spree_variants(\`|\").(\'|\")position(\'|\") ASC/
-
-      context 'without master variant' do
-        it 'sorts variants by position' do
-          expect(product.variants.to_sql).to match(ORDER_REGEXP)
-        end
-      end
-
-      context 'with master variant' do
-        it 'sorts variants by position' do
-          expect(product.variants_including_master.to_sql).to match(ORDER_REGEXP)
-        end
-      end
-    end
-
     context "has stock movements" do
       let(:variant) { product.master }
       let(:stock_item) { variant.stock_items.first }

data/spec/models/spree/store_credit_spec.rb

@@ -180,7 +180,7 @@ describe 'StoreCredit' do
         end
 
         context 'originator is present' do
-          with_model 'OriginatorThing'
+          with_model 'OriginatorThing', scope: :all
 
           let(:originator) { OriginatorThing.create! } # won't actually be a user. just giving it a valid model here
 
@@ -335,7 +335,7 @@ describe 'StoreCredit' do
       end
 
       context 'originator is present' do
-        with_model 'OriginatorThing'
+        with_model 'OriginatorThing', scope: :all
 
         let(:originator) { OriginatorThing.create! } # won't actually be a user. just giving it a valid model here
 
@@ -407,7 +407,7 @@ describe 'StoreCredit' do
       end
 
       context 'originator is present' do
-        with_model 'OriginatorThing'
+        with_model 'OriginatorThing', scope: :all
 
         let(:originator) { OriginatorThing.create! } # won't actually be a user. just giving it a valid model here
 
@@ -534,7 +534,7 @@ describe 'StoreCredit' do
         end
 
         context 'originator is present' do
-          with_model 'OriginatorThing'
+          with_model 'OriginatorThing', scope: :all
 
           let(:originator) { OriginatorThing.create! } # won't actually be a user. just giving it a valid model here
 

data/spec/models/spree/user_spec.rb

@@ -6,12 +6,18 @@ describe Spree::LegacyUser, type: :model do
     let!(:user) { create(:user) }
     let!(:order) { create(:order, bill_address: create(:address), ship_address: create(:address)) }
 
-    let!(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: user) }
-    let!(:order_2) { create(:order, user: user, created_by: user) }
-    let!(:order_3) { create(:order, user: user, created_by: create(:user)) }
+    let(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: user) }
+    let(:order_2) { create(:order, user: user, created_by: user) }
+    let(:order_3) { create(:order, user: user, created_by: create(:user)) }
 
     it 'returns correct order' do
-      expect(user.last_incomplete_spree_order).to eq order_3
+      Timecop.scale(3600) do
+        order_1
+        order_2
+        order_3
+
+        expect(user.last_incomplete_spree_order).to eq order_3
+      end
     end
 
     context 'persists order address' do

data/spree_core.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'paperclip', '~> 4.3.0'
   s.add_dependency 'paranoia', '~> 2.1.0'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 4.2.6'
+  s.add_dependency 'rails', '~> 4.2.7.1'
   s.add_dependency 'ransack', '~> 1.4.1'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -1163,7 +1163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.