[Tests] [Refactor] refactor node-modules-paths and add tests.

Add `path-parse` since `node` <= 0.10 doesn’t have `path.parse`

Author: ljharb

lib/node-modules-paths.js

@@ -1,4 +1,5 @@
 var path = require('path');
+var parse = path.parse || require('path-parse');
 
 module.exports = function nodeModulesPaths(start, opts) {
     var modules = opts && opts.moduleDirectory
@@ -17,22 +18,18 @@ module.exports = function nodeModulesPaths(start, opts) {
         prefix = '\\\\';
     }
 
-    var splitRe = process.platform === 'win32' ? /[\/\\]/ : /\/+/;
-
-    var parts = start.split(splitRe);
+    var paths = [start];
+    var parsed = parse(start);
+    while (parsed.dir !== paths[paths.length - 1]) {
+        paths.push(parsed.dir);
+        parsed = parse(parsed.dir);
+    }
 
-    var dirs = [];
-    for (var i = parts.length - 1; i >= 0; i--) {
-        if (modules.indexOf(parts[i]) !== -1) continue;
-        dirs = dirs.concat(modules.map(function (module_dir) {
-            return prefix + path.join(prefix,
-                path.join.apply(path, parts.slice(0, i + 1)),
-                module_dir
-            );
+    var dirs = paths.reduce(function (dirs, aPath) {
+        return dirs.concat(modules.map(function (moduleDir) {
+            return path.join(prefix, aPath, moduleDir);
         }));
-    }
-    if (process.platform === 'win32') {
-        dirs[dirs.length - 1] = dirs[dirs.length - 1].replace(':', ':\\');
-    }
+    }, []);
+
     return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
 };

package.json

@@ -19,14 +19,18 @@
     "test": "npm run --silent tests-only"
   },
   "devDependencies": {
-    "tape": "^4.6.3",
+    "object-keys": "^1.0.11",
+    "safe-publish-latest": "^1.1.1",
     "tap": "0.4.13",
-    "safe-publish-latest": "^1.1.1"
+    "tape": "^4.6.3"
   },
   "license": "MIT",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",
     "url": "http://substack.net"
+  },
+  "dependencies": {
+    "path-parse": "^1.0.5"
   }
 }

test/faulty_basedir.js

@@ -1,10 +1,7 @@
 var test = require('tape');
 var resolve = require('../');
 
-// not sure what's up with this test anymore
-if (process.platform !== 'win32') return;
-
-test('faulty basedir must produce error in windows', function (t) {
+test('faulty basedir must produce error in windows', { skip: process.platform !== 'win32' }, function (t) {
     t.plan(1);
 
     var resolverDir = 'C:\\a\\b\\c\\d';

test/node-modules-paths.js

@@ -1,27 +1,42 @@
 var test = require('tape');
 var path = require('path');
+var parse = path.parse || require('path-parse');
+var keys = require('object-keys');
 
-var getAllNodeModulePathsUpwards = function (start, moduleDirectory) {
-    if (!moduleDirectory) { moduleDirectory = 'node_modules'; }
-    var currentPath = start;
-    var expectedDirs = ['/' + path.join(currentPath, moduleDirectory)];
-    while (currentPath && currentPath !== '/') {
-        currentPath = path.join(currentPath, '../');
-        expectedDirs.push('/' + path.join(currentPath, moduleDirectory));
+var nodeModulesPaths = require('../lib/node-modules-paths');
+
+var verifyDirs = function verifyDirs(t, start, dirs, moduleDirectories, paths) {
+    moduleDirectories = [].concat(moduleDirectories || 'node_modules');
+    if (!paths) { paths = []; }
+
+    var foundModuleDirs = {};
+    var uniqueDirs = {};
+    var parsedDirs = {};
+    for (var i = 0; i < dirs.length; ++i) {
+        var parsed = parse(dirs[i]);
+        if (!foundModuleDirs[parsed.base]) { foundModuleDirs[parsed.base] = 0; }
+        foundModuleDirs[parsed.base] += 1;
+        parsedDirs[parsed.dir] = true;
+        uniqueDirs[dirs[i]] = true;
+    }
+    t.equal(keys(parsedDirs).length >= start.split(path.sep).length, true, 'there are >= dirs than "start" has');
+    var foundModuleDirNames = keys(foundModuleDirs);
+    t.deepEqual(foundModuleDirNames, moduleDirectories.concat(paths), 'all desired module dirs were found');
+    t.equal(keys(uniqueDirs).length, dirs.length, 'all dirs provided were unique');
+
+    var counts = {};
+    for (var j = 0; j < foundModuleDirNames.length; ++j) {
+        counts[foundModuleDirs[j]] = true;
     }
-    return expectedDirs;
+    t.equal(keys(counts).length, 1, 'all found module directories had the same count');
 };
 
-var nodeModulesPaths = require('../lib/node-modules-paths');
-
 test('node-modules-paths', function (t) {
     t.test('no options', function (t) {
         var start = path.join(__dirname, 'resolver');
         var dirs = nodeModulesPaths(start);
 
-        var expectedDirs = getAllNodeModulePathsUpwards(start);
-
-        t.deepEqual(dirs, expectedDirs);
+        verifyDirs(t, start, dirs);
 
         t.end();
     });
@@ -30,9 +45,7 @@ test('node-modules-paths', function (t) {
         var start = path.join(__dirname, 'resolver');
         var dirs = nodeModulesPaths(start, {});
 
-        var expectedDirs = getAllNodeModulePathsUpwards(start);
-
-        t.deepEqual(dirs, expectedDirs);
+        verifyDirs(t, start, dirs);
 
         t.end();
     });
@@ -42,34 +55,39 @@ test('node-modules-paths', function (t) {
         var paths = ['a', 'b'];
         var dirs = nodeModulesPaths(start, { paths: paths });
 
-        var expectedDirs = getAllNodeModulePathsUpwards(start);
-
-        t.deepEqual(dirs, expectedDirs.concat(paths));
+        verifyDirs(t, start, dirs, null, paths);
 
         t.end();
     });
 
     t.test('with moduleDirectory option', function (t) {
         var start = path.join(__dirname, 'resolver');
-        var paths = ['a', 'b'];
-        var dirs = nodeModulesPaths(start, { paths: paths });
-
-        var expectedDirs = getAllNodeModulePathsUpwards(start);
+        var moduleDirectory = 'not node modules';
+        var dirs = nodeModulesPaths(start, { moduleDirectory: moduleDirectory });
 
-        t.deepEqual(dirs, expectedDirs.concat(paths));
+        verifyDirs(t, start, dirs, moduleDirectory);
 
         t.end();
     });
 
-    t.test('with moduleDirectory and paths options', function (t) {
+    t.test('with 1 moduleDirectory and paths options', function (t) {
         var start = path.join(__dirname, 'resolver');
         var paths = ['a', 'b'];
         var moduleDirectory = 'not node modules';
         var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectory });
 
-        var expectedDirs = getAllNodeModulePathsUpwards(start, moduleDirectory);
+        verifyDirs(t, start, dirs, moduleDirectory, paths);
+
+        t.end();
+    });
+
+    t.test('with 1+ moduleDirectory and paths options', function (t) {
+        var start = path.join(__dirname, 'resolver');
+        var paths = ['a', 'b'];
+        var moduleDirectories = ['not node modules', 'other modules'];
+        var dirs = nodeModulesPaths(start, { paths: paths, moduleDirectory: moduleDirectories });
 
-        t.deepEqual(dirs, expectedDirs.concat(paths));
+        verifyDirs(t, start, dirs, moduleDirectories, paths);
 
         t.end();
     });