From b713bd7aa79e59a391eec42674068d34d4e1268d Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Sun, 29 Nov 2020 15:03:30 -0800
Subject: [PATCH] spec updates

---
 app/controllers/cart_controller.rb                   |  2 +-
 spec/controllers/cart_controller_spec.rb             | 12 ++++++++----
 .../unit/darkswarm/services/cart_spec.js.coffee      |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/cart_controller.rb b/app/controllers/cart_controller.rb
index c7c1a32905..1dd817dfe1 100644
--- a/app/controllers/cart_controller.rb
+++ b/app/controllers/cart_controller.rb
@@ -12,7 +12,7 @@ class CartController < BaseController
       cart_service = CartService.new(order)
 
       errors = cart_service.populate(params.slice(:products, :variants, :quantity), true)[:errors]
-      if errors.blank?
+      if errors.empty?
         order.update_distribution_charge!
         order.cap_quantity_at_stock!
         order.update!
diff --git a/spec/controllers/cart_controller_spec.rb b/spec/controllers/cart_controller_spec.rb
index 50d2ca3c28..78c15bc5f3 100644
--- a/spec/controllers/cart_controller_spec.rb
+++ b/spec/controllers/cart_controller_spec.rb
@@ -7,33 +7,37 @@ describe CartController, type: :controller do
 
   describe "basic behaviour" do
     let(:cart_service) { double }
+    let(:errors) { double }
 
     before do
       allow(CartService).to receive(:new).and_return(cart_service)
     end
 
     it "returns HTTP success when successful" do
-      allow(cart_service).to receive(:populate) { true }
+      allow(cart_service).to receive(:populate).and_return({ errors: {} })
       allow(cart_service).to receive(:variants_h) { {} }
       xhr :post, :populate, use_route: :spree, format: :json
       expect(response.status).to eq(200)
     end
 
     it "returns failure when unsuccessful" do
-      allow(cart_service).to receive(:populate).and_return false
+      allow(errors).to receive(:empty?).and_return(false)
+      allow(errors).to receive(:full_messages).and_return(["Error: foo"])
+      allow(cart_service).to receive(:populate).and_return({ errors: errors })
       xhr :post, :populate, use_route: :spree, format: :json
       expect(response.status).to eq(412)
     end
 
     it "tells cart_service to overwrite" do
-      expect(cart_service).to receive(:populate).with({}, true)
+      allow(cart_service).to receive(:variants_h) { {} }
+      expect(cart_service).to receive(:populate).with({}, true).and_return({ errors: {} })
       xhr :post, :populate, use_route: :spree, format: :json
     end
 
     it "returns stock levels as JSON on success" do
       allow(controller).to receive(:variant_ids_in) { [123] }
       allow_any_instance_of(VariantsStockLevels).to receive(:call).and_return("my_stock_levels")
-      allow(cart_service).to receive(:populate) { true }
+      allow(cart_service).to receive(:populate).and_return({ errors: {} })
       allow(cart_service).to receive(:variants_h) { {} }
 
       xhr :post, :populate, use_route: :spree, format: :json
diff --git a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
index 4bed7bbd97..171203499e 100644
--- a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
@@ -138,10 +138,10 @@ describe 'Cart service', ->
       expect(Cart.popQueue).not.toHaveBeenCalled()
 
     it "shows an error on cart update failure", ->
-      $httpBackend.expectPOST("/cart/populate", data).respond 404, {}
+      $httpBackend.expectPOST("/cart/populate", data).respond 412, {}
       Cart.update()
       $httpBackend.flush()
-      expect(RailsFlashLoader.loadFlash).toHaveBeenCalledWith({error: t('js.cart.add_to_cart_failed')})
+      expect(RailsFlashLoader.loadFlash).toHaveBeenCalled()
 
   describe "verifying stock levels after update", ->
     describe "when an item is out of stock", ->