From 785561a0cc674fb4d00b3d7adbc0faeef2088f58 Mon Sep 17 00:00:00 2001 From: "t.kawamorita" Date: Fri, 25 Sep 2020 11:58:03 +0900 Subject: [PATCH 1/2] fix getModuleFiles function --- packages/node_modules/@node-red/registry/lib/localfilesystem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js index c66d7d080..7233d1da3 100644 --- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js +++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js @@ -361,6 +361,7 @@ function getModuleFiles(module) { nodeList[moduleFile.package.name] = { name: moduleFile.package.name, version: moduleFile.package.version, + path: moduleFile.dir, nodes: {}, icons: nodeModuleFiles.icons, examples: nodeModuleFiles.examples From 2b29eeb7958537f13149d5eb5668201d2b97a370 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 25 Sep 2020 11:52:48 +0100 Subject: [PATCH 2/2] Add unit test for module path --- test/unit/@node-red/registry/lib/localfilesystem_spec.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/unit/@node-red/registry/lib/localfilesystem_spec.js b/test/unit/@node-red/registry/lib/localfilesystem_spec.js index 41beb8df5..82e4d1b2d 100644 --- a/test/unit/@node-red/registry/lib/localfilesystem_spec.js +++ b/test/unit/@node-red/registry/lib/localfilesystem_spec.js @@ -144,16 +144,20 @@ describe("red/nodes/registry/localfilesystem",function() { var nodeList = localfilesystem.getNodeFiles(); nodeList.should.have.a.property("node-red"); var nm = nodeList['node-red']; + // The `node-red` module is loaded differently to those scanned for + // It doesn't get the `path` property set. Maybe it should. nm.should.have.a.property('name','node-red'); nm.should.have.a.property("nodes"); checkNodes(nm.nodes,[],['TestNode1']); nm = nodeList['TestNodeModule']; + nm.should.have.a.property('path') nm.should.have.a.property('name','TestNodeModule'); nm.should.have.a.property("nodes"); checkNodes(nm.nodes,['TestNodeMod1','TestNodeMod2'],[],'TestNodeModule'); nm = nodeList['VersionMismatchModule']; + nm.should.have.a.property('path') nm.should.have.a.property('name','VersionMismatchModule'); nm.should.have.a.property("nodes"); checkNodes(nm.nodes,['VersionMismatchMod1','VersionMismatchMod2'],[],'VersionMismatchModule'); @@ -243,6 +247,8 @@ describe("red/nodes/registry/localfilesystem",function() { nodeModule['TestNodeModule'].should.have.a.property('name','TestNodeModule'); nodeModule['TestNodeModule'].should.have.a.property('version','0.0.1'); nodeModule['TestNodeModule'].should.have.a.property('nodes'); + nodeModule['TestNodeModule'].should.have.a.property('path'); + checkNodes(nodeModule['TestNodeModule'].nodes,['TestNodeMod1','TestNodeMod2'],[],'TestNodeModule'); nodeModule = localfilesystem.getModuleFiles('VersionMismatchModule');