From 38a1291c5ba0bdb3e7de08b3c70ff77c86e3d23e Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 20 Aug 2018 16:17:24 +0100 Subject: [PATCH] Fixup all the tests --- Gruntfile.js | 6 ++-- package.json | 6 ++-- .../@node-red/editor-api/lib/editor/ui.js | 5 +-- packages/node_modules/node-red/package.json | 2 +- test/node_modules/nr-test-utils/index.js | 31 +++++++++++++++++++ test/node_modules/nr-test-utils/package.json | 6 ++++ test/nodes/core/analysis/72-sentiment_spec.js | 2 +- test/nodes/core/core/20-inject_spec.js | 4 +-- test/nodes/core/core/25-catch_spec.js | 2 +- test/nodes/core/core/25-status_spec.js | 2 +- test/nodes/core/core/58-debug_spec.js | 2 +- test/nodes/core/core/60-link_spec.js | 2 +- test/nodes/core/core/75-exec_spec.js | 2 +- test/nodes/core/core/80-function_spec.js | 4 +-- test/nodes/core/core/80-template_spec.js | 4 +-- test/nodes/core/core/89-delay_spec.js | 2 +- test/nodes/core/core/89-trigger_spec.js | 10 +++--- test/nodes/core/core/90-comment_spec.js | 2 +- test/nodes/core/core/98-unknown_spec.js | 2 +- test/nodes/core/hardware/36-rpi-gpio_spec.js | 2 +- test/nodes/core/io/21-httprequest_spec.js | 6 ++-- test/nodes/core/io/22-websocket_spec.js | 2 +- test/nodes/core/io/23-watch_spec.js | 2 +- test/nodes/core/io/31-tcpin_spec.js | 2 +- test/nodes/core/io/31-tcprequest_spec.js | 4 +-- test/nodes/core/io/32-udpin_spec.js | 2 +- test/nodes/core/io/32-udpout_spec.js | 2 +- test/nodes/core/logic/10-switch_spec.js | 6 ++-- test/nodes/core/logic/15-change_spec.js | 17 ++++------ test/nodes/core/logic/16-range_spec.js | 7 ++--- test/nodes/core/logic/17-split_spec.js | 8 ++--- test/nodes/core/logic/18-sort_spec.js | 6 ++-- test/nodes/core/logic/19-batch_spec.js | 4 +-- test/nodes/core/parsers/70-CSV_spec.js | 2 +- test/nodes/core/parsers/70-HTML_spec.js | 2 +- test/nodes/core/parsers/70-JSON_spec.js | 2 +- test/nodes/core/parsers/70-XML_spec.js | 2 +- test/nodes/core/parsers/70-YAML_spec.js | 2 +- test/nodes/core/storage/28-tail_spec.js | 2 +- test/nodes/core/storage/50-file_spec.js | 2 +- .../editor-api/lib/admin/context_spec.js | 8 +++-- .../editor-api/lib/admin/flow_spec.js | 4 ++- .../editor-api/lib/admin/flows_spec.js | 4 ++- .../editor-api/lib/admin/index_spec.js | 12 ++++--- .../editor-api/lib/admin/nodes_spec.js | 6 ++-- .../editor-api/lib/auth/clients_spec.js | 3 +- .../editor-api/lib/auth/index_spec.js | 10 +++--- .../editor-api/lib/auth/permissions_spec.js | 5 ++- .../editor-api/lib/auth/strategies_spec.js | 10 +++--- .../editor-api/lib/auth/tokens_spec.js | 4 ++- .../editor-api/lib/auth/users_spec.js | 4 ++- .../editor-api/lib/editor/comms_spec.js | 8 +++-- .../editor-api/lib/editor/credentials_spec.js | 4 ++- .../editor-api/lib/editor/index_spec.js | 28 ++++++++++------- .../editor-api/lib/editor/library_spec.js | 6 ++-- .../editor-api/lib/editor/locales_spec.js | 6 ++-- .../editor-api/lib/editor/projects_spec.js | 2 ++ .../editor-api/lib/editor/settings_spec.js | 7 +++-- .../editor-api/lib/editor/sshkeys_spec.js | 3 +- .../editor-api/lib/editor/theme_spec.js | 4 ++- .../editor-api/lib/editor/ui_spec.js | 8 +++-- .../@node-red/editor-api/lib/index_spec.js | 11 ++++--- .../@node-red/editor-api/lib/util_spec.js | 8 ++--- .../@node-red/registry/lib/deprecated_spec.js | 4 ++- .../unit/@node-red/registry/lib/index_spec.js | 10 +++--- .../@node-red/registry/lib/installer_spec.js | 10 ++++-- .../@node-red/registry/lib/library_spec.js | 4 ++- .../@node-red/registry/lib/loader_spec.js | 10 +++--- .../registry/lib/localfilesystem_spec.js | 29 +++++++++-------- .../@node-red/registry/lib/registry_spec.js | 13 ++++---- .../@node-red/runtime/lib/api/comms_spec.js | 3 +- .../@node-red/runtime/lib/api/context_spec.js | 2 ++ .../@node-red/runtime/lib/api/flows_spec.js | 3 +- .../@node-red/runtime/lib/api/index_spec.js | 7 +++-- .../@node-red/runtime/lib/api/library_spec.js | 3 +- .../@node-red/runtime/lib/api/nodes_spec.js | 3 +- .../runtime/lib/api/projects_spec.js | 3 +- .../runtime/lib/api/settings_spec.js | 3 +- .../unit/@node-red/runtime/lib/events_spec.js | 4 ++- test/unit/@node-red/runtime/lib/index_spec.js | 21 ++++++++----- .../runtime/lib/library/index_spec.js | 3 +- .../@node-red/runtime/lib/nodes/Node_spec.js | 7 +++-- .../runtime/lib/nodes/context/index_spec.js | 3 +- .../lib/nodes/context/localfilesystem_spec.js | 3 +- .../runtime/lib/nodes/context/memory_spec.js | 4 ++- .../runtime/lib/nodes/credentials_spec.js | 7 +++-- .../runtime/lib/nodes/flows/Flow_spec.js | 12 ++++--- .../runtime/lib/nodes/flows/index_spec.js | 16 +++++----- .../runtime/lib/nodes/flows/util_spec.js | 7 +++-- .../@node-red/runtime/lib/nodes/index_spec.js | 21 +++++++------ .../@node-red/runtime/lib/settings_spec.js | 3 +- .../runtime/lib/storage/index_spec.js | 5 ++- .../lib/storage/localfilesystem/index_spec.js | 5 +-- .../storage/localfilesystem/library_spec.js | 3 +- .../localfilesystem/projects/Project_spec.js | 2 ++ .../projects/defaultFileSet_spec.js | 3 +- .../projects/git/authCache_spec.js | 3 +- .../projects/git/authServer_spec.js | 4 ++- .../projects/git/authWriter_spec.js | 4 ++- .../projects/git/index_spec.js | 2 ++ .../localfilesystem/projects/index_spec.js | 2 ++ .../projects/ssh/index_spec.js | 3 +- .../projects/ssh/keygen_spec.js | 3 +- .../storage/localfilesystem/sessions_spec.js | 3 +- .../storage/localfilesystem/settings_spec.js | 4 ++- .../lib/storage/localfilesystem/util_spec.js | 3 +- test/unit/@node-red/util/index_spec.js | 21 +++++++++++++ test/unit/@node-red/util/lib/i18n_spec.js | 12 ++++--- test/unit/@node-red/util/lib/index_spec.js | 2 +- test/unit/@node-red/util/lib/log_spec.js | 8 +++-- test/unit/@node-red/util/lib/util_spec.js | 7 +++-- test/unit/node-red/lib/red_spec.js | 25 +++++++++------ test/unit/node-red/red_spec.js | 21 +++++++++++++ 113 files changed, 458 insertions(+), 250 deletions(-) create mode 100644 test/node_modules/nr-test-utils/index.js create mode 100644 test/node_modules/nr-test-utils/package.json create mode 100644 test/unit/@node-red/util/index_spec.js create mode 100644 test/unit/node-red/red_spec.js diff --git a/Gruntfile.js b/Gruntfile.js index 01e3c703e..065dc7236 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -42,7 +42,7 @@ module.exports = function(grunt) { reporter: 'spec' }, all: { src: ['test/**/*_spec.js'] }, - core: { src: ["test/_spec.js","test/red/**/*_spec.js"]}, + core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]}, nodes: { src: ["test/nodes/**/*_spec.js"]} }, webdriver: { @@ -59,8 +59,8 @@ module.exports = function(grunt) { reportFormats: ['lcov','html'], print: 'both' }, - all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] }, - core: { src: ["test/_spec.js","test/red/**/*_spec.js"]}, + all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] }, + core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]}, nodes: { src: ["test/nodes/**/*_spec.js"]} }, jshint: { diff --git a/package.json b/package.json index df948eff8..721e9c7ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red", - "version": "0.19.1", + "version": "0.20.0", "description": "A visual tool for wiring the Internet of Things", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -116,9 +116,9 @@ "wdio-mocha-framework": "^0.6.2", "wdio-spec-reporter": "^0.1.5", "webdriverio": "^4.13.1", - "node-red-node-test-helper": "^0.1.7" + "node-red-node-test-helper": "node-red/node-red-node-test-helper" }, "engines": { - "node": ">=4" + "node": ">=8" } } diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/ui.js b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js index 01d8aa0b1..351c2e541 100644 --- a/packages/node_modules/@node-red/editor-api/lib/editor/ui.js +++ b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js @@ -26,12 +26,13 @@ var theme = require("./theme"); var runtimeAPI; var editorClientDir = path.dirname(require.resolve("@node-red/editor-client")); var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.png"); -var editorTemplate = path.join(editorClientDir,"src","templates","index.mst"); +var editorTemplatePath = path.join(editorClientDir,"src","templates","index.mst"); +var editorTemplate; module.exports = { init: function(_runtimeAPI) { runtimeAPI = _runtimeAPI; - editorTemplate = fs.readFileSync(editorTemplate,"utf8"); + editorTemplate = fs.readFileSync(editorTemplatePath,"utf8"); Mustache.parse(editorTemplate); }, diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index a60542775..5e2cf942d 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -8,7 +8,7 @@ "type": "git", "url": "https://github.com/node-red/node-red.git" }, - "main": "red/red.js", + "main": "lib/red.js", "scripts": { "start": "node red.js" }, diff --git a/test/node_modules/nr-test-utils/index.js b/test/node_modules/nr-test-utils/index.js new file mode 100644 index 000000000..56bc369e6 --- /dev/null +++ b/test/node_modules/nr-test-utils/index.js @@ -0,0 +1,31 @@ +/** + * 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. + **/ + + +const path = require("path"); +const fs = require("fs"); + +const PACKAGE_ROOT = "../../../packages/node_modules"; + +module.exports = { + require: function(file) { + // console.log(path.join(__dirname,PACKAGE_ROOT,file)) + return require(path.join(PACKAGE_ROOT,file)); + }, + resolve: function(file) { + return path.resolve(path.join(__dirname,PACKAGE_ROOT,file)); + } +} diff --git a/test/node_modules/nr-test-utils/package.json b/test/node_modules/nr-test-utils/package.json new file mode 100644 index 000000000..ee32d2320 --- /dev/null +++ b/test/node_modules/nr-test-utils/package.json @@ -0,0 +1,6 @@ +{ + "name": "nr-test-utils", + "version": "0.20.0", + "license": "Apache-2.0", + "private": true +} diff --git a/test/nodes/core/analysis/72-sentiment_spec.js b/test/nodes/core/analysis/72-sentiment_spec.js index d2272f7b3..1cab6bf16 100644 --- a/test/nodes/core/analysis/72-sentiment_spec.js +++ b/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() { diff --git a/test/nodes/core/core/20-inject_spec.js b/test/nodes/core/core/20-inject_spec.js index 5242b793c..fa398ee23 100644 --- a/test/nodes/core/core/20-inject_spec.js +++ b/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() { diff --git a/test/nodes/core/core/25-catch_spec.js b/test/nodes/core/core/25-catch_spec.js index 6caf72259..5ab913cb3 100644 --- a/test/nodes/core/core/25-catch_spec.js +++ b/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() { diff --git a/test/nodes/core/core/25-status_spec.js b/test/nodes/core/core/25-status_spec.js index 0bf38edb2..33689248d 100644 --- a/test/nodes/core/core/25-status_spec.js +++ b/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() { diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/core/58-debug_spec.js index 629506271..e9dbd9de1 100644 --- a/test/nodes/core/core/58-debug_spec.js +++ b/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'); diff --git a/test/nodes/core/core/60-link_spec.js b/test/nodes/core/core/60-link_spec.js index ef275c4dc..b52dee470 100644 --- a/test/nodes/core/core/60-link_spec.js +++ b/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() { diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/core/75-exec_spec.js index 8a4ca332a..113e84292 100644 --- a/test/nodes/core/core/75-exec_spec.js +++ b/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'); diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js index fd8f816f3..6ee732ee6 100644 --- a/test/nodes/core/core/80-function_spec.js +++ b/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() { diff --git a/test/nodes/core/core/80-template_spec.js b/test/nodes/core/core/80-template_spec.js index acbfa093f..5c89d73a8 100644 --- a/test/nodes/core/core/80-template_spec.js +++ b/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() { diff --git a/test/nodes/core/core/89-delay_spec.js b/test/nodes/core/core/89-delay_spec.js index 1f6489484..d678bf1c6 100644 --- a/test/nodes/core/core/89-delay_spec.js +++ b/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; diff --git a/test/nodes/core/core/89-trigger_spec.js b/test/nodes/core/core/89-trigger_spec.js index 5055518fa..715d1914d 100644 --- a/test/nodes/core/core/89-trigger_spec.js +++ b/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"} ]; diff --git a/test/nodes/core/core/90-comment_spec.js b/test/nodes/core/core/90-comment_spec.js index f5d2c5f3d..d8740970c 100644 --- a/test/nodes/core/core/90-comment_spec.js +++ b/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() { diff --git a/test/nodes/core/core/98-unknown_spec.js b/test/nodes/core/core/98-unknown_spec.js index c544d1c08..04ca621f3 100644 --- a/test/nodes/core/core/98-unknown_spec.js +++ b/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() { diff --git a/test/nodes/core/hardware/36-rpi-gpio_spec.js b/test/nodes/core/hardware/36-rpi-gpio_spec.js index c11ea254c..9de6dca5a 100644 --- a/test/nodes/core/hardware/36-rpi-gpio_spec.js +++ b/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"); diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index 8ca5f0a14..5102bdbe6 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/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'); diff --git a/test/nodes/core/io/22-websocket_spec.js b/test/nodes/core/io/22-websocket_spec.js index b94aaa9af..72ff30765 100644 --- a/test/nodes/core/io/22-websocket_spec.js +++ b/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 = []; diff --git a/test/nodes/core/io/23-watch_spec.js b/test/nodes/core/io/23-watch_spec.js index 8f6506c57..87d68f0b8 100644 --- a/test/nodes/core/io/23-watch_spec.js +++ b/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() { diff --git a/test/nodes/core/io/31-tcpin_spec.js b/test/nodes/core/io/31-tcpin_spec.js index 4e92cc12e..a8683f260 100644 --- a/test/nodes/core/io/31-tcpin_spec.js +++ b/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() { diff --git a/test/nodes/core/io/31-tcprequest_spec.js b/test/nodes/core/io/31-tcprequest_spec.js index 3cc0e1224..58c090522 100644 --- a/test/nodes/core/io/31-tcprequest_spec.js +++ b/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() { diff --git a/test/nodes/core/io/32-udpin_spec.js b/test/nodes/core/io/32-udpin_spec.js index c767af5e6..72b43992e 100644 --- a/test/nodes/core/io/32-udpin_spec.js +++ b/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() { diff --git a/test/nodes/core/io/32-udpout_spec.js b/test/nodes/core/io/32-udpout_spec.js index fdeb032b6..f13297896 100644 --- a/test/nodes/core/io/32-udpout_spec.js +++ b/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() { diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/logic/10-switch_spec.js index f33ecb431..b33f436fc 100644 --- a/test/nodes/core/logic/10-switch_spec.js +++ b/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() { diff --git a/test/nodes/core/logic/15-change_spec.js b/test/nodes/core/logic/15-change_spec.js index eda82a685..a838ca4a6 100644 --- a/test/nodes/core/logic/15-change_spec.js +++ b/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); }); }); diff --git a/test/nodes/core/logic/16-range_spec.js b/test/nodes/core/logic/16-range_spec.js index 79ca7ea45..ddf34be8f 100644 --- a/test/nodes/core/logic/16-range_spec.js +++ b/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(); diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/logic/17-split_spec.js index bafdb0281..00598c833 100644 --- a/test/nodes/core/logic/17-split_spec.js +++ b/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; diff --git a/test/nodes/core/logic/18-sort_spec.js b/test/nodes/core/logic/18-sort_spec.js index 993cec8d2..909fec260 100644 --- a/test/nodes/core/logic/18-sort_spec.js +++ b/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() { diff --git a/test/nodes/core/logic/19-batch_spec.js b/test/nodes/core/logic/19-batch_spec.js index efe2d9312..e62f3bf6f 100644 --- a/test/nodes/core/logic/19-batch_spec.js +++ b/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); diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js index 6b12b4585..1eef98dcb 100644 --- a/test/nodes/core/parsers/70-CSV_spec.js +++ b/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() { diff --git a/test/nodes/core/parsers/70-HTML_spec.js b/test/nodes/core/parsers/70-HTML_spec.js index 94eb0c7f4..e7e7ffa8b 100644 --- a/test/nodes/core/parsers/70-HTML_spec.js +++ b/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() { diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index ba913b1e7..6795e1879 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/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() { diff --git a/test/nodes/core/parsers/70-XML_spec.js b/test/nodes/core/parsers/70-XML_spec.js index c45c896a8..e8b281855 100644 --- a/test/nodes/core/parsers/70-XML_spec.js +++ b/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() { diff --git a/test/nodes/core/parsers/70-YAML_spec.js b/test/nodes/core/parsers/70-YAML_spec.js index eacdfe082..bb988fb04 100644 --- a/test/nodes/core/parsers/70-YAML_spec.js +++ b/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() { diff --git a/test/nodes/core/storage/28-tail_spec.js b/test/nodes/core/storage/28-tail_spec.js index e3961ebfb..8c15efda5 100644 --- a/test/nodes/core/storage/28-tail_spec.js +++ b/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() { diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js index e61c3fb68..da1d97468 100644 --- a/test/nodes/core/storage/50-file_spec.js +++ b/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() { diff --git a/test/unit/@node-red/editor-api/lib/admin/context_spec.js b/test/unit/@node-red/editor-api/lib/admin/context_spec.js index 00a2290f7..979c3e6eb 100644 --- a/test/unit/@node-red/editor-api/lib/admin/context_spec.js +++ b/test/unit/@node-red/editor-api/lib/admin/context_spec.js @@ -21,9 +21,11 @@ var bodyParser = require('body-parser'); var sinon = require('sinon'); var when = require('when'); -var context = require("../../../../red/api/admin/context"); -var Context = require("../../../../red/runtime/nodes/context"); -var Util = require("../../../../red/runtime/util"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var context = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/context"); +// var Context = require("../../../../red/runtime/nodes/context"); +// var Util = require("../../../../red/runtime/util"); describe("api/admin/context", function() { it.skip("NEEDS TESTS WRITING",function() {}); diff --git a/test/unit/@node-red/editor-api/lib/admin/flow_spec.js b/test/unit/@node-red/editor-api/lib/admin/flow_spec.js index 1f7f9e5e4..278c6a3f3 100644 --- a/test/unit/@node-red/editor-api/lib/admin/flow_spec.js +++ b/test/unit/@node-red/editor-api/lib/admin/flow_spec.js @@ -21,7 +21,9 @@ var bodyParser = require('body-parser'); var sinon = require('sinon'); var when = require('when'); -var flow = require("../../../../red/api/admin/flow"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var flow = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/flow"); describe("api/admin/flow", function() { diff --git a/test/unit/@node-red/editor-api/lib/admin/flows_spec.js b/test/unit/@node-red/editor-api/lib/admin/flows_spec.js index e55b38933..ac295a194 100644 --- a/test/unit/@node-red/editor-api/lib/admin/flows_spec.js +++ b/test/unit/@node-red/editor-api/lib/admin/flows_spec.js @@ -20,7 +20,9 @@ var express = require('express'); var bodyParser = require('body-parser'); var sinon = require('sinon'); -var flows = require("../../../../red/api/admin/flows"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var flows = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/flows"); describe("api/admin/flows", function() { diff --git a/test/unit/@node-red/editor-api/lib/admin/index_spec.js b/test/unit/@node-red/editor-api/lib/admin/index_spec.js index 9827cd669..c20df8d1b 100644 --- a/test/unit/@node-red/editor-api/lib/admin/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/admin/index_spec.js @@ -18,12 +18,14 @@ var should = require("should"); var sinon = require("sinon"); var request = require("supertest"); var express = require("express"); -var adminApi = require("../../../../red/api/admin"); -var auth = require("../../../../red/api/auth"); -var nodes = require("../../../../red/api/admin/nodes"); -var flows = require("../../../../red/api/admin/flows"); -var flow = require("../../../../red/api/admin/flow"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var adminApi = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin"); +var auth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth"); +var nodes = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/nodes"); +var flows = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/flows"); +var flow = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/flow"); /** * Ensure all API routes are correctly mounted, with the expected permissions checks diff --git a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js index 5a757ab06..6fbbeff67 100644 --- a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js +++ b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js @@ -21,8 +21,10 @@ var bodyParser = require('body-parser'); var sinon = require('sinon'); var when = require('when'); -var nodes = require("../../../../red/api/admin/nodes"); -var apiUtil = require("../../../../red/api/util"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var nodes = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/nodes"); +var apiUtil = NR_TEST_UTILS.require("@node-red/editor-api/lib/util"); describe("api/admin/nodes", function() { diff --git a/test/unit/@node-red/editor-api/lib/auth/clients_spec.js b/test/unit/@node-red/editor-api/lib/auth/clients_spec.js index 9aafc716b..1f6263d00 100644 --- a/test/unit/@node-red/editor-api/lib/auth/clients_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/clients_spec.js @@ -15,7 +15,8 @@ **/ var should = require("should"); -var Clients = require("../../../../red/api/auth/clients"); +var NR_TEST_UTILS = require("nr-test-utils"); +var Clients = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/clients"); describe("api/auth/clients", function() { it('finds the known editor client',function(done) { diff --git a/test/unit/@node-red/editor-api/lib/auth/index_spec.js b/test/unit/@node-red/editor-api/lib/auth/index_spec.js index ef01d2391..3cf0111d6 100644 --- a/test/unit/@node-red/editor-api/lib/auth/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/index_spec.js @@ -20,10 +20,12 @@ var sinon = require("sinon"); var passport = require("passport"); -var auth = require("../../../../red/api/auth"); -var Users = require("../../../../red/api/auth/users"); -var Tokens = require("../../../../red/api/auth/tokens"); -var Permissions = require("../../../../red/api/auth/permissions"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var auth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth"); +var Users = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/users"); +var Tokens = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/tokens"); +var Permissions = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/permissions"); describe("api/auth/index",function() { diff --git a/test/unit/@node-red/editor-api/lib/auth/permissions_spec.js b/test/unit/@node-red/editor-api/lib/auth/permissions_spec.js index 52960096f..50c249c34 100644 --- a/test/unit/@node-red/editor-api/lib/auth/permissions_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/permissions_spec.js @@ -15,7 +15,10 @@ **/ var should = require("should"); -var permissions = require("../../../../red/api/auth/permissions"); + +var NR_TEST_UTILS = require("nr-test-utils"); + +var permissions = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/permissions"); describe("api/auth/permissions", function() { describe("hasPermission", function() { diff --git a/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js b/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js index 5f3e88471..d30f6198a 100644 --- a/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js @@ -18,10 +18,12 @@ var should = require("should"); var when = require('when'); var sinon = require('sinon'); -var strategies = require("../../../../red/api/auth/strategies"); -var Users = require("../../../../red/api/auth/users"); -var Tokens = require("../../../../red/api/auth/tokens"); -var Clients = require("../../../../red/api/auth/clients"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var strategies = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/strategies"); +var Users = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/users"); +var Tokens = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/tokens"); +var Clients = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/clients"); describe("api/auth/strategies", function() { describe("Password Token Exchange", function() { diff --git a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js index a9c5a7831..be6165b2e 100644 --- a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js @@ -18,7 +18,9 @@ var should = require("should"); var when = require("when"); var sinon = require("sinon"); -var Tokens = require("../../../../red/api/auth/tokens"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var Tokens = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/tokens"); describe("api/auth/tokens", function() { diff --git a/test/unit/@node-red/editor-api/lib/auth/users_spec.js b/test/unit/@node-red/editor-api/lib/auth/users_spec.js index 954e719b7..515d23034 100644 --- a/test/unit/@node-red/editor-api/lib/auth/users_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/users_spec.js @@ -18,7 +18,9 @@ var should = require("should"); var when = require('when'); var sinon = require('sinon'); -var Users = require("../../../../red/api/auth/users"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var Users = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/users"); describe("api/auth/users", function() { after(function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/comms_spec.js b/test/unit/@node-red/editor-api/lib/editor/comms_spec.js index eb9f6582c..72378508b 100644 --- a/test/unit/@node-red/editor-api/lib/editor/comms_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/comms_spec.js @@ -24,9 +24,11 @@ var express = require('express'); var app = express(); var WebSocket = require('ws'); -var comms = require("../../../../red/api/editor/comms"); -var Users = require("../../../../red/api/auth/users"); -var Tokens = require("../../../../red/api/auth/tokens"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var comms = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/comms"); +var Users = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/users"); +var Tokens = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth/tokens"); var address = '127.0.0.1'; var listenPort = 0; // use ephemeral port diff --git a/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js b/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js index 69365be6d..bc9926334 100644 --- a/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js @@ -20,7 +20,9 @@ var express = require('express'); var sinon = require('sinon'); var when = require('when'); -var credentials = require("../../../../red/api/editor/credentials"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var credentials = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/credentials"); describe('api/editor/credentials', function() { var app; diff --git a/test/unit/@node-red/editor-api/lib/editor/index_spec.js b/test/unit/@node-red/editor-api/lib/editor/index_spec.js index 7e84395f5..2649d5b56 100644 --- a/test/unit/@node-red/editor-api/lib/editor/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/index_spec.js @@ -18,12 +18,15 @@ var should = require("should"); var sinon = require("sinon"); var request = require("supertest"); var express = require("express"); -var editorApi = require("../../../../red/api/editor"); -var comms = require("../../../../red/api/editor/comms"); -var info = require("../../../../red/api/editor/settings"); -var auth = require("../../../../red/api/auth"); -var log = require("../../../../red/util/log"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var editorApi = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor"); +var comms = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/comms"); +var info = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/settings"); +var auth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth"); + +var log = NR_TEST_UTILS.require("@node-red/util").log; var when = require("when"); @@ -59,15 +62,15 @@ describe("api/editor/index", function() { return function(req,res,next) { next(); } }); mockList.forEach(function(m) { - sinon.stub(require("../../../../red/api/editor/"+m),"init",function(){}); + sinon.stub(NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/"+m),"init",function(){}); }); - sinon.stub(require("../../../../red/api/editor/theme"),"app",function(){ return express()}); + sinon.stub(NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme"),"app",function(){ return express()}); }); after(function() { mockList.forEach(function(m) { - require("../../../../red/api/editor/"+m).init.restore(); + NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/"+m).init.restore(); }) - require("../../../../red/api/editor/theme").app.restore(); + NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme").app.restore(); auth.needsPermission.restore(); log.error.restore(); }); @@ -93,9 +96,12 @@ describe("api/editor/index", function() { }); it('serves icons', function(done) { request(app) - .get("/icons/inject.png") + .get("/red/images/icons/node-changed.png") + .expect(200) .expect("Content-Type", /image\/png/) - .expect(200,done) + .end(function(err,res) { + done(err); + }); }); it('handles page not there', function(done) { request(app) diff --git a/test/unit/@node-red/editor-api/lib/editor/library_spec.js b/test/unit/@node-red/editor-api/lib/editor/library_spec.js index ef4590b69..891305199 100644 --- a/test/unit/@node-red/editor-api/lib/editor/library_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/library_spec.js @@ -20,9 +20,11 @@ var request = require('supertest'); var express = require('express'); var bodyParser = require('body-parser'); -var app; +var NR_TEST_UTILS = require("nr-test-utils"); -var library = require("../../../../red/api/editor/library"); +var library = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/library"); + +var app; describe("api/editor/library", function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js index fe0b8e65a..d9cb1c600 100644 --- a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js @@ -19,8 +19,10 @@ var request = require('supertest'); var express = require('express'); var sinon = require('sinon'); -var locales = require("../../../../red/api/editor/locales"); -var i18n = require("../../../../red/util").i18n; +var NR_TEST_UTILS = require("nr-test-utils"); + +var locales = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/locales"); +var i18n = NR_TEST_UTILS.require("@node-red/util").i18n; describe("api/editor/locales", function() { beforeEach(function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/projects_spec.js b/test/unit/@node-red/editor-api/lib/editor/projects_spec.js index de22781ae..52b88d0b8 100644 --- a/test/unit/@node-red/editor-api/lib/editor/projects_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/projects_spec.js @@ -14,6 +14,8 @@ * limitations under the License. **/ +var NR_TEST_UTILS = require("nr-test-utils"); + describe("api/editor/projects", function() { it.skip("NEEDS TESTS WRITING",function() {}); }); diff --git a/test/unit/@node-red/editor-api/lib/editor/settings_spec.js b/test/unit/@node-red/editor-api/lib/editor/settings_spec.js index 842c2509d..ea3b524cd 100644 --- a/test/unit/@node-red/editor-api/lib/editor/settings_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/settings_spec.js @@ -21,8 +21,11 @@ var bodyParser = require("body-parser"); var sinon = require('sinon'); var app; -var info = require("../../../../red/api/editor/settings"); -var theme = require("../../../../red/api/editor/theme"); + +var NR_TEST_UTILS = require("nr-test-utils"); + +var info = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/settings"); +var theme = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme"); describe("api/editor/settings", function() { before(function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/sshkeys_spec.js b/test/unit/@node-red/editor-api/lib/editor/sshkeys_spec.js index a6ab51f99..68035038c 100644 --- a/test/unit/@node-red/editor-api/lib/editor/sshkeys_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/sshkeys_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require("sinon"); var request = require("supertest"); var express = require("express"); -var sshkeys = require("../../../../red/api/editor/sshkeys"); +var NR_TEST_UTILS = require("nr-test-utils"); +var sshkeys = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/sshkeys"); var bodyParser = require("body-parser"); diff --git a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js index 88d265875..62d2b10fd 100644 --- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js @@ -22,7 +22,9 @@ var fs = require("fs"); var app = express(); -var theme = require("../../../../red/api/editor/theme"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var theme = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme"); describe("api/editor/theme", function() { beforeEach(function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/ui_spec.js b/test/unit/@node-red/editor-api/lib/editor/ui_spec.js index 0704adcd4..9279b0957 100644 --- a/test/unit/@node-red/editor-api/lib/editor/ui_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/ui_spec.js @@ -20,7 +20,9 @@ var express = require("express"); var fs = require("fs"); var path = require("path"); -var ui = require("../../../../red/api/editor/ui"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var ui = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/ui"); describe("api/editor/ui", function() { @@ -31,7 +33,7 @@ describe("api/editor/ui", function() { nodes: { getIcon: function(opts) { return new Promise(function(resolve,reject) { - fs.readFile(path.resolve(__dirname+'/../../../../public/icons/arrow-in.png'), function(err,data) { + fs.readFile(NR_TEST_UTILS.resolve("@node-red/editor-client/src/images/icons/arrow-in.png"), function(err,data) { resolve(data); }) }); @@ -92,7 +94,7 @@ describe("api/editor/ui", function() { } } it('returns the requested icon', function(done) { - var defaultIcon = fs.readFileSync(path.resolve(__dirname+'/../../../../public/icons/arrow-in.png')); + var defaultIcon = fs.readFileSync(NR_TEST_UTILS.resolve("@node-red/editor-client/src/images/icons/arrow-in.png")); request(app) .get("/icons/module/icon.png") .expect("Content-Type", /image\/png/) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index a97ec3843..751457b20 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -21,11 +21,14 @@ var express = require("express"); var when = require("when"); var fs = require("fs"); var path = require("path"); -var api = require("../../../red/api"); -var apiAuth = require("../../../red/api/auth"); -var apiEditor = require("../../../red/api/editor"); -var apiAdmin = require("../../../red/api/admin"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var api = NR_TEST_UTILS.require("@node-red/editor-api"); + +var apiAuth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth"); +var apiEditor = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor"); +var apiAdmin = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin"); describe("api/index", function() { diff --git a/test/unit/@node-red/editor-api/lib/util_spec.js b/test/unit/@node-red/editor-api/lib/util_spec.js index bb6b27521..fb0581505 100644 --- a/test/unit/@node-red/editor-api/lib/util_spec.js +++ b/test/unit/@node-red/editor-api/lib/util_spec.js @@ -19,12 +19,12 @@ var sinon = require("sinon"); var request = require('supertest'); var express = require('express'); -var apiUtil = require("../../../red/api/util"); - -var log = require("../../../red/util").log; // TODO: separate module -var i18n = require("../../../red/util").i18n; // TODO: separate module +var NR_TEST_UTILS = require("nr-test-utils"); +var apiUtil = NR_TEST_UTILS.require("@node-red/editor-api/lib/util"); +var log = NR_TEST_UTILS.require("@node-red/util").log; +var i18n = NR_TEST_UTILS.require("@node-red/util").i18n; describe("api/util", function() { describe("errorHandler", function() { diff --git a/test/unit/@node-red/registry/lib/deprecated_spec.js b/test/unit/@node-red/registry/lib/deprecated_spec.js index 43ceb6d6a..b9c35dd31 100644 --- a/test/unit/@node-red/registry/lib/deprecated_spec.js +++ b/test/unit/@node-red/registry/lib/deprecated_spec.js @@ -16,7 +16,9 @@ var should = require("should"); -var deprecated = require("../../../red/runtime-registry/deprecated.js"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var deprecated = NR_TEST_UTILS.require("@node-red/registry/lib/deprecated.js"); describe('deprecated', function() { it('should return info on a node',function() { diff --git a/test/unit/@node-red/registry/lib/index_spec.js b/test/unit/@node-red/registry/lib/index_spec.js index 14d8772c2..753486e9f 100644 --- a/test/unit/@node-red/registry/lib/index_spec.js +++ b/test/unit/@node-red/registry/lib/index_spec.js @@ -20,11 +20,13 @@ var path = require("path"); var when = require("when"); var fs = require("fs"); -var registry = require("../../../red/runtime-registry"); +var NR_TEST_UTILS = require("nr-test-utils"); -var installer = require("../../../red/runtime-registry/installer"); -var loader = require("../../../red/runtime-registry/loader"); -var typeRegistry = require("../../../red/runtime-registry/registry"); +var registry = NR_TEST_UTILS.require("@node-red/registry"); + +var installer = NR_TEST_UTILS.require("@node-red/registry/lib/installer"); +var loader = NR_TEST_UTILS.require("@node-red/registry/lib/loader"); +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry/lib/registry"); describe('red/registry/index', function() { var stubs = []; diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js index 2f1442e8d..65747d185 100644 --- a/test/unit/@node-red/registry/lib/installer_spec.js +++ b/test/unit/@node-red/registry/lib/installer_spec.js @@ -22,9 +22,13 @@ var fs = require('fs'); var EventEmitter = require('events'); var child_process = require('child_process'); -var installer = require("../../../red/runtime-registry/installer"); -var registry = require("../../../red/runtime-registry/index"); -var typeRegistry = require("../../../red/runtime-registry/registry"); + + +var NR_TEST_UTILS = require("nr-test-utils"); + +var installer = NR_TEST_UTILS.require("@node-red/registry/lib/installer"); +var registry = NR_TEST_UTILS.require("@node-red/registry/lib/index"); +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry/lib/registry"); describe('nodes/registry/installer', function() { diff --git a/test/unit/@node-red/registry/lib/library_spec.js b/test/unit/@node-red/registry/lib/library_spec.js index dd7262dca..d8999c2db 100644 --- a/test/unit/@node-red/registry/lib/library_spec.js +++ b/test/unit/@node-red/registry/lib/library_spec.js @@ -19,7 +19,9 @@ var should = require("should"); var fs = require("fs"); var path = require("path"); -var library = require("../../../red/runtime-registry/library"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var library = NR_TEST_UTILS.require("@node-red/registry/lib/library"); describe("library api", function() { it('returns null list when no modules have been registered', function() { diff --git a/test/unit/@node-red/registry/lib/loader_spec.js b/test/unit/@node-red/registry/lib/loader_spec.js index 93d2eeba2..3eb83dfd8 100644 --- a/test/unit/@node-red/registry/lib/loader_spec.js +++ b/test/unit/@node-red/registry/lib/loader_spec.js @@ -20,12 +20,14 @@ var sinon = require("sinon"); var path = require("path"); var fs = require("fs"); -var loader = require("../../../red/runtime-registry/loader"); +var NR_TEST_UTILS = require("nr-test-utils"); -var localfilesystem = require("../../../red/runtime-registry/localfilesystem"); -var registry = require("../../../red/runtime-registry/registry"); +var loader = NR_TEST_UTILS.require("@node-red/registry/lib/loader"); -var nodes = require("../../../red/runtime-registry"); +var localfilesystem = NR_TEST_UTILS.require("@node-red/registry/lib/localfilesystem"); +var registry = NR_TEST_UTILS.require("@node-red/registry/lib/registry"); + +var nodes = NR_TEST_UTILS.require("@node-red/registry"); var resourcesDir = path.resolve(path.join(__dirname,"resources","local")); diff --git a/test/unit/@node-red/registry/lib/localfilesystem_spec.js b/test/unit/@node-red/registry/lib/localfilesystem_spec.js index c5f55da7c..879874945 100644 --- a/test/unit/@node-red/registry/lib/localfilesystem_spec.js +++ b/test/unit/@node-red/registry/lib/localfilesystem_spec.js @@ -19,13 +19,15 @@ var when = require("when"); var sinon = require("sinon"); var path = require("path"); -var localfilesystem = require("../../../red/runtime-registry/localfilesystem"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var localfilesystem = NR_TEST_UTILS.require("@node-red/registry/lib/localfilesystem"); var resourcesDir = path.resolve(path.join(__dirname,"resources","local")); var userDir = path.resolve(path.join(__dirname,"resources","userDir")); var moduleDir = path.resolve(path.join(__dirname,"resources","local","TestNodeModule")); -var i18n = require("../../../red/util").i18n; // TODO: separate module +var i18n = NR_TEST_UTILS.require("@node-red/util").i18n; describe("red/nodes/registry/localfilesystem",function() { beforeEach(function() { @@ -108,7 +110,8 @@ describe("red/nodes/registry/localfilesystem",function() { done(); }); it("Finds nodes in settings.nodesDir (string,relative path)",function(done) { - var relativeUserDir = path.join("test","red","runtime-registry","resources","userDir"); + var relativeUserDir = path.join("test","unit","@node-red","registry","lib","resources","userDir"); + console.log(relativeUserDir) localfilesystem.init({settings:{nodesDir:relativeUserDir}}); var nodeList = localfilesystem.getNodeFiles(true); nodeList.should.have.a.property("node-red"); @@ -186,11 +189,11 @@ describe("red/nodes/registry/localfilesystem",function() { var list = localfilesystem.getNodeFiles(true); list.should.have.property("node-red"); list["node-red"].should.have.property("icons"); - list["node-red"].icons.should.have.length(2); - list["node-red"].icons[1].should.have.property("path",path.join(__dirname,"resources/local/NestedDirectoryNode/NestedNode/icons")) - list["node-red"].icons[1].should.have.property("icons"); - list["node-red"].icons[1].icons.should.have.length(1); - list["node-red"].icons[1].icons[0].should.eql("arrow-in.png"); + list["node-red"].icons.should.have.length(1); + list["node-red"].icons[0].should.have.property("path",path.join(__dirname,"resources/local/NestedDirectoryNode/NestedNode/icons")) + list["node-red"].icons[0].should.have.property("icons"); + list["node-red"].icons[0].icons.should.have.length(1); + list["node-red"].icons[0].icons[0].should.eql("arrow-in.png"); done(); }); it("scans icons dir in library",function(done) { @@ -216,11 +219,11 @@ describe("red/nodes/registry/localfilesystem",function() { var list = localfilesystem.getNodeFiles(true); list.should.have.property("node-red"); list["node-red"].should.have.property("icons"); - list["node-red"].icons.should.have.length(2); - list["node-red"].icons[1].should.have.property("path",path.join(__dirname,"resources/userDir/lib/icons")) - list["node-red"].icons[1].should.have.property("icons"); - list["node-red"].icons[1].icons.should.have.length(1); - list["node-red"].icons[1].icons[0].should.eql("test_icon.png"); + list["node-red"].icons.should.have.length(1); + list["node-red"].icons[0].should.have.property("path",path.join(__dirname,"resources/userDir/lib/icons")) + list["node-red"].icons[0].should.have.property("icons"); + list["node-red"].icons[0].icons.should.have.length(1); + list["node-red"].icons[0].icons[0].should.eql("test_icon.png"); done(); }); }); diff --git a/test/unit/@node-red/registry/lib/registry_spec.js b/test/unit/@node-red/registry/lib/registry_spec.js index c5f82d93d..c7ad930c4 100644 --- a/test/unit/@node-red/registry/lib/registry_spec.js +++ b/test/unit/@node-red/registry/lib/registry_spec.js @@ -19,7 +19,9 @@ var when = require("when"); var sinon = require("sinon"); var path = require("path"); -var typeRegistry = require("../../../red/runtime-registry/registry"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry/lib/registry"); var EventEmitter = require('events'); var events = new EventEmitter(); @@ -518,10 +520,9 @@ describe("red/nodes/registry/registry",function() { }); describe('#getNodeIconPath', function() { - it('returns the default icon when getting an unknown icon', function() { - var defaultIcon = path.resolve(__dirname+'/../../../public/icons/arrow-in.png'); + it('returns the null when getting an unknown icon', function() { var iconPath = typeRegistry.getNodeIconPath('random-module','youwonthaveme.png'); - iconPath.should.eql(defaultIcon); + should.not.exist(iconPath); }); it('returns a registered icon' , function() { @@ -543,10 +544,10 @@ describe("red/nodes/registry/registry",function() { iconPath.should.eql(path.resolve(testIcon+"/test_icon.png")); }); - it('returns the debug icon when getting an unknown module', function() { + it('returns null when getting an unknown module', function() { var debugIcon = path.resolve(__dirname+'/../../../public/icons/debug.png'); var iconPath = typeRegistry.getNodeIconPath('unknown-module', 'debug.png'); - iconPath.should.eql(debugIcon); + should.not.exist(iconPath); }); }); diff --git a/test/unit/@node-red/runtime/lib/api/comms_spec.js b/test/unit/@node-red/runtime/lib/api/comms_spec.js index 8cc252b90..de2a6c3a4 100644 --- a/test/unit/@node-red/runtime/lib/api/comms_spec.js +++ b/test/unit/@node-red/runtime/lib/api/comms_spec.js @@ -17,7 +17,8 @@ var should = require("should"); var sinon = require("sinon"); -var comms = require("../../../red/runtime-api/comms"); +var NR_TEST_UTILS = require("nr-test-utils"); +var comms = NR_TEST_UTILS.require("@node-red/runtime/lib/api/comms"); describe("runtime-api/comms", function() { describe("listens for events", function() { diff --git a/test/unit/@node-red/runtime/lib/api/context_spec.js b/test/unit/@node-red/runtime/lib/api/context_spec.js index 042200ad5..175138d25 100644 --- a/test/unit/@node-red/runtime/lib/api/context_spec.js +++ b/test/unit/@node-red/runtime/lib/api/context_spec.js @@ -14,6 +14,8 @@ * limitations under the License. **/ +var NR_TEST_UTILS = require("nr-test-utils"); + describe("runtime-api/context", function() { it.skip("NEEDS TESTS WRITING",function() {}); }); diff --git a/test/unit/@node-red/runtime/lib/api/flows_spec.js b/test/unit/@node-red/runtime/lib/api/flows_spec.js index 9b060ba23..a7c85efa2 100644 --- a/test/unit/@node-red/runtime/lib/api/flows_spec.js +++ b/test/unit/@node-red/runtime/lib/api/flows_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require("sinon"); -var flows = require("../../../red/runtime-api/flows") +var NR_TEST_UTILS = require("nr-test-utils"); +var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/api/flows") var mockLog = () => ({ log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/api/index_spec.js b/test/unit/@node-red/runtime/lib/api/index_spec.js index c5e1865e2..3cb0d5663 100644 --- a/test/unit/@node-red/runtime/lib/api/index_spec.js +++ b/test/unit/@node-red/runtime/lib/api/index_spec.js @@ -17,18 +17,19 @@ var should = require("should"); var sinon = require("sinon"); -var index = require("../../../red/runtime-api/index"); +var NR_TEST_UTILS = require("nr-test-utils"); +var index = NR_TEST_UTILS.require("@node-red/runtime/lib/api/index"); describe("runtime-api/index", function() { before(function() { ["comms","flows","nodes","settings","library","projects"].forEach(n => { - sinon.stub(require(`../../../red/runtime-api/${n}`),"init",()=>{}); + sinon.stub(NR_TEST_UTILS.require(`@node-red/runtime/lib/api/${n}`),"init",()=>{}); }) }); after(function() { ["comms","flows","nodes","settings","library","projects"].forEach(n => { - require(`../../../red/runtime-api/${n}`).init.restore() + NR_TEST_UTILS.require(`@node-red/runtime/lib/api/${n}`).init.restore() }) }) it('isStarted', function(done) { diff --git a/test/unit/@node-red/runtime/lib/api/library_spec.js b/test/unit/@node-red/runtime/lib/api/library_spec.js index 502750ea7..659cd3bdd 100644 --- a/test/unit/@node-red/runtime/lib/api/library_spec.js +++ b/test/unit/@node-red/runtime/lib/api/library_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require("sinon"); -var library = require("../../../red/runtime-api/library") +var NR_TEST_UTILS = require("nr-test-utils"); +var library = NR_TEST_UTILS.require("@node-red/runtime/lib/api/library") var mockLog = { log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/api/nodes_spec.js b/test/unit/@node-red/runtime/lib/api/nodes_spec.js index 432bad07e..6481c653d 100644 --- a/test/unit/@node-red/runtime/lib/api/nodes_spec.js +++ b/test/unit/@node-red/runtime/lib/api/nodes_spec.js @@ -17,7 +17,8 @@ var should = require("should"); var sinon = require("sinon"); -var nodes = require("../../../red/runtime-api/nodes") +var NR_TEST_UTILS = require("nr-test-utils"); +var nodes = NR_TEST_UTILS.require("@node-red/runtime/lib/api/nodes") var mockLog = () => ({ log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/api/projects_spec.js b/test/unit/@node-red/runtime/lib/api/projects_spec.js index 407eb849d..c8f0c25c8 100644 --- a/test/unit/@node-red/runtime/lib/api/projects_spec.js +++ b/test/unit/@node-red/runtime/lib/api/projects_spec.js @@ -17,7 +17,8 @@ var should = require("should"); var sinon = require("sinon"); -var projects = require("../../../red/runtime-api/projects") +var NR_TEST_UTILS = require("nr-test-utils"); +var projects = NR_TEST_UTILS.require("@node-red/runtime/lib/api/projects") var mockLog = () => ({ log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/api/settings_spec.js b/test/unit/@node-red/runtime/lib/api/settings_spec.js index c08739afb..b3fd9e73e 100644 --- a/test/unit/@node-red/runtime/lib/api/settings_spec.js +++ b/test/unit/@node-red/runtime/lib/api/settings_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require("sinon"); -var settings = require("../../../red/runtime-api/settings") +var NR_TEST_UTILS = require("nr-test-utils"); +var settings = NR_TEST_UTILS.require("@node-red/runtime/lib/api/settings") var mockLog = () => ({ log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/events_spec.js b/test/unit/@node-red/runtime/lib/events_spec.js index cc2802c3c..09b47693d 100644 --- a/test/unit/@node-red/runtime/lib/events_spec.js +++ b/test/unit/@node-red/runtime/lib/events_spec.js @@ -15,9 +15,11 @@ **/ var should = require("should"); +var NR_TEST_UTILS = require("nr-test-utils"); + describe("runtime/events", function() { it('can be required without errors', function() { - require("../../../red/runtime/events"); + NR_TEST_UTILS.require("@node-red/runtime/lib/events"); }); it.skip('more tests needed', function(){}) }); diff --git a/test/unit/@node-red/runtime/lib/index_spec.js b/test/unit/@node-red/runtime/lib/index_spec.js index 8f75a2e71..81361c8ae 100644 --- a/test/unit/@node-red/runtime/lib/index_spec.js +++ b/test/unit/@node-red/runtime/lib/index_spec.js @@ -17,13 +17,15 @@ var should = require("should"); var sinon = require("sinon"); var path = require("path"); -var api = require("../../../red/api"); -var runtime = require("../../../red/runtime"); +var NR_TEST_UTILS = require("nr-test-utils"); -var redNodes = require("../../../red/runtime/nodes"); -var storage = require("../../../red/runtime/storage"); -var settings = require("../../../red/runtime/settings"); -var log = require("../../../red/util/log"); +var api = NR_TEST_UTILS.require("@node-red/runtime/lib/api"); +var runtime = NR_TEST_UTILS.require("@node-red/runtime"); + +var redNodes = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes"); +var storage = NR_TEST_UTILS.require("@node-red/runtime/lib/storage"); +var settings = NR_TEST_UTILS.require("@node-red/runtime/lib/settings"); +var log = NR_TEST_UTILS.require("@node-red/util").log; describe("runtime", function() { afterEach(function() { @@ -33,7 +35,7 @@ describe("runtime", function() { }) before(function() { - process.env.NODE_RED_HOME = path.resolve(path.join(__dirname,"..","..","..")) + process.env.NODE_RED_HOME = NR_TEST_UTILS.resolve("node-red"); }); after(function() { delete process.env.NODE_RED_HOME; @@ -75,7 +77,10 @@ describe("runtime", function() { it("returns version", function() { runtime.init({testSettings: true, httpAdminRoot:"/"},mockUtil()); - /^\d+\.\d+\.\d+(-git)?$/.test(runtime.version()).should.be.true(); + return runtime.version().then(version => { + /^\d+\.\d+\.\d+(-git)?$/.test(version).should.be.true(); + }); + }) }); diff --git a/test/unit/@node-red/runtime/lib/library/index_spec.js b/test/unit/@node-red/runtime/lib/library/index_spec.js index 882d4d75a..bef42d824 100644 --- a/test/unit/@node-red/runtime/lib/library/index_spec.js +++ b/test/unit/@node-red/runtime/lib/library/index_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require("sinon"); var fs = require("fs"); -var library = require("../../../../red/runtime/library/index") +var NR_TEST_UTILS = require("nr-test-utils"); +var library = NR_TEST_UTILS.require("@node-red/runtime/lib/library/index") var mockLog = { log: sinon.stub(), diff --git a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js index c2df3a8ec..623250967 100644 --- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js @@ -16,9 +16,10 @@ var should = require("should"); var sinon = require('sinon'); -var RedNode = require("../../../../red/runtime/nodes/Node"); -var Log = require("../../../../red/util/log"); -var flows = require("../../../../red/runtime/nodes/flows"); +var NR_TEST_UTILS = require("nr-test-utils"); +var RedNode = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node"); +var Log = NR_TEST_UTILS.require("@node-red/util").log; +var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows"); describe('Node', function() { describe('#constructor',function() { diff --git a/test/unit/@node-red/runtime/lib/nodes/context/index_spec.js b/test/unit/@node-red/runtime/lib/nodes/context/index_spec.js index 9a2907ef3..46d86fafe 100644 --- a/test/unit/@node-red/runtime/lib/nodes/context/index_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/context/index_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var sinon = require('sinon'); var path = require("path"); var fs = require('fs-extra'); -var Context = require("../../../../../red/runtime/nodes/context/index"); +var NR_TEST_UTILS = require("nr-test-utils"); +var Context = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/context/index"); describe('context', function() { describe('local memory',function() { diff --git a/test/unit/@node-red/runtime/lib/nodes/context/localfilesystem_spec.js b/test/unit/@node-red/runtime/lib/nodes/context/localfilesystem_spec.js index 62028cdfe..dfbaa08c7 100644 --- a/test/unit/@node-red/runtime/lib/nodes/context/localfilesystem_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/context/localfilesystem_spec.js @@ -17,7 +17,8 @@ var should = require('should'); var fs = require('fs-extra'); var path = require("path"); -var LocalFileSystem = require('../../../../../red/runtime/nodes/context/localfilesystem'); +var NR_TEST_UTILS = require("nr-test-utils"); +var LocalFileSystem = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/context/localfilesystem"); var resourcesDir = path.resolve(path.join(__dirname,"..","resources","context")); diff --git a/test/unit/@node-red/runtime/lib/nodes/context/memory_spec.js b/test/unit/@node-red/runtime/lib/nodes/context/memory_spec.js index b353fd209..5c3410eab 100644 --- a/test/unit/@node-red/runtime/lib/nodes/context/memory_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/context/memory_spec.js @@ -15,7 +15,9 @@ **/ var should = require('should'); -var Memory = require('../../../../../red/runtime/nodes/context/memory'); +var NR_TEST_UTILS = require("nr-test-utils"); + +var Memory = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/context/memory"); describe('memory',function() { var context; diff --git a/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js b/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js index 75a9fc3cc..63050a8b9 100644 --- a/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js @@ -19,9 +19,10 @@ var sinon = require("sinon"); var when = require("when"); var util = require("util"); -var index = require("../../../../red/runtime/nodes/index"); -var credentials = require("../../../../red/runtime/nodes/credentials"); -var log = require("../../../../red/util/log"); +var NR_TEST_UTILS = require("nr-test-utils"); +var index = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/index"); +var credentials = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/credentials"); +var log = NR_TEST_UTILS.require("@node-red/util").log; describe('red/runtime/nodes/credentials', function() { diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js index 8560e0571..ca15dfd64 100644 --- a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js @@ -20,11 +20,13 @@ var sinon = require('sinon'); var clone = require('clone'); var util = require("util"); -var flowUtils = require("../../../../../red/runtime/nodes/flows/util"); -var Flow = require("../../../../../red/runtime/nodes/flows/Flow"); -var flows = require("../../../../../red/runtime/nodes/flows"); -var Node = require("../../../../../red/runtime/nodes/Node"); -var typeRegistry = require("../../../../../red/runtime-registry"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var flowUtils = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows/util"); +var Flow = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows/Flow"); +var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows"); +var Node = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node"); +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry"); describe('Flow', function() { diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/index_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/index_spec.js index 32d7be2aa..cbaca5078 100644 --- a/test/unit/@node-red/runtime/lib/nodes/flows/index_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/flows/index_spec.js @@ -18,13 +18,15 @@ var should = require("should"); var sinon = require("sinon"); var when = require("when"); var clone = require("clone"); -var flows = require("../../../../../red/runtime/nodes/flows"); -var RedNode = require("../../../../../red/runtime/nodes/Node"); -var RED = require("../../../../../red/runtime/nodes"); -var events = require("../../../../../red/runtime/events"); -var credentials = require("../../../../../red/runtime/nodes/credentials"); -var typeRegistry = require("../../../../../red/runtime-registry"); -var Flow = require("../../../../../red/runtime/nodes/flows/Flow"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows"); +var RedNode = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node"); +var RED = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes"); +var events = NR_TEST_UTILS.require("@node-red/runtime/lib/events"); +var credentials = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/credentials"); +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry") +var Flow = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows/Flow"); describe('flows/index', function() { diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/util_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/util_spec.js index 774e786ad..a06c99200 100644 --- a/test/unit/@node-red/runtime/lib/nodes/flows/util_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/flows/util_spec.js @@ -18,9 +18,10 @@ var should = require("should"); var sinon = require("sinon"); var when = require("when"); var clone = require("clone"); -var flowUtil = require("../../../../../red/runtime/nodes/flows/util"); -var typeRegistry = require("../../../../../red/runtime-registry"); -var redUtil = require("../../../../../red/runtime/util"); +var NR_TEST_UTILS = require("nr-test-utils"); +var flowUtil = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows/util"); +var typeRegistry = NR_TEST_UTILS.require("@node-red/registry"); +var redUtil = NR_TEST_UTILS.require("@node-red/util").util; describe('flows/util', function() { var getType; diff --git a/test/unit/@node-red/runtime/lib/nodes/index_spec.js b/test/unit/@node-red/runtime/lib/nodes/index_spec.js index 3225581e3..85eacf6f0 100644 --- a/test/unit/@node-red/runtime/lib/nodes/index_spec.js +++ b/test/unit/@node-red/runtime/lib/nodes/index_spec.js @@ -21,15 +21,16 @@ var when = require("when"); var sinon = require('sinon'); var inherits = require("util").inherits; -var index = require("../../../../red/runtime/nodes/index"); -var flows = require("../../../../red/runtime/nodes/flows"); -var registry = require("../../../../red/runtime-registry"); -var Node = require("../../../../red/runtime/nodes/Node"); +var NR_TEST_UTILS = require("nr-test-utils"); +var index = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/index"); +var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/flows"); +var registry = NR_TEST_UTILS.require("@node-red/registry") +var Node = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node"); describe("red/nodes/index", function() { before(function() { sinon.stub(index,"startFlows"); - process.env.NODE_RED_HOME = path.resolve(path.join(__dirname,"..","..","..","..")) + process.env.NODE_RED_HOME = NR_TEST_UTILS.resolve("node-red"); }); after(function() { index.startFlows.restore(); @@ -168,11 +169,11 @@ describe("red/nodes/index", function() { var http = require('http'); var express = require('express'); var app = express(); - var runtime = require("../../../../red/runtime"); - var credentials = require("../../../../red/runtime/nodes/credentials"); - var localfilesystem = require("../../../../red/runtime/storage/localfilesystem"); - var log = require("../../../../red/util/log"); - var RED = require("../../../../red/red.js"); + var runtime = NR_TEST_UTILS.require("@node-red/runtime"); + var credentials = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/credentials"); + var localfilesystem = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem"); + var log = NR_TEST_UTILS.require("@node-red/util").log; + var RED = NR_TEST_UTILS.require("node-red/lib/red.js"); var userDir = path.join(__dirname,".testUserHome"); before(function(done) { diff --git a/test/unit/@node-red/runtime/lib/settings_spec.js b/test/unit/@node-red/runtime/lib/settings_spec.js index 4766e85e7..65d808fbb 100644 --- a/test/unit/@node-red/runtime/lib/settings_spec.js +++ b/test/unit/@node-red/runtime/lib/settings_spec.js @@ -15,7 +15,8 @@ **/ var should = require("should"); -var settings = require("../../../red/runtime/settings"); +var NR_TEST_UTILS = require("nr-test-utils"); +var settings = NR_TEST_UTILS.require("@node-red/runtime/lib/settings"); describe("red/settings", function() { diff --git a/test/unit/@node-red/runtime/lib/storage/index_spec.js b/test/unit/@node-red/runtime/lib/storage/index_spec.js index 428b1d1d6..3ede68c86 100644 --- a/test/unit/@node-red/runtime/lib/storage/index_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/index_spec.js @@ -16,7 +16,10 @@ var when = require("when"); var should = require("should"); var paff = require('path'); -var storage = require("../../../../red/runtime/storage/index"); + +var NR_TEST_UTILS = require("nr-test-utils"); + +var storage = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/index"); describe("red/storage/index", function() { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js index 9921581b2..464afa7e0 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js @@ -18,9 +18,10 @@ var should = require("should"); var fs = require('fs-extra'); var path = require('path'); var sinon = require('sinon'); +var NR_TEST_UTILS = require("nr-test-utils"); -var localfilesystem = require("../../../../../red/runtime/storage/localfilesystem"); -var log = require("../../../../../red/util/log"); +var localfilesystem = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem"); +var log = NR_TEST_UTILS.require("@node-red/util").log; describe('storage/localfilesystem', function() { var mockRuntime = { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/library_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/library_spec.js index 83c622f27..70152ea1c 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/library_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/library_spec.js @@ -17,8 +17,9 @@ var should = require("should"); var fs = require('fs-extra'); var path = require('path'); +var NR_TEST_UTILS = require("nr-test-utils"); -var localfilesystemLibrary = require("../../../../../red/runtime/storage/localfilesystem/library"); +var localfilesystemLibrary = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/library"); describe('storage/localfilesystem/library', function() { var userDir = path.join(__dirname,".testUserHome"); diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/Project_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/Project_spec.js index 952e4421d..ecf24cf40 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/Project_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/Project_spec.js @@ -14,6 +14,8 @@ * limitations under the License. **/ +var NR_TEST_UTILS = require("nr-test-utils"); + describe("storage/localfilesystem/projects/Project", function() { it.skip("NEEDS TESTS WRITING",function() {}); }) diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet_spec.js index 71ec8adc1..3fab5a45c 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet_spec.js @@ -16,7 +16,8 @@ var should = require("should"); -var defaultFileSet = require("../../../../../../red/runtime/storage/localfilesystem/projects/defaultFileSet"); +var NR_TEST_UTILS = require("nr-test-utils"); +var defaultFileSet = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet"); describe('storage/localfilesystem/projects/defaultFileSet', function() { var runtime = { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache_spec.js index 8e182cea2..c1617bf90 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache_spec.js @@ -17,7 +17,8 @@ var should = require("should"); var sinon = require("sinon"); -var authCache = require("../../../../../../../red/runtime/storage/localfilesystem/projects/git/authCache") +var NR_TEST_UTILS = require("nr-test-utils"); +var authCache = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache") describe("localfilesystem/projects/git/authCache", function() { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer_spec.js index e3022dc83..9b789a66b 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer_spec.js @@ -22,7 +22,9 @@ var sinon = require("sinon"); var child_process = require("child_process"); var fs = require("fs-extra"); -var authServer = require("../../../../../../../red/runtime/storage/localfilesystem/projects/git/authServer"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var authServer = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer"); var sendPrompt = function(localPath, prompt) { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter_spec.js index b55eaf30f..c80cb8ad1 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter_spec.js @@ -22,7 +22,9 @@ var sinon = require("sinon"); var child_process = require("child_process"); var fs = require("fs-extra"); -var authWriter = "../../../../../../../red/runtime/storage/localfilesystem/projects/git/authWriter"; +var NR_TEST_UTILS = require("nr-test-utils"); + +var authWriter = NR_TEST_UTILS.resolve("@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter"); function getListenPath() { var seed = (0x100000+Math.random()*0x999999).toString(16); diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/index_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/index_spec.js index 34cf8e366..773342fa6 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/index_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/git/index_spec.js @@ -14,6 +14,8 @@ * limitations under the License. **/ +var NR_TEST_UTILS = require("nr-test-utils"); + describe("storage/localfilesystem/projects/git/index", function() { it.skip("NEEDS TESTS WRITING",function() {}); }) diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/index_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/index_spec.js index d70c555c3..f63a20522 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/index_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/index_spec.js @@ -14,6 +14,8 @@ * limitations under the License. **/ +var NR_TEST_UTILS = require("nr-test-utils"); + describe("storage/localfilesystem/projects/index", function() { it.skip("NEEDS TESTS WRITING",function() {}); }) diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index_spec.js index adc787028..c6d0c533e 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index_spec.js @@ -17,7 +17,8 @@ var should = require("should"); var fs = require('fs-extra'); var path = require('path'); -var sshkeys = require("../../../../../../../red/runtime/storage/localfilesystem/projects/ssh"); +var NR_TEST_UTILS = require("nr-test-utils"); +var sshkeys = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/projects/ssh"); describe("storage/localfilesystem/projects/ssh", function() { var userDir = path.join(__dirname,".testSSHKeyUserHome"); diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen_spec.js index 92e41cd40..02bf80ca8 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen_spec.js @@ -19,7 +19,8 @@ var sinon = require("sinon"); var child_process = require('child_process'); var EventEmitter = require("events"); -var keygen = require("../../../../../../../red/runtime/storage/localfilesystem/projects/ssh/keygen") +var NR_TEST_UTILS = require("nr-test-utils"); +var keygen = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen") describe("localfilesystem/projects/ssh/keygen", function() { diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/sessions_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/sessions_spec.js index cbfc3cf84..685886d67 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/sessions_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/sessions_spec.js @@ -18,7 +18,8 @@ var should = require("should"); var fs = require('fs-extra'); var path = require('path'); -var localfilesystemSessions = require("../../../../../red/runtime/storage/localfilesystem/sessions"); +var NR_TEST_UTILS = require("nr-test-utils"); +var localfilesystemSessions = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/sessions"); describe('storage/localfilesystem/sessions', function() { var userDir = path.join(__dirname,".testUserHome"); diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/settings_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/settings_spec.js index 56fd10cf9..0be96ed47 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/settings_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/settings_spec.js @@ -18,7 +18,9 @@ var should = require("should"); var fs = require('fs-extra'); var path = require('path'); -var localfilesystemSettings = require("../../../../../red/runtime/storage/localfilesystem/settings"); +var NR_TEST_UTILS = require("nr-test-utils"); + +var localfilesystemSettings = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/settings"); describe('storage/localfilesystem/settings', function() { var userDir = path.join(__dirname,".testUserHome"); diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/util_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/util_spec.js index e39ed74bb..fa1e4bdb7 100644 --- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/util_spec.js +++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/util_spec.js @@ -15,7 +15,8 @@ **/ var should = require("should"); -var util = require("../../../../../red/runtime/storage/localfilesystem/util"); +var NR_TEST_UTILS = require("nr-test-utils"); +var util = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem/util"); describe('storage/localfilesystem/util', function() { describe('parseJSON', function() { diff --git a/test/unit/@node-red/util/index_spec.js b/test/unit/@node-red/util/index_spec.js new file mode 100644 index 000000000..ee46fc504 --- /dev/null +++ b/test/unit/@node-red/util/index_spec.js @@ -0,0 +1,21 @@ +/** + * 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 NR_TEST_UTILS = require("nr-test-utils"); + +describe("node-red/red", function() { + it.skip("NEEDS TESTS WRITING",function() {}); +}); diff --git a/test/unit/@node-red/util/lib/i18n_spec.js b/test/unit/@node-red/util/lib/i18n_spec.js index 1529c7556..5deaba032 100644 --- a/test/unit/@node-red/util/lib/i18n_spec.js +++ b/test/unit/@node-red/util/lib/i18n_spec.js @@ -14,9 +14,13 @@ * limitations under the License. **/ -describe("util/i18n", function() { - it('can be required without errors', function() { - require("../../../red/util/i18n"); - }); + + + var NR_TEST_UTILS = require("nr-test-utils"); + + var i18n = NR_TEST_UTILS.require("@node-red/util").i18n; + + +describe("@node-red/util/i18n", function() { it.skip('more tests needed', function(){}) }); diff --git a/test/unit/@node-red/util/lib/index_spec.js b/test/unit/@node-red/util/lib/index_spec.js index 990702741..3cf2347c1 100644 --- a/test/unit/@node-red/util/lib/index_spec.js +++ b/test/unit/@node-red/util/lib/index_spec.js @@ -14,6 +14,6 @@ * limitations under the License. **/ -describe("util", function() { +describe("@node-red/util", function() { it.skip('more tests needed', function(){}) }); diff --git a/test/unit/@node-red/util/lib/log_spec.js b/test/unit/@node-red/util/lib/log_spec.js index 74675977a..9a6f1ac28 100644 --- a/test/unit/@node-red/util/lib/log_spec.js +++ b/test/unit/@node-red/util/lib/log_spec.js @@ -16,9 +16,13 @@ var should = require("should"); var sinon = require("sinon"); var util = require("util"); -var log = require("../../../red/util/log"); -describe("util/log", function() { +var NR_TEST_UTILS = require("nr-test-utils"); + +var log = NR_TEST_UTILS.require("@node-red/util").log; + + +describe("@node-red/util/log", function() { beforeEach(function () { var spy = sinon.stub(util, 'log', function(arg){}); var settings = {logging: { console: { level: 'metric', metrics: true } } }; diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js index 3792b157b..a95b5ea29 100644 --- a/test/unit/@node-red/util/lib/util_spec.js +++ b/test/unit/@node-red/util/lib/util_spec.js @@ -14,9 +14,12 @@ * limitations under the License. **/ var should = require("should"); -var util = require("../../../red/runtime/util"); -describe("red/util", function() { +var NR_TEST_UTILS = require("nr-test-utils"); + +var util = NR_TEST_UTILS.require("@node-red/util").util; + +describe("@node-red/util/util", function() { describe('generateId', function() { it('generates an id', function() { var id = util.generateId(); diff --git a/test/unit/node-red/lib/red_spec.js b/test/unit/node-red/lib/red_spec.js index 0bac69a52..e1950f407 100644 --- a/test/unit/node-red/lib/red_spec.js +++ b/test/unit/node-red/lib/red_spec.js @@ -18,9 +18,15 @@ var sinon = require("sinon"); var fs = require("fs"); var path = require("path"); -var RED = require("../../red/red"); -var runtime = require("../../red/runtime"); -var api = require("../../red/api"); + +var NR_TEST_UTILS = require("nr-test-utils"); + +var api = NR_TEST_UTILS.require("@node-red/runtime/lib/api"); + +var RED = NR_TEST_UTILS.require("node-red"); + +var runtime = NR_TEST_UTILS.require("@node-red/runtime"); +var api = NR_TEST_UTILS.require("@node-red/runtime/lib/api"); describe("red/red", function() { @@ -37,7 +43,7 @@ describe("red/red", function() { fs.statSync.restore(); RED.version.restore(); }); - it('warns if build has not been run',function() { + it.skip('warns if build has not been run',function() { sinon.stub(fs,"statSync",function() { throw new Error();}); /*jshint immed: false */ @@ -53,15 +59,14 @@ describe("red/red", function() { describe("externals", function() { it('reports version', function() { - var p = require(path.join(process.env.NODE_RED_HOME,"package.json")).version; - RED.version().indexOf(p).should.eql(0); + /\d+\.\d+\.\d+(-git)?/.test(RED.version()).should.be.true(); }); it.skip('access server externals', function() { // TODO: unstubable accessors - need to make this testable - RED.app; - RED.httpAdmin; - RED.httpNode; - RED.server; + // RED.app; + // RED.httpAdmin; + // RED.httpNode; + // RED.server; }); it.skip('only initialises api component if httpAdmin enabled'); it.skip('stubs httpAdmin if httpAdmin disabled'); diff --git a/test/unit/node-red/red_spec.js b/test/unit/node-red/red_spec.js new file mode 100644 index 000000000..ee46fc504 --- /dev/null +++ b/test/unit/node-red/red_spec.js @@ -0,0 +1,21 @@ +/** + * 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 NR_TEST_UTILS = require("nr-test-utils"); + +describe("node-red/red", function() { + it.skip("NEEDS TESTS WRITING",function() {}); +});