Merge master

This commit is contained in:
Nick O'Leary
2018-05-08 23:27:27 +01:00
35 changed files with 39 additions and 206 deletions

View File

@@ -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");

View File

@@ -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 = [];

View File

@@ -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");

View File

@@ -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() {

View File

@@ -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"}];

View File

@@ -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");

View File

@@ -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");