From c0438edb21ce447c4628a9ec2450854b970566e5 Mon Sep 17 00:00:00 2001
From: Artem Kostiuk <postatum@gmail.com>
Date: Fri, 1 May 2020 12:08:56 +0300
Subject: [PATCH] Update popsicle, popsicle-server

---
 package-lock.json | 53 +++++++++++++----------------------------------
 package.json      |  4 ++--
 test/utils.js     |  2 +-
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0f44f58..7e4caf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -415,12 +415,6 @@
         "color-convert": "^1.9.0"
       }
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -3575,18 +3569,18 @@
       "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="
     },
     "popsicle": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/popsicle/-/popsicle-12.0.4.tgz",
-      "integrity": "sha512-UuxhAFa4RXBecC6ZK24sKra/9va1bTxnb3CQpFsm+VBW72sl+UtTAmZv7LZTvvDNnGusAqisN+a6xSN9xSQzZA==",
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/popsicle/-/popsicle-12.0.5.tgz",
+      "integrity": "sha512-PZt2+KfNQVwYXEwaAdJPLsYFJ+j0M25+26GhBovxhq9TZFRJfigAlJ5JfioCf/9R4RcTSu9VeaovJcb20Br7mw==",
       "dev": true,
       "requires": {
         "popsicle-content-encoding": "^1.0.0",
         "popsicle-cookie-jar": "^1.0.0",
-        "popsicle-redirects": "^1.0.0",
-        "popsicle-transport-http": "^1.0.0",
-        "popsicle-transport-xhr": "^1.0.0",
+        "popsicle-redirects": "^1.1.0",
+        "popsicle-transport-http": "^1.0.6",
+        "popsicle-transport-xhr": "^1.0.2",
         "popsicle-user-agent": "^1.0.0",
-        "servie": "^4.0.6",
+        "servie": "^4.3.2",
         "throwback": "^4.1.0",
         "tough-cookie": "^3.0.1"
       }
@@ -3614,13 +3608,12 @@
       "dev": true
     },
     "popsicle-server": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/popsicle-server/-/popsicle-server-2.0.0.tgz",
-      "integrity": "sha1-unwnOzITZ6QNKGPtshCMNQJ1/pg=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/popsicle-server/-/popsicle-server-3.0.0.tgz",
+      "integrity": "sha512-C+1/3mmwuAAf8rbrapbVK28ODJbN29FixtJVdbb5Yr0MsLB2ffwLwwfYCWeaNhoN1iTL67K8xSHXWOQbYhcBpA==",
       "dev": true,
       "requires": {
-        "promise-finally": "^2.1.0",
-        "server-address": "^1.0.0"
+        "server-address": "^3.0.0"
       }
     },
     "popsicle-transport-http": {
@@ -3705,15 +3698,6 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "promise-finally": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/promise-finally/-/promise-finally-2.2.1.tgz",
-      "integrity": "sha1-ImFsS6kCkW6Yi9RsVNfKoIkQzXc=",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.3.0"
-      }
-    },
     "promise-polyfill": {
       "version": "8.1.3",
       "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz",
@@ -4249,18 +4233,9 @@
       }
     },
     "server-address": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/server-address/-/server-address-1.0.4.tgz",
-      "integrity": "sha1-BI0NURMqKV4IpKJhN/fRoeavIOg=",
-      "dev": true,
-      "requires": {
-        "server-destroy": "^1.0.0"
-      }
-    },
-    "server-destroy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
-      "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/server-address/-/server-address-3.0.1.tgz",
+      "integrity": "sha512-l3/af+A2iRviDBqSn4YBrhXHxWRlJUSgxx/UJA4h04vtsXrUmvR51PrXtuXQ9fzpu8fPTNJPMgYv52cbwibbxg==",
       "dev": true
     },
     "servie": {
diff --git a/package.json b/package.json
index 51798eb..9189692 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,8 @@
     "chai": "^4.1.2",
     "mocha": "^7.1.2",
     "nyc": "^15.0.1",
-    "popsicle": "12.0.4",
-    "popsicle-server": "^2.0.0",
+    "popsicle": "^12.0.5",
+    "popsicle-server": "^3.0.0",
     "pre-commit": "^1.0.1",
     "standard": "^14.3.3"
   },
diff --git a/test/utils.js b/test/utils.js
index 6e63999..ac36a02 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -6,7 +6,7 @@ function makeFetcher (app) {
   var compose = require('throwback').compose
   var Request = require('servie').Request
   var popsicle = require('popsicle')
-  var popsicleServer = require('popsicle-server')
+  var popsicleServer = require('popsicle-server').server
 
   // Set response text to "body" property to mimic popsicle v10
   // response interface.