spree_frontend 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9847527ec24ce9c173c3c25318a971e92aa32419
-  data.tar.gz: e4398ba38c7062ed52ce3adddb7fac56468e96e1
+  metadata.gz: 4669556dfdb0463ea5912d5f128cbfde9cda8798
+  data.tar.gz: 22c2a185d50f01660afee1207c01e834bd0d99b1
 SHA512:
-  metadata.gz: df68a6aa898fda26ffa79e1d09b21321c5cc72fc1fe48f6741e3c45ff1affbcc1dd6a8cd90952067690d9e1fdce64dfc14020eeeea22fb8866308c34867b8d6b
-  data.tar.gz: 3e021266971e88a7a32baba5cd449be47cca5282b273e105e3eb6100bf59e55678c1c3dbf2ce7bc65398485b32f3594bc0835a5295567cfc7b00de8967d3ee8b
+  metadata.gz: 15dcb73206f6ed3d17a4f9b223466fc7d07d4fa719dc6c7405ea44eb7bd88ea223f1210d12d498c33cbcf4946e39a0f7b8b02ee9295dfe566bf3cf1c71ce58ee
+  data.tar.gz: 313daef838fcbec9a267f413daf7323ea60f4490efcd6aa26c9702339ea72827ae8003d54b99328442b5e5dd78db50b447413b899b88e6e4aa092c86c6399c50

data/app/controllers/spree/home_controller.rb

@@ -5,7 +5,8 @@ module Spree
 
     def index
       @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products.includes(:possible_promotions)
+      @products = @searcher.retrieve_products
+      @products = @products.includes(:possible_promotions) if @products.respond_to?(:includes)
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
   end

data/app/controllers/spree/products_controller.rb

@@ -10,7 +10,8 @@ module Spree
 
     def index
       @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products.includes(:possible_promotions)
+      @products = @searcher.retrieve_products
+      @products = @products.includes(:possible_promotions) if @products.respond_to?(:includes)
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 

data/spec/controllers/spree/home_controller_spec.rb

@@ -24,4 +24,24 @@ describe Spree::HomeController, :type => :controller do
       end
     end
   end
+
+  context "index products" do
+    it "calls includes when the retrieved_products object responds to it" do
+      searcher = double("Searcher")
+      allow(controller).to receive_messages build_searcher: searcher
+      expect(searcher).to receive_message_chain("retrieve_products.includes")
+
+      spree_get :index
+    end
+
+    it "does not call includes when it's not available" do
+      searcher = double("Searcher")
+      allow(controller).to receive_messages build_searcher: searcher
+      allow(searcher).to receive(:retrieve_products).and_return([])
+
+      spree_get :index
+
+      expect(assigns(:products)).to eq([])
+    end
+  end
 end

data/spec/controllers/spree/products_controller_spec.rb

@@ -64,4 +64,24 @@ describe Spree::ProductsController, :type => :controller do
       expect(response.header["Location"]).to include("taxon_id=#{taxon.id}")
     end
   end
+
+  context "index products" do
+    it "calls includes when the retrieved_products object responds to it" do
+      searcher = double("Searcher")
+      allow(controller).to receive_messages build_searcher: searcher
+      expect(searcher).to receive_message_chain("retrieve_products.includes")
+
+      spree_get :index
+    end
+
+    it "does not call includes when it's not available" do
+      searcher = double("Searcher")
+      allow(controller).to receive_messages build_searcher: searcher
+      allow(searcher).to receive(:retrieve_products).and_return([])
+
+      spree_get :index
+
+      expect(assigns(:products)).to eq([])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement