From 5fb782aeba8c36ca4c77cd57f62fdf21361562ad Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 2 Aug 2021 23:01:28 +0100
Subject: [PATCH] Update $qProvider configuration

The default logic for how rejected promises are handled has changed slightly. This reinstates the previous default behaviour.
---
 app/assets/javascripts/admin/admin_ofn.js.coffee       |  3 ++-
 app/assets/javascripts/darkswarm/darkswarm.js.coffee   |  3 ++-
 .../controllers/permalink_controller_spec.js.coffee    | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/admin_ofn.js.coffee b/app/assets/javascripts/admin/admin_ofn.js.coffee
index 75346fe9e3..39ca45a89f 100644
--- a/app/assets/javascripts/admin/admin_ofn.js.coffee
+++ b/app/assets/javascripts/admin/admin_ofn.js.coffee
@@ -10,6 +10,7 @@ angular.module("ofn.admin", [
   "admin.taxons",
   "infinite-scroll",
   "admin.orders"
-]).config ($httpProvider, $locationProvider) ->
+]).config ($httpProvider, $locationProvider, $qProvider) ->
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
   $locationProvider.hashPrefix('')
+  $qProvider.errorOnUnhandledRejections(false)
diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
index f8e06e2a79..71f542e0c0 100644
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -12,9 +12,10 @@ angular.module("Darkswarm", [
   'angularFileUpload',
   'angularSlideables',
   'OFNShared'
-]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
+]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider, $qProvider) ->
   $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
   $httpProvider.defaults.headers.common['Accept'] = "application/json, text/javascript, */*"
   $locationProvider.hashPrefix('')
+  $qProvider.errorOnUnhandledRejections(false)
   # We manually handle our scrolling
   $anchorScrollProvider.disableAutoScrolling()
diff --git a/spec/javascripts/unit/admin/enterprises/controllers/permalink_controller_spec.js.coffee b/spec/javascripts/unit/admin/enterprises/controllers/permalink_controller_spec.js.coffee
index bcecc1c5a6..72e6fdb2da 100644
--- a/spec/javascripts/unit/admin/enterprises/controllers/permalink_controller_spec.js.coffee
+++ b/spec/javascripts/unit/admin/enterprises/controllers/permalink_controller_spec.js.coffee
@@ -49,9 +49,11 @@ describe "permalinkCtrl", ->
 
     it "does nothing when PermalinkChecker rejects", ->
       $scope.availability = "Some Availability"
-      deferred.reject()
-      promise = deferred.promise
-      spyOn(PermalinkChecker, "check").and.returnValue promise
-      $scope.$apply Enterprise.permalink = "somethingelse" # Change the permalink
+      try
+        deferred.reject()
+        promise = deferred.promise
+        spyOn(PermalinkChecker, "check").and.returnValue promise
+        $scope.$apply Enterprise.permalink = "somethingelse" # Change the permalink
+
       expect($scope.availability).toEqual "Some Availability"
       expect(Enterprise.permalink).toEqual "somethingelse"