Handle Windows paths when trying to resolve @node-red location

Fixes #32
node-red · Mar 25, 2019 · d6695c2 · d6695c2
1 parent b400840
commit d6695c2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -98,10 +98,16 @@ class NodeTestHelper extends EventEmitter {
             } else {
                 if (!fs.existsSync(path.join(prefix, '@node-red/runtime/lib/nodes'))) {
                     // Not in the NR source tree, need to go hunting for the modules....
-                    if (/node_modules\/node-red\/lib$/.test(prefix)) {
+                    if (fs.existsSync(path.join(prefix,'..','node_modules','@node-red/runtime/lib/nodes'))) {
+                        // path/to/node_modules/node-red/lib
+                        // path/to/node_modules/node-red/node_modules/@node-red
+                        prefix = path.resolve(path.join(prefix,"..","node_modules"));
+                    } else if (fs.existsSync(path.join(prefix,'..','..','@node-red/runtime/lib/nodes'))) {
+                        // path/to/node_modules/node-red/lib
+                        // path/to/node_modules/@node-red
                         prefix = path.resolve(path.join(prefix,"..",".."));
                     } else {
-                        throw new Error("Cannot find the NR source tree. Please raise an issue against node-red/node-red-node-test-helper with full details.");
+                        throw new Error("Cannot find the NR source tree. Path: '"+prefix+"'. Please raise an issue against node-red/node-red-node-test-helper with full details.");
                     }
                 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-test-helper",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A test framework for Node-RED nodes",
   "main": "index.js",
   "scripts": {