utils.js: fix lookupFiles()

mochajs · Apr 26, 2019 · 03da22c · 03da22c
1 parent 847a331
commit 03da22c
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -576,24 +576,22 @@ exports.lookupFiles = function lookupFiles(filepath, extensions, recursive) {
 
   if (!fs.existsSync(filepath)) {
     // check all extensions
-    if (
-      !extensions.some(function(ext) {
-        if (fs.existsSync(filepath + '.' + ext)) {
-          filepath += '.' + ext;
-          return true;
-        }
-      })
-    ) {
+    extensions.forEach(function(ext) {
+      if (fs.existsSync(filepath + '.' + ext)) {
+        files.push(filepath + '.' + ext);
+      }
+    });
+    if (!files.length) {
       // Handle glob
       files = glob.sync(filepath);
-      if (!files.length) {
-        throw createNoFilesMatchPatternError(
-          'Cannot find any files matching pattern ' + exports.dQuote(filepath),
-          filepath
-        );
-      }
-      return files;
     }
+    if (!files.length) {
+      throw createNoFilesMatchPatternError(
+        'Cannot find any files matching pattern ' + exports.dQuote(filepath),
+        filepath
+      );
+    }
+    return files;
   }
 
   // Handle file