From 1f40d4f941b3fedf748e1bc4fe510ceb48c19549 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sat, 13 Jan 2018 22:00:43 +0000
Subject: [PATCH] Update package dependencies

---
 package.json                            | 42 ++++++++++++-------------
 test/nodes/core/io/22-websocket_spec.js | 29 ++++++++++++++---
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 1f356a107..cbaa2fd7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.17.5",
+    "version": "0.18.0",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -33,51 +33,51 @@
         "flow"
     ],
     "dependencies": {
-        "basic-auth": "1.1.0",
+        "basic-auth": "2.0.0",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.17.2",
+        "body-parser": "1.18.2",
         "cheerio": "0.22.0",
         "clone": "2.1.1",
         "cookie": "0.3.1",
         "cookie-parser": "1.4.3",
-        "cors": "2.8.3",
-        "cron": "1.2.1",
-        "express": "4.15.3",
-        "express-session": "1.15.2",
-        "follow-redirects": "1.2.4",
+        "cors": "2.8.4",
+        "cron": "1.3.0",
+        "express": "4.16.2",
+        "express-session": "1.15.6",
+        "follow-redirects": "1.3.0",
         "fs-extra": "1.0.0",
         "fs.notify": "0.0.4",
         "hash-sum": "1.0.2",
         "i18next": "1.10.6",
         "is-utf8": "0.2.1",
-        "js-yaml": "3.8.4",
+        "js-yaml": "3.10.0",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.4.1",
         "media-typer": "0.3.0",
         "memorystore": "1.6.0",
-        "mqtt": "2.9.0",
+        "mqtt": "2.15.1",
         "multer": "1.3.0",
         "mustache": "2.3.0",
-        "nopt": "3.0.6",
-        "oauth2orize": "1.8.0",
+        "nopt": "4.0.1",
+        "oauth2orize": "1.11.0",
         "on-headers": "1.0.1",
-        "passport": "0.3.2",
+        "passport": "0.4.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.2.0",
-        "semver": "5.3.0",
+        "raw-body": "2.3.2",
+        "semver": "5.4.1",
         "sentiment": "2.1.0",
-        "uglify-js": "3.0.20",
+        "uglify-js": "3.3.6",
         "when": "3.7.8",
-        "ws": "1.1.1",
-        "xml2js": "0.4.17",
+        "ws": "1.1.5",
+        "xml2js": "0.4.19",
         "node-red-node-feedparser": "0.1.*",
         "node-red-node-email": "0.1.*",
         "node-red-node-twitter": "0.1.*",
         "node-red-node-rbe": "0.1.*"
     },
     "optionalDependencies": {
-        "bcrypt": "~1.0.1"
+        "bcrypt": "~1.0.3"
     },
     "devDependencies": {
         "chromedriver": "^2.33.2",
@@ -90,12 +90,12 @@
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
         "grunt-contrib-jshint": "~1.1.0",
-        "grunt-contrib-uglify": "~3.0.1",
+        "grunt-contrib-uglify": "~3.3.0",
         "grunt-contrib-watch": "~1.0.0",
         "grunt-jsonlint": "~1.1.0",
         "grunt-mocha-istanbul": "5.0.2",
         "grunt-nodemon": "~0.4.2",
-        "grunt-sass": "~1.2.1",
+        "grunt-sass": "~2.0.0",
         "grunt-simple-mocha": "~0.4.1",
         "grunt-webdriver": "^2.0.3",
         "istanbul": "0.4.5",
diff --git a/test/nodes/core/io/22-websocket_spec.js b/test/nodes/core/io/22-websocket_spec.js
index d574ac2e0..ded27a6e3 100644
--- a/test/nodes/core/io/22-websocket_spec.js
+++ b/test/nodes/core/io/22-websocket_spec.js
@@ -101,6 +101,8 @@ describe('websocket Node', function() {
             helper.load(websocketNode, flow, function() {
                 createClient("n1").then(function(sock) {
                     done();
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -113,6 +115,8 @@ describe('websocket Node', function() {
                         done();
                     });
                     helper.clearFlows();
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -129,6 +133,8 @@ describe('websocket Node', function() {
                         done();
                     });
                     sock.send("hello");
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -145,6 +151,8 @@ describe('websocket Node', function() {
                         msg.should.have.property("text", "hello");
                         done();
                     });
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -161,6 +169,8 @@ describe('websocket Node', function() {
                         msg.should.have.property("payload", "hello");
                         done();
                     });
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -179,6 +189,8 @@ describe('websocket Node', function() {
                     helper.getNode("n2").send({
                         payload: "hello"
                     });
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -197,6 +209,8 @@ describe('websocket Node', function() {
                     helper.getNode("n3").send({
                         text: "hello"
                     });
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -216,6 +230,8 @@ describe('websocket Node', function() {
                         done();
                     },100);
                     helper.getNode("n2").send({topic: "hello"});
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -232,6 +248,8 @@ describe('websocket Node', function() {
                         done();
                     });
                     sock.send("hello");
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -248,6 +266,8 @@ describe('websocket Node', function() {
                         done();
                     });
                     sock.send('{"text":"hello"}');
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });
@@ -272,10 +292,11 @@ describe('websocket Node', function() {
                     helper.getNode("n3").send({
                         payload: "hello"
                     });
-                });
-
-                when.all([def1.promise, def2.promise]).then(function() {
-                    done();
+                    return when.all([def1.promise, def2.promise]).then(function() {
+                        done();
+                    });
+                }).catch(function(err) {
+                    done(err);
                 });
             });
         });