frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add registry test for node module loading

Browse Source
This commit is contained in:
Nick O'Leary
2014-08-03 21:17:24 +01:00
parent 1697aee9f6
commit f7f58a2347
6 changed files with 101 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
red/nodes/registry.js
View File

@@ -219,7 +219,8 @@ function loadNodesFromModule(moduleDir,pkg) {
var iconDirs = [];
for (var n in nodes) {
if (nodes.hasOwnProperty(n)) {
results.push(loadNodeConfig(path.join(moduleDir,nodes[n]),pkg.name+":"+n));
var file = path.join(moduleDir,nodes[n]);
results.push(loadNodeConfig(file,pkg.name+":"+n));
var iconDir = path.join(moduleDir,path.dirname(nodes[n]),"icons");
if (iconDirs.indexOf(iconDir) == -1) {
if (fs.existsSync(iconDir)) {
@@ -302,7 +303,7 @@ function loadNodeConfig(file,name) {
* location of nodeFiles - used by the tests
* @return a promise that resolves on completion of loading
*/
function load(defaultNodesDir) {
function load(defaultNodesDir,disableNodePathScan) {
return when.promise(function(resolve,reject) {
// Find all of the nodes to load
var nodeFiles;
@@ -330,7 +331,7 @@ function load(defaultNodesDir) {
// This indicates a test is being run - don't want to pick up
// unexpected nodes.
// Urgh.
if (!defaultNodesDir) {
if (!disableNodePathScan) {
// Find all of the modules containing nodes
var moduleFiles = scanTreeForNodesModules();
moduleFiles.forEach(function(moduleFile) {