Fixup all the tests

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

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

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

@@ -15,8 +15,8 @@
  **/
 
 var should = require("should");
-var injectNode = require("../../../../nodes/core/core/20-inject.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var injectNode = require("nr-test-utils").require("@node-red/nodes/core/core/20-inject.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
 describe('inject node', function() {

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

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

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

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

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

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var debugNode = require("../../../../nodes/core/core/58-debug.js");
+var debugNode = require("nr-test-utils").require("@node-red/nodes/core/core/58-debug.js");
 var helper = require("node-red-node-test-helper");
 var WebSocket = require('ws');
 

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

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

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

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

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

@@ -15,8 +15,8 @@
 **/
 
 var should = require("should");
-var functionNode = require("../../../../nodes/core/core/80-function.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
 describe('function node', function() {

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

@@ -15,8 +15,8 @@
  **/
 
 var should = require("should");
-var templateNode = require("../../../../nodes/core/core/80-template.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var templateNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-template.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
 describe('template node', function() {

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

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

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

@@ -17,9 +17,9 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var triggerNode = require("../../../../nodes/core/core/89-trigger.js");
-var Context = require("../../../../red/runtime/nodes/context");
-var RED = require("../../../../red/red.js");
+var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-trigger.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
+var RED = require("nr-test-utils").require("node-red/lib/red");
 
 describe('trigger node', function() {
 
@@ -157,7 +157,7 @@ describe('trigger node', function() {
             });
         });
     }
-    
+
     basicTest("num", 10);
     basicTest("str", "10");
     basicTest("bool", true);
@@ -166,7 +166,7 @@ describe('trigger node', function() {
     var val_buf = "[1,2,3,4,5]";
     basicTest("bin", val_buf, Buffer.from(JSON.parse(val_buf)));
     basicTest("env", "NR-TEST", "env-val");
-    
+
     it('should output 1 then 0 when triggered (default)', function(done) {
         var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", duration:"20", wires:[["n2"]] },
             {id:"n2", type:"helper"} ];

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

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

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

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

test/nodes/core/hardware/36-rpi-gpio_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var rpi = require("../../../../nodes/core/hardware/36-rpi-gpio.js");
+var rpi = require("nr-test-utils").require("@node-red/nodes/core/hardware/36-rpi-gpio.js");
 var helper = require("node-red-node-test-helper");
 var fs = require("fs");
 

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

@@ -22,12 +22,12 @@ var express = require("express");
 var bodyParser = require('body-parser');
 var stoppable = require('stoppable');
 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 httpRequestNode = require("nr-test-utils").require("@node-red/nodes/core/io/21-httprequest.js");
+var tlsNode = require("nr-test-utils").require("@node-red/nodes/core/io/05-tls.js");
 var hashSum = require("hash-sum");
 var httpProxy = require('http-proxy');
 var cookieParser = require('cookie-parser');
-var RED = require("../../../../red/red.js");
+var RED = require("nr-test-utils").require("node-red/lib/red");
 var fs = require('fs-extra');
 var auth = require('basic-auth');
 

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

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

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

@@ -18,7 +18,7 @@ var fs = require("fs-extra");
 var path = require("path");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var watchNode = require("../../../../nodes/core/io/23-watch.js");
+var watchNode = require("nr-test-utils").require("@node-red/nodes/core/io/23-watch.js");
 
 
 describe('watch Node', function() {

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

@@ -19,7 +19,7 @@ var should = require("should");
 var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
 
-var tcpinNode = require("../../../../nodes/core/io/31-tcpin.js");
+var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/io/31-tcpin.js");
 
 
 describe('TCP in Node', function() {

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

@@ -18,8 +18,8 @@ var net = require("net");
 var should = require("should");
 var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
-var tcpinNode = require("../../../../nodes/core/io/31-tcpin.js");
-const RED = require("../../../../red/red.js");
+var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/io/31-tcpin.js");
+var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
 
 describe('TCP Request Node', function() {

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

@@ -17,7 +17,7 @@
 var dgram = require("dgram");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var udpNode = require("../../../../nodes/core/io/32-udp.js");
+var udpNode = require("nr-test-utils").require("@node-red/nodes/core/io/32-udp.js");
 
 
 describe('UDP in Node', function() {

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

@@ -17,7 +17,7 @@
 var dgram = require("dgram");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var udpNode = require("../../../../nodes/core/io/32-udp.js");
+var udpNode = require("nr-test-utils").require("@node-red/nodes/core/io/32-udp.js");
 
 
 describe('UDP out Node', function() {

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

@@ -16,10 +16,10 @@
 
 var should = require("should");
 
-var switchNode = require("../../../../nodes/core/logic/10-switch.js");
+var switchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/10-switch.js");
 var helper = require("node-red-node-test-helper");
-var RED = require("../../../../red/red.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var RED = require("nr-test-utils").require("node-red/lib/red");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context/");
 
 describe('switch Node', function() {
 

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

@@ -17,8 +17,8 @@
 var should = require("should");
 var sinon = require("sinon");
 
-var changeNode = require("../../../../nodes/core/logic/15-change.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var changeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/15-change.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
 describe('change Node', function() {
@@ -569,19 +569,14 @@ describe('change Node', function() {
             helper.load(changeNode, flow, function() {
                 var changeNode1 = helper.getNode("changeNode1");
                 var helperNode1 = helper.getNode("helperNode1");
-                sinon.spy(changeNode1,"error");
                 helperNode1.on("input", function(msg) {
                     done("Invalid jsonata expression passed message through");
                 });
+                changeNode1.on("call:error", function(err) {
+                    // Expect error to be called
+                    done();
+                });
                 changeNode1.receive({payload:"Hello World!"});
-                setTimeout(function() {
-                    try {
-                        changeNode1.error.called.should.be.true();
-                        done();
-                    } catch(err) {
-                        done(err);
-                    }
-                },50);
             });
         });
 

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

@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var rangeNode = require("../../../../nodes/core/logic/16-range.js");
+var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/16-range.js");
 var helper = require("node-red-node-test-helper");
 
 describe('range Node', function() {
@@ -131,9 +131,8 @@ describe('range Node', function() {
         helper.load(rangeNode, flow, function() {
             var rangeNode1 = helper.getNode("rangeNode1");
             var helperNode1 = helper.getNode("helperNode1");
-
-            var sinon = require('sinon');
-            sinon.stub(rangeNode1, 'log', function(log) {
+            rangeNode1.on("call:log",function(args) {
+                var log = args.args[0];
                 if (log.indexOf("notnumber") > -1) {
                     rangeNode1.log.restore();
                     done();

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

@@ -15,11 +15,11 @@
  **/
 
 var should = require("should");
-var splitNode = require("../../../../nodes/core/logic/17-split.js");
-var joinNode = require("../../../../nodes/core/logic/17-split.js");
+var splitNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
+var joinNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
 var helper = require("node-red-node-test-helper");
-var RED = require("../../../../red/red.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var RED = require("nr-test-utils").require("node-red/lib/red.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 
 var TimeoutForErrorCase = 20;
 

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

@@ -15,10 +15,10 @@
  **/
 
 var should = require("should");
-var sortNode = require("../../../../nodes/core/logic/18-sort.js");
+var sortNode = require("nr-test-utils").require("@node-red/nodes/core/logic/18-sort.js");
 var helper = require("node-red-node-test-helper");
-var RED = require("../../../../red/red.js");
-var Context = require("../../../../red/runtime/nodes/context");
+var RED = require("nr-test-utils").require("node-red/lib/red.js");
+var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 
 describe('SORT node', function() {
 

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

@@ -15,9 +15,9 @@
  **/
 
 var should = require("should");
-var batchNode = require("../../../../nodes/core/logic/19-batch.js");
+var batchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/19-batch.js");
 var helper = require("node-red-node-test-helper");
-var RED = require("../../../../red/red.js");
+var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
 describe('BATCH node', function() {
     this.timeout(8000);

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

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

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

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

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

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

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

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

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

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

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

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

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

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