Skip to content

Commit

Permalink
Improve node_modules test.
Browse files Browse the repository at this point in the history
  • Loading branch information
aseemk committed Mar 20, 2015
1 parent a74bc77 commit 4436c2f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ module.exports = function requireDir(dir, opts) {
if (base === 'node_modules') {
continue;
}

map[base] = requireDir(path, opts);

// if duplicates are wanted, key off the full name too:
Expand Down
18 changes: 6 additions & 12 deletions test/recurse.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
var assert = require('assert');
var mkdirp = require('mkdirp');
var path = require('path');
var fs = require('fs');

var requireDir = require('..');

// first test without recursing:
Expand All @@ -11,14 +7,6 @@ assert.deepEqual(requireDir('./recurse'), {
});

// then test with recursing:
var dir = path.join(__dirname, 'recurse', 'node_modules');
try {
fs.statSync(path.join(dir, 'fake.js'));
} catch (e) {
mkdirp.sync(dir);
fs.writeFileSync(path.join(dir, 'fake.js'), 'module.exports = "ignore";');
}

assert.deepEqual(requireDir('./recurse', {recurse: true}), {
a: 'a',
b: {
Expand All @@ -31,6 +19,12 @@ assert.deepEqual(requireDir('./recurse', {recurse: true}), {
c: {
'3': 3
},
// note that node_modules was explicitly ignored
});

// finally, test that node_modules can still be required directly:
assert.deepEqual(requireDir('./recurse/node_modules'), {
fake: 'fake',
});

console.log('Recurse tests passed.');
1 change: 1 addition & 0 deletions test/recurse/node_modules/fake.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4436c2f

Please sign in to comment.