fix: callback early is readdir throw an error

jestjs · Aug 24, 2018 · a1796df · a1796df
1 parent d56dcf3
commit a1796df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/jest-haste-map/src/crawlers/__tests__/node.test.js b/packages/jest-haste-map/src/crawlers/__tests__/node.test.js
@@ -59,8 +59,8 @@ jest.mock('fs', () => {
         setTimeout(() => callback(null, ['directory', 'tomato.js']), 0);
       } else if (dir === '/fruits/directory') {
         setTimeout(() => callback(null, ['strawberry.js']), 0);
-      } else if (dir == '/empty') {
-        setTimeout(() => callback(null, null), 0);
+      } else if (dir == '/error') {
+        throw new Error('Error: ENOTDIR: not a directory');
       }
     }),
     stat: jest.fn(stat),
@@ -220,7 +220,7 @@ describe('node crawler', () => {
     });
   });
 
-  it('completes with undefined names', () => {
+  it('completes with fs.readdir throwing an error', () => {
     process.platform = 'win32';
 
     nodeCrawl = require('../node');
@@ -230,7 +230,7 @@ describe('node crawler', () => {
       data: {files},
       extensions: ['js'],
       ignore: pearMatcher,
-      roots: ['/empty'],
+      roots: ['/error'],
     }).then(data => {
       expect(data.files).toEqual({});
     });

diff --git a/packages/jest-haste-map/src/crawlers/node.js b/packages/jest-haste-map/src/crawlers/node.js
@@ -30,7 +30,7 @@ function find(
     activeCalls++;
     fs.readdir(directory, (err, names) => {
       activeCalls--;
-      if (!names) {
+      if (err) {
         callback(result);
         return;
       }