From bdc2d002faa568bd6fea1d6f4f85a72a2fa7408e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 5 May 2020 17:18:13 +0200
Subject: [PATCH] Update karma tests

---
 .../darkswarm/services/cart_spec.js.coffee    | 23 +++++++++++--------
 .../services/products_spec.js.coffee          |  7 +++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
index 0b9c398a85..4bed7bbd97 100644
--- a/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
@@ -1,6 +1,7 @@
 describe 'Cart service', ->
   Cart = null
   Variants = null
+  RailsFlashLoader = null
   variant = null
   order = null
   $httpBackend = null
@@ -18,9 +19,15 @@ describe 'Cart service', ->
       ]
     }
     angular.module('Darkswarm').value('currentOrder', order)
-    inject ($injector, _$httpBackend_, _$timeout_)->
+
+    module ($provide)->
+      $provide.value "railsFlash", null
+      null
+
+    inject ($injector, _$httpBackend_, _$timeout_, _RailsFlashLoader_)->
       Variants =  $injector.get("Variants")
       Cart =  $injector.get("Cart")
+      RailsFlashLoader = _RailsFlashLoader_
       $httpBackend = _$httpBackend_
       $timeout = _$timeout_
 
@@ -86,6 +93,9 @@ describe 'Cart service', ->
   describe "updating the cart", ->
     data = {variants: {}}
 
+    beforeEach ->
+      spyOn(RailsFlashLoader, "loadFlash")
+
     it "sets update_running during the update, and clears it on success", ->
       $httpBackend.expectPOST("/cart/populate", data).respond 200, {}
       expect(Cart.update_running).toBe(false)
@@ -127,12 +137,11 @@ describe 'Cart service', ->
       $httpBackend.flush()
       expect(Cart.popQueue).not.toHaveBeenCalled()
 
-    it "retries the update on failure", ->
-      spyOn(Cart, 'scheduleRetry')
+    it "shows an error on cart update failure", ->
       $httpBackend.expectPOST("/cart/populate", data).respond 404, {}
       Cart.update()
       $httpBackend.flush()
-      expect(Cart.scheduleRetry).toHaveBeenCalled()
+      expect(RailsFlashLoader.loadFlash).toHaveBeenCalledWith({error: t('js.cart.add_to_cart_failed')})
 
   describe "verifying stock levels after update", ->
     describe "when an item is out of stock", ->
@@ -220,12 +229,6 @@ describe 'Cart service', ->
     expect(Cart.update_enqueued).toBe(false)
     expect(Cart.scheduleUpdate).toHaveBeenCalled()
 
-  it "schedules retries of updates", ->
-    spyOn(Cart, 'orderChanged')
-    Cart.scheduleRetry()
-    $timeout.flush()
-    expect(Cart.orderChanged).toHaveBeenCalled()
-
   it "clears the cart", ->
     expect(Cart.line_items).not.toEqual []
     Cart.clear()
diff --git a/spec/javascripts/unit/darkswarm/services/products_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/products_spec.js.coffee
index d1b9f38bb6..62c8c0a071 100644
--- a/spec/javascripts/unit/darkswarm/services/products_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/products_spec.js.coffee
@@ -3,6 +3,7 @@ describe 'Products service', ->
   Products = null
   OrderCycle = {}
   Shopfront = null
+  RailsFlashLoader = null
   Variants = null
   Cart = null
   shopfront = null
@@ -43,6 +44,8 @@ describe 'Products service', ->
     OrderCycle =
       order_cycle:
         order_cycle_id: 1
+    RailsFlashLoader =
+      loadFlash: (arg) ->
 
     module 'Darkswarm'
     module ($provide)->
@@ -52,12 +55,14 @@ describe 'Products service', ->
       $provide.value "properties", properties
       $provide.value "Geo", Geo
       $provide.value "OrderCycle", OrderCycle
+      $provide.value "railsFlash", null
       null
 
-    inject ($injector, _$httpBackend_)->
+    inject ($injector, _$httpBackend_, _RailsFlashLoader_)->
       Products = $injector.get("Products")
       Shopfront = $injector.get("Shopfront")
       Properties = $injector.get("Properties")
+      RailsFlashLoader = _RailsFlashLoader_
       Variants = $injector.get("Variants")
       Cart = $injector.get("Cart")
       $httpBackend = _$httpBackend_