Merge master

package.json

@@ -108,7 +108,8 @@
     "wdio-chromedriver-service": "^0.1.1",
     "wdio-mocha-framework": "^0.5.11",
     "wdio-spec-reporter": "^0.1.3",
-    "webdriverio": "^4.9.11"
+    "webdriverio": "^4.9.11",
+    "node-red-node-test-helper": "0.1.6"
   },
   "engines": {
     "node": ">=4"

test/nodes/core/analysis/72-sentiment_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var sentimentNode = require("../../../../nodes/core/analysis/72-sentiment.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('sentiment Node', function() {
 

test/nodes/core/core/20-inject_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var injectNode = require("../../../../nodes/core/core/20-inject.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('inject node', function() {
 

test/nodes/core/core/25-catch_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var catchNode = require("../../../../nodes/core/core/25-catch.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('catch Node', function() {
 

test/nodes/core/core/25-status_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var catchNode = require("../../../../nodes/core/core/25-status.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('status Node', function() {
 

test/nodes/core/core/58-debug_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var debugNode = require("../../../../nodes/core/core/58-debug.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var WebSocket = require('ws');
 
 describe('debug node', function() {

test/nodes/core/core/60-link_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var linkNode = require("../../../../nodes/core/core/60-link.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('link Node', function() {
 

test/nodes/core/core/75-exec_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var execNode = require("../../../../nodes/core/core/75-exec.js");
 var osType = require("os").type();
 

test/nodes/core/core/80-function_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var functionNode = require("../../../../nodes/core/core/80-function.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('function node', function() {
 

test/nodes/core/core/80-template_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var templateNode = require("../../../../nodes/core/core/80-template.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('template node', function() {
 

test/nodes/core/core/89-delay_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 
 var delayNode = require("../../../../nodes/core/core/89-delay.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 var GRACE_PERCENTAGE=10;
 

test/nodes/core/core/89-trigger_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var triggerNode = require("../../../../nodes/core/core/89-trigger.js");
 var RED = require("../../../../red/red.js");
 

test/nodes/core/core/90-comment_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var commentNode = require("../../../../nodes/core/core/90-comment.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('comment Node', function() {
 

test/nodes/core/core/98-unknown_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var unknown = require("../../../../nodes/core/core/98-unknown.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('unknown Node', function() {
 

test/nodes/core/io/21-httprequest_spec.js

@@ -21,7 +21,7 @@ var should = require("should");
 var express = require("express");
 var bodyParser = require('body-parser');
 var stoppable = require('stoppable');
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var httpRequestNode = require("../../../../nodes/core/io/21-httprequest.js");
 var tlsNode = require("../../../../nodes/core/io/05-tls.js");
 var hashSum = require("hash-sum");

test/nodes/core/io/22-websocket_spec.js

@@ -17,7 +17,7 @@
 var ws = require("ws");
 var when = require("when");
 var should = require("should");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var websocketNode = require("../../../../nodes/core/io/22-websocket.js");
 
 var sockets = [];

test/nodes/core/io/23-watch_spec.js

@@ -17,7 +17,7 @@
 var fs = require("fs-extra");
 var path = require("path");
 var should = require("should");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var watchNode = require("../../../../nodes/core/io/23-watch.js");
 
 

test/nodes/core/io/31-tcpin_spec.js

@@ -17,7 +17,8 @@
 var net = require("net");
 var should = require("should");
 var stoppable = require('stoppable');
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
+
 var tcpinNode = require("../../../../nodes/core/io/31-tcpin.js");
 
 
@@ -46,7 +47,7 @@ describe('TCP in Node', function() {
             sock.end();
         }
     }
-    
+
     function startServer(done) {
         server_port += 1;
         server = stoppable(net.createServer(function(c) {
@@ -59,7 +60,7 @@ describe('TCP in Node', function() {
     function stopServer(done) {
         server.stop(done);
     }
-    
+
     function send(wdata) {
         var opt = {port:port, host:"localhost"};
         var client = net.createConnection(opt, function() {

test/nodes/core/io/31-tcprequest_spec.js

@@ -17,7 +17,7 @@
 var net = require("net");
 var should = require("should");
 var stoppable = require('stoppable');
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var tcpinNode = require("../../../../nodes/core/io/31-tcpin.js");
 
 
@@ -71,7 +71,7 @@ describe('TCP Request Node', function() {
 	    }
         });
     }
-    
+
     it('should send & recv data', function(done) {
         var flow = [{id:"n1", type:"tcp request", server:"localhost", port:port, out:"time", splitc: "0", wires:[["n2"]] },
                     {id:"n2", type:"helper"}];

test/nodes/core/io/32-udpin_spec.js

@@ -16,7 +16,7 @@
 
 var dgram = require("dgram");
 var should = require("should");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var udpNode = require("../../../../nodes/core/io/32-udp.js");
 
 

test/nodes/core/io/32-udpout_spec.js

@@ -16,7 +16,7 @@
 
 var dgram = require("dgram");
 var should = require("should");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var udpNode = require("../../../../nodes/core/io/32-udp.js");
 
 

test/nodes/core/logic/10-switch_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 
 var switchNode = require("../../../../nodes/core/logic/10-switch.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var RED = require("../../../../red/red.js");
 
 describe('switch Node', function() {

test/nodes/core/logic/15-change_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 
 var changeNode = require("../../../../nodes/core/logic/15-change.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('change Node', function() {
 

test/nodes/core/logic/16-range_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 
 var rangeNode = require("../../../../nodes/core/logic/16-range.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('range Node', function() {
 

test/nodes/core/logic/17-split_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 var splitNode = require("../../../../nodes/core/logic/17-split.js");
 var joinNode = require("../../../../nodes/core/logic/17-split.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var RED = require("../../../../red/red.js");
 
 describe('SPLIT node', function() {

test/nodes/core/logic/18-sort_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var sortNode = require("../../../../nodes/core/logic/18-sort.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var RED = require("../../../../red/red.js");
 
 describe('SORT node', function() {

test/nodes/core/logic/19-batch_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var batchNode = require("../../../../nodes/core/logic/19-batch.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 var RED = require("../../../../red/red.js");
 
 describe('BATCH node', function() {

test/nodes/core/parsers/70-CSV_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var csvNode = require("../../../../nodes/core/parsers/70-CSV.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('CSV node', function() {
 

test/nodes/core/parsers/70-HTML_spec.js

@@ -19,7 +19,7 @@ var path = require("path");
 var fs = require('fs-extra');
 
 var htmlNode = require("../../../../nodes/core/parsers/70-HTML.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('html node', function() {
 

test/nodes/core/parsers/70-JSON_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var jsonNode = require("../../../../nodes/core/parsers/70-JSON.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('JSON node', function() {
 

test/nodes/core/parsers/70-XML_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var xmlNode = require("../../../../nodes/core/parsers/70-XML.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('XML node', function() {
 

test/nodes/core/parsers/70-YAML_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 var yamlNode = require("../../../../nodes/core/parsers/70-YAML.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('YAML node', function() {
 

test/nodes/core/storage/28-tail_spec.js

@@ -20,7 +20,7 @@ var os = require('os');
 var fs = require('fs-extra');
 var sinon = require('sinon');
 var tailNode = require("../../../../nodes/core/storage/28-tail.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('tail Node', function() {
 

test/nodes/core/storage/50-file_spec.js

@@ -20,7 +20,7 @@ var fs = require('fs-extra');
 var os = require('os');
 var sinon = require("sinon");
 var fileNode = require("../../../../nodes/core/storage/50-file.js");
-var helper = require("../../helper.js");
+var helper = require("node-red-node-test-helper");
 
 describe('file Nodes', function() {
 

test/nodes/helper.js

@@ -1,169 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var should = require("should");
-var sinon = require("sinon");
-var when = require("when");
-var request = require('supertest');
-var express = require("express");
-var stoppable = require('stoppable');
-var nock;
-if (!process.version.match(/^v0\.[0-9]\./)) {
-    // only set nock for node >= 0.10
-    try {
-        nock = require('nock');
-    } catch (err) {
-        // nevermind, will skip nock tests
-        nock = null;
-    }
-}
-var RED = require("../../red/red.js");
-var redNodes = require("../../red/runtime/nodes");
-var flows = require("../../red/runtime/nodes/flows");
-var credentials = require("../../red/runtime/nodes/credentials");
-var comms = require("../../red/api/editor/comms.js");
-var log = require("../../red/runtime/log.js");
-var context = require("../../red/runtime/nodes/context.js");
-var events = require("../../red/runtime/events.js");
-
-var http = require('http');
-var express = require('express');
-var app = express();
-
-var address = '127.0.0.1';
-var listenPort = 0; // use ephemeral port
-var port;
-var url;
-var logSpy;
-var server;
-
-function helperNode(n) {
-    RED.nodes.createNode(this, n);
-}
-
-module.exports = {
-    load: function(testNode, testFlows, testCredentials, cb) {
-        var i;
-
-        logSpy = sinon.spy(log,"log");
-        logSpy.FATAL = log.FATAL;
-        logSpy.ERROR = log.ERROR;
-        logSpy.WARN = log.WARN;
-        logSpy.INFO = log.INFO;
-        logSpy.DEBUG = log.DEBUG;
-        logSpy.TRACE = log.TRACE;
-        logSpy.METRIC = log.METRIC;
-
-        if (typeof testCredentials === 'function') {
-            cb = testCredentials;
-            testCredentials = {};
-        }
-
-        var storage = {
-            getFlows: function() {
-                return when.resolve({flows:testFlows,credentials:testCredentials});
-            }
-        };
-
-        var settings = {
-            available: function() { return false; }
-        };
-
-        var red = {};
-        for (i in RED) {
-            if (RED.hasOwnProperty(i) && !/^(init|start|stop)$/.test(i)) {
-                var propDescriptor = Object.getOwnPropertyDescriptor(RED,i);
-                Object.defineProperty(red,i,propDescriptor);
-            }
-        }
-
-        red["_"] = function(messageId) {
-            return messageId;
-        };
-
-        redNodes.init({events:events,settings:settings, storage:storage,log:log,});
-        RED.nodes.registerType("helper", helperNode);
-        if (Array.isArray(testNode)) {
-            for (i = 0; i < testNode.length; i++) {
-                testNode[i](red);
-            }
-        } else {
-            testNode(red);
-        }
-        flows.load().then(function() {
-            flows.startFlows();
-            should.deepEqual(testFlows, flows.getFlows().flows);
-            cb();
-        });
-    },
-
-    unload: function() {
-        // TODO: any other state to remove between tests?
-        redNodes.clearRegistry();
-        logSpy.restore();
-        context.clean({allNodes:[]});
-        return flows.stopFlows();
-    },
-
-    getNode: function(id) {
-        return flows.get(id);
-    },
-
-    credentials: credentials,
-
-    clearFlows: function() {
-        return flows.stopFlows();
-    },
-
-    request: function() {
-        return request(RED.httpAdmin);
-    },
-
-    startServer: function(done) {
-        server = stoppable(http.createServer(function(req,res) { app(req,res); }), 0);
-        RED.init(server, {
-            SKIP_BUILD_CHECK: true,
-            logging:{console:{level:'off'}}
-        });
-        server.listen(listenPort, address);
-        server.on('listening', function() {
-            port = server.address().port;
-            url = 'http://' + address + ':' + port;
-            comms.start();
-            done();
-        });
-    },
-
-    //TODO consider saving TCP handshake/server reinit on start/stop/start sequences
-    stopServer: function(done) {
-        if (server) {
-            try {
-                comms.stop();
-                server.stop(done);
-            } catch(e) {
-                done();
-            }
-        } else {
-            done();
-        }
-    },
-
-    url: function() { return url; },
-
-    nock: nock,
-
-    log: function() { return logSpy;}
-};