solidus_core 2.5.0.beta2 → 2.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea3e082ced1d6d489258eb5eb17e2f9d69d455be304f10d947cd4eb82f6d3ce
-  data.tar.gz: ab928452cf6ce9bd4bb658e7878ce7a816f56cc44cc2ff1e14faa26a642c8e40
+  metadata.gz: 5d3194680467637f6a7a10a8f57260d6fe8a69584e6f4694b64d4917fb1d20ea
+  data.tar.gz: f24092cc442961ccc16f8bcff07433d9ca52d321b0f776162f9483b9ffa09a30
 SHA512:
-  metadata.gz: 3341402dad6a4a27e844aa6390c4fc5fe73c56e757798503362d74842cbb17e2fa1389bfab3b1f88965e7e18eeb465b3897f29585e0b646d2dd30a22ce002732
-  data.tar.gz: e3e782f4b5f4faa8f0355460eb4a737479cf36094ca2fd3032c068d602f1a21f42069e80dfc8b90ef883fef115b2c61a1b15995dcebd7f4775b4b0c8e189c33b
+  metadata.gz: 7c5c38ff7d7ec2a7e6acdf98fd1010af46702a3f06bedb110ef4c35c2fbce5cffbf82263a8cf66d234e88feb564eec22ed9145f0f22c8128b20a5351dd002f38
+  data.tar.gz: 9620c753a826613a0e21c38076e47d6e8ba1db463a55cca54d84ce19a55802711fa02ae26a29873fedbcb75de1a209565caa9c726fe844bbdb8420cdf6c5a32e

data/app/helpers/spree/taxons_helper.rb

@@ -4,12 +4,13 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
-      products = taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
+      price_scope = Spree::Price.where(current_pricing_options.search_arguments)
+      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
       if products.size < max
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |descendent_taxon|
           to_get = max - products.length
-          products += descendent_taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/models/spree/fulfilment_changer.rb

@@ -96,6 +96,10 @@ module Spree
       # are up-to-date, too.
       desired_shipment.refresh_rates
 
+      # In order to reflect the changes in the order totals
+      desired_shipment.order.reload
+      desired_shipment.order.recalculate
+
       true
     end
 

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.5.0.beta2"
+    "2.5.0.rc1"
   end
 
   def self.solidus_gem_version

data/spec/helpers/taxons_helper_spec.rb

@@ -1,17 +1,39 @@
 require 'rails_helper'
 
 RSpec.describe Spree::TaxonsHelper, type: :helper do
-  # Regression test for https://github.com/spree/spree/issues/4382
-  it "#taxon_preview" do
-    taxon = create(:taxon)
-    child_taxon = create(:taxon, parent: taxon)
-    product_1 = create(:product)
-    product_2 = create(:product)
-    product_3 = create(:product)
-    taxon.products << product_1
-    taxon.products << product_2
-    child_taxon.products << product_3
+  let(:currency) { 'USD' }
+  let(:pricing_options) do
+    Spree::Config.pricing_options_class.new(currency: currency)
+  end
+  before do
+    allow(helper).to receive(:current_pricing_options) { pricing_options }
+  end
+
+  describe "#taxon_preview" do
+    let!(:taxon) { create(:taxon) }
+    let!(:child_taxon) { create(:taxon, parent: taxon) }
+    let!(:product_1) { create(:product) }
+    let!(:product_2) { create(:product) }
+    let!(:product_3) { create(:product) }
+
+    before do
+      taxon.products << product_1
+      taxon.products << product_2
+      child_taxon.products << product_3
+      taxon.reload
+    end
+
+    # Regression test for https://github.com/spree/spree/issues/4382
+    it "returns products" do
+      expect(helper.taxon_preview(taxon)).to eql([product_1, product_2, product_3])
+    end
+
+    context "with different currency" do
+      let(:currency) { 'CAD' }
 
-    expect(taxon_preview(taxon.reload)).to eql([product_1, product_2, product_3])
+      it "returns no products" do
+        expect(helper.taxon_preview(taxon)).to be_empty
+      end
+    end
   end
 end

data/spec/models/spree/fulfilment_changer_spec.rb

@@ -57,6 +57,15 @@ RSpec.describe Spree::FulfilmentChanger do
       subject
     end
 
+    it 'updates order totals' do
+      original_total = order.total
+      original_shipment_total = order.shipment_total
+
+      expect { subject }.
+        to change { order.total }.from(original_total).to(original_total + original_shipment_total).
+        and change { order.shipment_total }.by(original_shipment_total)
+    end
+
     context "when transferring to another stock location" do
       let(:desired_stock_location) { create(:stock_location) }
       let!(:stock_item) do

data/spec/models/spree/shipment_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Spree::Shipment, type: :model do
           end
         end.to change { Spree::Shipment.count }.by(1)
 
-        new_shipment = order.shipments.last
+        new_shipment = order.shipments.order(:created_at).last
         expect(new_shipment.number).to_not eq(shipment.number)
         expect(new_shipment.stock_location).to eq(stock_location)
         expect(new_shipment.line_items.count).to eq(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta2
+  version: 2.5.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer