frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix up unit tests

Browse Source
This commit is contained in:
Nick O'Leary 2018-12-04 15:59:43 +00:00
parent 2060af8a92
commit ee47646cf7
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
10 changed files with 235 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-api/lib/index.js vendored
View File

@ -100,5 +100,5 @@ module.exports = {
auth: {
needsPermission: auth.needsPermission
},
get adminApp() { return adminApp; }
get httpAdmin() { return adminApp; }
};

93
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@ -21,8 +21,8 @@ var semver = require("semver");
var localfilesystem = require("./localfilesystem");
var registry = require("./registry");
var i18n = require("@node-red/util").i18n; // TODO: separate module
var registryUtil = require("./util")
var i18n = require("@node-red/util").i18n;
var settings;
var runtime;
@ -31,6 +31,7 @@ function init(_runtime) {
runtime = _runtime;
settings = runtime.settings;
localfilesystem.init(runtime);
registryUtil.init(runtime);
}
function load(defaultNodesDir,disableNodePathScan) {
@ -44,92 +45,6 @@ function load(defaultNodesDir,disableNodePathScan) {
return loadNodeFiles(nodeFiles);
}
function copyObjectProperties(src,dst,copyList,blockList) {
if (!src) {
return;
}
if (copyList && !blockList) {
copyList.forEach(function(i) {
if (src.hasOwnProperty(i)) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
});
} else if (!copyList && blockList) {
for (var i in src) {
if (src.hasOwnProperty(i) && blockList.indexOf(i) === -1) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
}
}
}
function requireModule(name) {
var moduleInfo = registry.getModuleInfo(name);
if (moduleInfo && moduleInfo.path) {
var relPath = path.relative(__dirname, moduleInfo.path);
return require(relPath);
} else {
var err = new Error(`Cannot find module '${name}'`);
err.code = "MODULE_NOT_FOUND";
throw err;
}
}
function createNodeApi(node) {
var red = {
nodes: {},
log: {},
settings: {},
events: runtime.events,
util: runtime.util,
version: runtime.version,
require: requireModule,
comms: {
publish: function(topic,data,retain) {
runtime.events.emit("comms",{
topic: topic,
data: data,
retain: retain
})
}
},
library: {
register: function(type) {
return runtime.library.register(node.id,type);
}
},
httpNode: runtime.nodeApp,
server: runtime.server
}
copyObjectProperties(runtime.nodes,red.nodes,["createNode","getNode","eachNode","addCredentials","getCredentials","deleteCredentials" ]);
red.nodes.registerType = function(type,constructor,opts) {
runtime.nodes.registerType(node.id,type,constructor,opts);
}
copyObjectProperties(runtime.log,red.log,null,["init"]);
copyObjectProperties(runtime.settings,red.settings,null,["init","load","reset"]);
if (runtime.adminApi) {
red.auth = runtime.adminApi.auth;
red.httpAdmin = runtime.adminApi.adminApp;
} else {
//TODO: runtime.adminApi is always stubbed if not enabled, so this block
// is unused - but may be needed for the unit tests
red.auth = {
needsPermission: function() {}
};
// TODO: stub out httpAdmin/httpNode/server
}
red["_"] = function() {
var args = Array.prototype.slice.call(arguments, 0);
if (args[0].indexOf(":") === -1) {
args[0] = node.namespace+":"+args[0];
}
return i18n._.apply(null,args);
}
return red;
}
function loadNodeFiles(nodeFiles) {
var promises = [];
var nodes = [];
@ -332,7 +247,7 @@ function loadNodeSet(node) {
var r = require(node.file);
if (typeof r === "function") {
var red = createNodeApi(node);
var red = registryUtil.createNodeApi(node);
var promise = r(red);
if (promise != null && typeof promise.then === "function") {
loadPromise = promise.then(function() {

110
packages/node_modules/@node-red/registry/lib/util.js vendored Normal file
View File

@ -0,0 +1,110 @@
/**
* 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 i18n = require("@node-red/util").i18n;
var runtime;
function copyObjectProperties(src,dst,copyList,blockList) {
if (!src) {
return;
}
if (copyList && !blockList) {
copyList.forEach(function(i) {
if (src.hasOwnProperty(i)) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
});
} else if (!copyList && blockList) {
for (var i in src) {
if (src.hasOwnProperty(i) && blockList.indexOf(i) === -1) {
var propDescriptor = Object.getOwnPropertyDescriptor(src,i);
Object.defineProperty(dst,i,propDescriptor);
}
}
}
}
function requireModule(name) {
var moduleInfo = registry.getModuleInfo(name);
if (moduleInfo && moduleInfo.path) {
var relPath = path.relative(__dirname, moduleInfo.path);
return require(relPath);
} else {
var err = new Error(`Cannot find module '${name}'`);
err.code = "MODULE_NOT_FOUND";
throw err;
}
}
function createNodeApi(node) {
var red = {
nodes: {},
log: {},
settings: {},
events: runtime.events,
util: runtime.util,
version: runtime.version,
require: requireModule,
comms: {
publish: function(topic,data,retain) {
runtime.events.emit("comms",{
topic: topic,
data: data,
retain: retain
})
}
},
library: {
register: function(type) {
return runtime.library.register(node.id,type);
}
},
httpNode: runtime.nodeApp,
httpAdmin: runtime.adminApp,
server: runtime.server
}
copyObjectProperties(runtime.nodes,red.nodes,["createNode","getNode","eachNode","addCredentials","getCredentials","deleteCredentials" ]);
red.nodes.registerType = function(type,constructor,opts) {
runtime.nodes.registerType(node.id,type,constructor,opts);
}
copyObjectProperties(runtime.log,red.log,null,["init"]);
copyObjectProperties(runtime.settings,red.settings,null,["init","load","reset"]);
if (runtime.adminApi) {
red.auth = runtime.adminApi.auth;
} else {
//TODO: runtime.adminApi is always stubbed if not enabled, so this block
// is unused - but may be needed for the unit tests
red.auth = {
needsPermission: function(v) { return function(req,res,next) {next()} }
};
// TODO: stub out httpAdmin/httpNode/server
}
red["_"] = function() {
var args = Array.prototype.slice.call(arguments, 0);
if (args[0].indexOf(":") === -1) {
args[0] = node.namespace+":"+args[0];
}
return i18n._.apply(null,args);
}
return red;
}
module.exports = {
init: function(_runtime) {
runtime = _runtime;
},
createNodeApi: createNodeApi
}

19
packages/node_modules/@node-red/runtime/lib/index.js vendored
View File

@ -53,6 +53,7 @@ var adminApi = {
}
var nodeApp;
var adminApp;
var server;
@ -64,12 +65,13 @@ var server;
* better abstracted.
* @memberof @node-red/runtime
*/
function init(userSettings,httpServer,_adminApi) {
function init(userSettings,httpServer,_adminApi,__util) {
server = httpServer;
userSettings.version = getVersion();
settings.init(userSettings);
nodeApp = express();
adminApp = express();
if (_adminApi) {
adminApi = _adminApi;
@ -78,6 +80,13 @@ function init(userSettings,httpServer,_adminApi) {
library.init(runtime);
externalAPI.init(runtime);
exec.init(runtime);
if (__util) {
log = __util.log;
i18n = __util.i18n;
} else {
log = redUtil.log;
i18n = redUtil.i18n;
}
}
var version;
@ -103,7 +112,6 @@ function getVersion() {
* @memberof @node-red/runtime
*/
function start() {
return i18n.registerMessageCatalog("runtime",path.resolve(path.join(__dirname,"..","locales")),"runtime.json")
.then(function() { return storage.init(runtime)})
.then(function() { return settings.load(storage)})
@ -269,6 +277,7 @@ var runtime = {
exec: exec,
util: require("@node-red/util").util,
get adminApi() { return adminApi },
get adminApp() { return adminApp },
get nodeApp() { return nodeApp },
get server() { return server },
isStarted: function() {
@ -346,8 +355,12 @@ module.exports = {
storage: storage,
events: events,
util: require("@node-red/util").util,
get httpNode() { return nodeApp },
get server() { return server }
get httpAdmin() { return adminApp },
get server() { return server },
"_": runtime
}

13
packages/node_modules/node-red/lib/red.js vendored
View File

@ -63,8 +63,13 @@ module.exports = {
}
redUtil.init(userSettings);
if (userSettings.httpAdminRoot !== false) {
// Initialise the runtime
runtime.init(userSettings,httpServer,api);
// Initialise the editor-api
api.init(userSettings,httpServer,runtime.storage,runtime);
// Attach the runtime admin app to the api admin app
api.httpAdmin.use(runtime.httpAdmin);
apiEnabled = true;
server = httpServer;
} else {
@ -107,15 +112,17 @@ module.exports = {
util: redUtil.util,
get nodes() { console.log("Deprecated use of RED.nodes - refer to API documentation on RED.runtime.nodes"); return runtime._.nodes },
get settings() { console.log("Deprecated use of RED.settings - refer to API documentation on RED.runtime.settings"); return runtime._.settings },
get version() { console.log("Deprecated use of RED.version - refer to API documentation on RED.runtime.version"); return runtime._.version },
get events() { console.log("Deprecated use of RED.events - refer to API documentation on RED.runtime.events"); return runtime.events },
get settings() { return runtime._.settings },
get version() { return runtime._.version },
/**
* The express application for the Editor Admin API
* @memberof node-red
*/
get httpAdmin() { return api.adminApp },
get httpAdmin() { return api.httpAdmin },
/**
* The express application for HTTP Nodes

5
test/nodes/core/core/20-inject_spec.js
View File

@ -503,16 +503,21 @@ describe('inject node', function() {
done();
});
});
try {
helper.request()
.post('/inject/n1')
.expect(200).end(function(err) {
if (err) {
console.log(err);
return helper.clearFlows()
.then(function () {
done(err);
});
}
});
} catch(err) {
done(err);
}
});
});

18
test/unit/@node-red/editor-api/lib/index_spec.js
View File

@ -59,8 +59,8 @@ describe("api/index", function() {
afterEach(afterEach);
it("does not setup admin api if httpAdminRoot is false", function(done) {
api.init({},{ httpAdminRoot: false },{},{});
should.not.exist(api.adminApp);
api.init({ httpAdminRoot: false },{},{},{});
should.not.exist(api.httpAdmin);
done();
});
describe('initalises admin api without adminAuth', function(done) {
@ -70,30 +70,30 @@ describe("api/index", function() {
});
after(afterEach);
it('exposes the editor',function(done) {
request(api.adminApp).get("/editor").expect(200).end(done);
request(api.httpAdmin).get("/editor").expect(200).end(done);
})
it('exposes the admin api',function(done) {
request(api.adminApp).get("/admin").expect(200).end(done);
request(api.httpAdmin).get("/admin").expect(200).end(done);
})
it('exposes the auth api',function(done) {
request(api.adminApp).get("/auth/login").expect(200).end(done);
request(api.httpAdmin).get("/auth/login").expect(200).end(done);
})
});
describe('initalises admin api without editor', function(done) {
before(function() {
beforeEach();
api.init({},{ disableEditor: true },{},{});
api.init({ disableEditor: true },{},{},{});
});
after(afterEach);
it('does not expose the editor',function(done) {
request(api.adminApp).get("/editor").expect(404).end(done);
request(api.httpAdmin).get("/editor").expect(404).end(done);
})
it('exposes the admin api',function(done) {
request(api.adminApp).get("/admin").expect(200).end(done);
request(api.httpAdmin).get("/admin").expect(200).end(done);
})
it('exposes the auth api',function(done) {
request(api.adminApp).get("/auth/login").expect(200).end(done)
request(api.httpAdmin).get("/auth/login").expect(200).end(done)
})
});
});

20
test/unit/@node-red/registry/lib/util_spec.js Normal file
View File

@ -0,0 +1,20 @@
/**
* 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.
**/
describe("red/nodes/registry/util",function() {
it.skip("NEEDS TESTS");
});

16
test/unit/@node-red/runtime/lib/index_spec.js
View File

@ -25,6 +25,8 @@ 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 util = NR_TEST_UTILS.require("@node-red/util");
var log = NR_TEST_UTILS.require("@node-red/util").log;
describe("runtime", function() {
@ -41,6 +43,7 @@ describe("runtime", function() {
delete process.env.NODE_RED_HOME;
});
function mockUtil(metrics) {
return {
log:{
log: sinon.stub(),
@ -95,6 +98,7 @@ describe("runtime", function() {
var redNodesLoadFlows;
var redNodesStartFlows;
var redNodesLoadContextsPlugin;
var i18nRegisterMessageCatalog;
beforeEach(function() {
storageInit = sinon.stub(storage,"init",function(settings) {return Promise.resolve();});
@ -104,6 +108,7 @@ describe("runtime", function() {
redNodesLoadFlows = sinon.stub(redNodes,"loadFlows",function() {return Promise.resolve()});
redNodesStartFlows = sinon.stub(redNodes,"startFlows",function() {});
redNodesLoadContextsPlugin = sinon.stub(redNodes,"loadContextsPlugin",function() {return Promise.resolve()});
i18nRegisterMessageCatalog = sinon.stub(util.i18n,"registerMessageCatalog",function() {return Promise.resolve()});
});
afterEach(function() {
storageInit.restore();
@ -114,6 +119,7 @@ describe("runtime", function() {
redNodesLoadFlows.restore();
redNodesStartFlows.restore();
redNodesLoadContextsPlugin.restore();
i18nRegisterMessageCatalog.restore();
});
it("reports errored/missing modules",function(done) {
redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function(cb) {
@ -199,10 +205,14 @@ describe("runtime", function() {
var stopFlows = sinon.stub(redNodes,"stopFlows",function() { return Promise.resolve();} );
redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function() {return []});
var util = mockUtil(true);
runtime.init({testSettings: true, runtimeMetricInterval:200, httpAdminRoot:"/", load:function() { return Promise.resolve();}},util);
sinon.stub(console,"log");
runtime.init(
{testSettings: true, runtimeMetricInterval:200, httpAdminRoot:"/", load:function() { return Promise.resolve();}},
{},
undefined,
util);
// sinon.stub(console,"log");
runtime.start().then(function() {
console.log.restore();
// console.log.restore();
setTimeout(function() {
try {
util.log.log.args.should.have.lengthOf(3);

50
test/unit/node-red/lib/red_spec.js
View File

@ -31,31 +31,31 @@ var api = NR_TEST_UTILS.require("@node-red/runtime/lib/api");
describe("red/red", function() {
describe("check build", function() {
beforeEach(function() {
sinon.stub(runtime,"init",function() {});
sinon.stub(api,"init",function() {});
sinon.stub(RED,"version",function() { return "version";});
});
afterEach(function() {
runtime.init.restore();
api.init.restore();
fs.statSync.restore();
RED.version.restore();
});
it.skip('warns if build has not been run',function() {
sinon.stub(fs,"statSync",function() { throw new Error();});
/*jshint immed: false */
(function() {
RED.init({},{});
}).should.throw("Node-RED not built");
});
it('passed if build has been run',function() {
sinon.stub(fs,"statSync",function() { });
RED.init({},{});
});
});
// describe("check build", function() {
// beforeEach(function() {
// sinon.stub(runtime,"init",function() {});
// sinon.stub(api,"init",function() {});
// // sinon.stub(RED,"version",function() { return "version";});
// });
// afterEach(function() {
// runtime.init.restore();
// api.init.restore();
// fs.statSync.restore();
// // RED.version.restore();
// });
// it.skip('warns if build has not been run',function() {
// sinon.stub(fs,"statSync",function() { throw new Error();});
//
// /*jshint immed: false */
// (function() {
// RED.init({},{});
// }).should.throw("Node-RED not built");
// });
// it('passed if build has been run',function() {
// sinon.stub(fs,"statSync",function() { });
// RED.init({},{});
// });
// });
describe("externals", function() {
it('reports version', function() {