nav tabs on admin dashboard

node_modules/resolve/test/faulty_basedir.js

@@ -1,4 +1,5 @@
 var test = require('tape');
+var path = require('path');
 var resolve = require('../');
 
 test('faulty basedir must produce error in windows', { skip: process.platform !== 'win32' }, function (t) {
@@ -7,7 +8,22 @@ test('faulty basedir must produce error in windows', { skip: process.platform !=
     var resolverDir = 'C:\\a\\b\\c\\d';
 
     resolve('tape/lib/test.js', { basedir: resolverDir }, function (err, res, pkg) {
-        t.equal(true, !!err);
+        t.equal(!!err, true);
+    });
+});
+
+test('non-existent basedir should not throw when preserveSymlinks is false', function (t) {
+    t.plan(2);
+
+    var opts = {
+        basedir: path.join(path.sep, 'unreal', 'path', 'that', 'does', 'not', 'exist'),
+        preserveSymlinks: false
+    };
+
+    var module = './dotdot/abc';
+
+    resolve(module, opts, function (err, res) {
+        t.equal(err.code, 'MODULE_NOT_FOUND');
+        t.equal(res, undefined);
     });
-
 });

node_modules/resolve/test/node-modules-paths.js

@@ -7,6 +7,11 @@ var nodeModulesPaths = require('../lib/node-modules-paths');
 
 var verifyDirs = function verifyDirs(t, start, dirs, moduleDirectories, paths) {
     var moduleDirs = [].concat(moduleDirectories || 'node_modules');
+    if (paths) {
+        for (var k = 0; k < paths.length; ++k) {
+            moduleDirs.push(path.basename(paths[k]));
+        }
+    }
 
     var foundModuleDirs = {};
     var uniqueDirs = {};
@@ -20,7 +25,7 @@ var verifyDirs = function verifyDirs(t, start, dirs, moduleDirectories, paths) {
     }
     t.equal(keys(parsedDirs).length >= start.split(path.sep).length, true, 'there are >= dirs than "start" has');
     var foundModuleDirNames = keys(foundModuleDirs);
-    t.deepEqual(foundModuleDirNames, moduleDirs.concat(paths || []), 'all desired module dirs were found');
+    t.deepEqual(foundModuleDirNames, moduleDirs, 'all desired module dirs were found');
     t.equal(keys(uniqueDirs).length, dirs.length, 'all dirs provided were unique');
 
     var counts = {};
@@ -49,7 +54,7 @@ test('node-modules-paths', function (t) {
         t.end();
     });
 
-    t.test('with paths option', function (t) {
+    t.test('with paths=array option', function (t) {
         var start = path.join(__dirname, 'resolver');
         var paths = ['a', 'b'];
         var dirs = nodeModulesPaths(start, { paths: paths });
@@ -59,6 +64,29 @@ test('node-modules-paths', function (t) {
         t.end();
     });
 
+    t.test('with paths=function option', function (t) {
+        var paths = function paths(request, absoluteStart, getNodeModulesDirs, opts) {
+            return getNodeModulesDirs().concat(path.join(absoluteStart, 'not node modules', request));
+        };
+
+        var start = path.join(__dirname, 'resolver');
+        var dirs = nodeModulesPaths(start, { paths: paths }, 'pkg');
+
+        verifyDirs(t, start, dirs, null, [path.join(start, 'not node modules', 'pkg')]);
+
+        t.end();
+    });
+
+    t.test('with paths=function skipping node modules resolution', function (t) {
+        var paths = function paths(request, absoluteStart, getNodeModulesDirs, opts) {
+            return [];
+        };
+        var start = path.join(__dirname, 'resolver');
+        var dirs = nodeModulesPaths(start, { paths: paths });
+        t.deepEqual(dirs, [], 'no node_modules was computed');
+        t.end();
+    });
+
     t.test('with moduleDirectory option', function (t) {
         var start = path.join(__dirname, 'resolver');
         var moduleDirectory = 'not node modules';

node_modules/resolve/test/node_path.js

@@ -1,18 +1,34 @@
+var fs = require('fs');
 var path = require('path');
 var test = require('tape');
 var resolve = require('../');
 
 test('$NODE_PATH', function (t) {
-    t.plan(4);
+    t.plan(8);
+
+    var isDir = function (dir, cb) {
+        if (dir === '/node_path' || dir === 'node_path/x') {
+            return cb(null, true);
+        }
+        fs.stat(dir, function (err, stat) {
+            if (!err) {
+                return cb(null, stat.isDirectory());
+            }
+            if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+            return cb(err);
+        });
+    };
 
     resolve('aaa', {
         paths: [
             path.join(__dirname, '/node_path/x'),
             path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname
+        basedir: __dirname,
+        isDirectory: isDir
     }, function (err, res) {
-        t.equal(res, path.join(__dirname, '/node_path/x/aaa/index.js'));
+        t.error(err);
+        t.equal(res, path.join(__dirname, '/node_path/x/aaa/index.js'), 'aaa resolves');
     });
 
     resolve('bbb', {
@@ -20,9 +36,11 @@ test('$NODE_PATH', function (t) {
             path.join(__dirname, '/node_path/x'),
             path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname
+        basedir: __dirname,
+        isDirectory: isDir
     }, function (err, res) {
-        t.equal(res, path.join(__dirname, '/node_path/y/bbb/index.js'));
+        t.error(err);
+        t.equal(res, path.join(__dirname, '/node_path/y/bbb/index.js'), 'bbb resolves');
     });
 
     resolve('ccc', {
@@ -30,20 +48,23 @@ test('$NODE_PATH', function (t) {
             path.join(__dirname, '/node_path/x'),
             path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname
+        basedir: __dirname,
+        isDirectory: isDir
     }, function (err, res) {
-        t.equal(res, path.join(__dirname, '/node_path/x/ccc/index.js'));
+        t.error(err);
+        t.equal(res, path.join(__dirname, '/node_path/x/ccc/index.js'), 'ccc resolves');
     });
 
-    // ensure that relative paths still resolve against the
-    // regular `node_modules` correctly
+    // ensure that relative paths still resolve against the regular `node_modules` correctly
     resolve('tap', {
         paths: [
             'node_path'
         ],
-        basedir: 'node_path/x'
+        basedir: path.join(__dirname, 'node_path/x'),
+        isDirectory: isDir
     }, function (err, res) {
         var root = require('tap/package.json').main;
-        t.equal(res, path.resolve(__dirname, '..', 'node_modules/tap', root));
+        t.error(err);
+        t.equal(res, path.resolve(__dirname, '..', 'node_modules/tap', root), 'tap resolves');
     });
 });

node_modules/resolve/test/resolver.js

@@ -364,7 +364,7 @@ test('async dot slash main', function (t) {
 });
 
 test('not a directory', function (t) {
-    t.plan(5);
+    t.plan(6);
     var path = './foo';
     resolve(path, { basedir: __filename }, function (err, res, pkg) {
         t.ok(err, 'a non-directory errors');
@@ -372,7 +372,34 @@ test('not a directory', function (t) {
         t.equal(res, undefined);
         t.equal(pkg, undefined);
 
-        t.equal(err && err.message, 'Cannot find module \'' + path + "' from '" + __filename + "'");
+        t.equal(err && err.message, 'Cannot find module \'' + path + '\' from \'' + __filename + '\'');
+        t.equal(err && err.code, 'MODULE_NOT_FOUND');
+    });
+});
+
+test('non-string "main" field in package.json', function (t) {
+    t.plan(5);
+
+    var dir = path.join(__dirname, 'resolver');
+    resolve('./invalid_main', { basedir: dir }, function (err, res, pkg) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
+        t.equal(res, undefined, 'res is undefined');
+        t.equal(pkg, undefined, 'pkg is undefined');
+    });
+});
+
+test('non-string "main" field in package.json', function (t) {
+    t.plan(5);
+
+    var dir = path.join(__dirname, 'resolver');
+    resolve('./invalid_main', { basedir: dir }, function (err, res, pkg) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
+        t.equal(res, undefined, 'res is undefined');
+        t.equal(pkg, undefined, 'pkg is undefined');
     });
 });
 

node_modules/resolve/test/resolver_sync.js

@@ -290,6 +290,35 @@ test('not a directory', function (t) {
     } catch (err) {
         t.ok(err, 'a non-directory errors');
         t.equal(err && err.message, 'Cannot find module \'' + path + "' from '" + __filename + "'");
+        t.equal(err && err.code, 'MODULE_NOT_FOUND');
+    }
+    t.end();
+});
+
+test('non-string "main" field in package.json', function (t) {
+    var dir = path.join(__dirname, 'resolver');
+    try {
+        var result = resolve.sync('./invalid_main', { basedir: dir });
+        t.equal(result, undefined, 'result should not exist');
+        t.fail('should not get here');
+    } catch (err) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
+    }
+    t.end();
+});
+
+test('non-string "main" field in package.json', function (t) {
+    var dir = path.join(__dirname, 'resolver');
+    try {
+        var result = resolve.sync('./invalid_main', { basedir: dir });
+        t.equal(result, undefined, 'result should not exist');
+        t.fail('should not get here');
+    } catch (err) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
     }
     t.end();
 });

node_modules/resolve/test/symlinks.js

@@ -15,10 +15,10 @@ try {
 }
 
 test('symlink', function (t) {
-    t.plan(1);
+    t.plan(2);
 
     resolve('foo', { basedir: symlinkDir, preserveSymlinks: false }, function (err, res, pkg) {
-        if (err) t.fail(err);
+        t.error(err);
         t.equal(res, path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
     });
 });