From 00cb8d5bcea5f873e130d291fd43b752566c47a8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Sep 2014 23:49:28 +0100
Subject: [PATCH] Update package dependencies Closes #345

Also fixes a resulting test failure with the HTML parse node
---
 package.json                            | 42 ++++++++++++-------------
 test/nodes/core/parsers/70-HTML_spec.js | 14 ++++-----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 78e2e900d..928c1e40f 100644
--- a/package.json
+++ b/package.json
@@ -21,38 +21,38 @@
         "editor", "messaging", "iot", "m2m", "pi", "arduino", "beaglebone", "ibm", "flow"
     ],
     "dependencies": {
-        "express": "3.x",
-        "when": "3.1.0",
-        "nopt": "2.2.0",
+        "express": "3.17.2",
+        "when": "3.4.6",
+        "nopt": "3.0.1",
         "mqtt": "0.3.x",
-        "ws": "0.4.31",
-        "fs-extra": "0.8.1",
-        "clone": "0.1.11",
-        "mustache": "0.8.1",
+        "ws": "0.4.32",
+        "fs-extra": "0.11.1",
+        "clone": "0.1.18",
+        "mustache": "0.8.2",
         "cron":"1.0.4",
-        "raw-body":"1.1.3",
+        "raw-body":"1.3.0",
         "twitter-ng":"0.6.2",
-        "oauth":"0.9.11",
-        "xml2js":"0.4.2",
+        "oauth":"0.9.12",
+        "xml2js":"0.4.4",
         "sentiment":"0.2.3",
-        "irc":"0.3.6",
+        "irc":"0.3.7",
         "follow-redirects":"0.0.3",
-        "cors":"2.2.0",
-        "mkdirp":"0.3.5",
-        "cheerio":"0.15.0",
-        "uglify-js":"2.4.13",
-        "nodemailer":"1.2.0",
+        "cors":"2.4.2",
+        "mkdirp":"0.5.0",
+        "cheerio":"0.17.0",
+        "uglify-js":"2.4.15",
+        "nodemailer":"1.3.0",
         "imap":"0.8.13",
-        "request":"~2.40.0"
+        "request":"2.42.0"
     },
     "devDependencies": {
-        "grunt": "0.4.4",
+        "grunt": "0.4.5",
         "grunt-cli": "0.1.13",
         "grunt-simple-mocha": "0.4.0",
         "grunt-contrib-jshint": "0.10.0",
-        "mocha": "1.18.2",
-        "should": "3.3.1",
-        "sinon": "1.9.1",
+        "mocha": "1.21.4",
+        "should": "4.0.4",
+        "sinon": "1.10.3",
         "supertest": "^0.13.0"
     },
     "engines": {
diff --git a/test/nodes/core/parsers/70-HTML_spec.js b/test/nodes/core/parsers/70-HTML_spec.js
index d0b9a7cf0..e7e4cbb5c 100644
--- a/test/nodes/core/parsers/70-HTML_spec.js
+++ b/test/nodes/core/parsers/70-HTML_spec.js
@@ -68,7 +68,7 @@ describe('html node', function() {
     
     it('should retrieve paragraph contents when specified', function(done) {
         fs.readFile(file, 'utf8', function(err, data) {
-            var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"p"},
+            var flow = [{id:"n1",type:"html",wires:[["n2"]],ret:"text",tag:"p"},
                         {id:"n2", type:"helper"}];
             
             helper.load(htmlNode, flow, function() {
@@ -86,7 +86,7 @@ describe('html node', function() {
     
     it('should retrieve list contents as an array of html as default', function(done) {
         fs.readFile(file, 'utf8', function(err, data) {
-            var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"ol"},
+            var flow = [{id:"n1",type:"html",wires:[["n2"]],tag:"ol"},
                         {id:"n2", type:"helper"}];
             
             helper.load(htmlNode, flow, function() {
@@ -105,7 +105,7 @@ describe('html node', function() {
 
     it('should retrieve list contents as an array of text', function(done) {
         fs.readFile(file, 'utf8', function(err, data) {
-            var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"ol",ret:"text"},
+            var flow = [{id:"n1",type:"html",wires:[["n2"]],tag:"ol",ret:"text"},
                         {id:"n2", type:"helper"}];
             
             helper.load(htmlNode, flow, function() {
@@ -125,7 +125,7 @@ describe('html node', function() {
 
     it('should log on error', function(done) {
         fs.readFile(file,function(err, data) {
-            var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"p"},
+            var flow = [{id:"n1",type:"html",wires:[["n2"]],tag:"p"},
                         {id:"n2", type:"helper"}];
             
             helper.load(htmlNode, flow, function() {
@@ -137,7 +137,7 @@ describe('html node', function() {
                     msg.msg.should.startWith("Error:");
                     done();
                 });
-                n1.receive({payload:data,topic: "bar"});
+                n1.receive({payload:null,topic: "bar"});
             });          
         });
     });
@@ -152,7 +152,7 @@ describe('html node', function() {
         
         it('should retrieve list contents as html as default with output as multiple msgs ', function(done) {
             fs.readFile(file, 'utf8', function(err, data) {
-                var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"ul",as:"multi"},
+                var flow = [{id:"n1",type:"html",wires:[["n2"]],tag:"ul",as:"multi"},
                             {id:"n2", type:"helper"}];
                 
                 helper.load(htmlNode, flow, function() {
@@ -180,7 +180,7 @@ describe('html node', function() {
         
         it('should retrieve list contents as text with output as multiple msgs ', function(done) {
             fs.readFile(file, 'utf8', function(err, data) {
-                var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;",tag:"ul",ret:"text",as:"multi"},
+                var flow = [{id:"n1",type:"html",wires:[["n2"]],tag:"ul",ret:"text",as:"multi"},
                             {id:"n2", type:"helper"}];
                 
                 helper.load(htmlNode, flow, function() {