From b35cb71ed6a0b6c42195d2dd636c8f4c09eb63d5 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <github@paulmelnikow.com>
Date: Sat, 9 Dec 2017 12:03:57 -0500
Subject: [PATCH] Upgrade IcedFrisby (#1360)

IcedFrisby/IcedFrisby#71 will allow us to set a per-test `timeout()` and per-test `retry()`, which should allow us to keep flaky tests green most of the time.

A slough of service tests are failing locally, though they are also failing in master and seem unrelated to these changes. (#1359)

IcedFrisby is maturing toward a 2.0 API. There's been one breaking change to the way dependencies are installed, and probably more changes to come in the API itself. Shields uses such a small part of that API that 2.0, when it's released, may not even affect us.
---
 package-lock.json | 46 +++++++++++++++-------------------------------
 package.json      |  3 ++-
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b04b4e04da0f7..d1b74728b7b03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6204,17 +6204,17 @@
       "dev": true
     },
     "icedfrisby": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/icedfrisby/-/icedfrisby-1.4.0.tgz",
-      "integrity": "sha1-aV+gLWmnsss/KkFKDmjNZp+t4Sk=",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/icedfrisby/-/icedfrisby-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-DEWESHwTAwOZbAOFShOWWg3M0u8eCtcx//+YvF4Y15uWbTby1PZ6HO2ua8We8pKZ8dWvDjp9I1e4KKPlYrml1g==",
       "dev": true,
       "requires": {
         "chai": "4.1.2",
         "chai-subset": "1.6.0",
         "chai-things": "0.2.0",
-        "chalk": "2.1.0",
+        "chalk": "2.3.0",
         "check-types": "7.3.0",
-        "joi": "11.3.4",
+        "joi": "12.0.0",
         "lodash": "4.17.4",
         "qs": "6.4.0",
         "request": "2.83.0",
@@ -6231,20 +6231,20 @@
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -6781,22 +6781,14 @@
       }
     },
     "joi": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-11.3.4.tgz",
-      "integrity": "sha512-2eytkbHJ0qhXaNgElrKFrruv1sZ8MtuFg7fJe1Linb028x/3+flYsrtZIc+7wYVY7oCtXv6Ou7dCzAZaV/Qubg==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-12.0.0.tgz",
+      "integrity": "sha512-z0FNlV4NGgjQN1fdtHYXf5kmgludM65fG/JlXzU6+rwkt9U5UWuXVYnXa2FpK0u6+qBuCmrm5byPNuiiddAHvQ==",
       "dev": true,
       "requires": {
         "hoek": "4.2.0",
         "isemail": "3.0.0",
         "topo": "2.0.2"
-      },
-      "dependencies": {
-        "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-          "dev": true
-        }
       }
     },
     "js-beautify": {
@@ -12644,14 +12636,6 @@
       "dev": true,
       "requires": {
         "hoek": "4.2.0"
-      },
-      "dependencies": {
-        "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-          "dev": true
-        }
       }
     },
     "touch": {
diff --git a/package.json b/package.json
index 2db4c1a9c8d55..d6419cb4ae571 100644
--- a/package.json
+++ b/package.json
@@ -111,10 +111,11 @@
     "eslint-plugin-standard": "^3.0.1",
     "fetch-ponyfill": "^4.1.0",
     "glob": "^7.1.1",
-    "icedfrisby": "^1.4.0",
+    "icedfrisby": "2.0.0-alpha.1",
     "icedfrisby-nock": "^1.0.0",
     "is-png": "^1.1.0",
     "is-svg": "^2.1.0",
+    "joi": "^12.0.0",
     "lodash.debounce": "^4.0.8",
     "lodash.difference": "^4.5.0",
     "lodash.mapvalues": "^4.6.0",