maint: updated glob API and removed strict

Author: gnikit

src/lib/glob-paths.ts

@@ -51,7 +51,7 @@ export class GlobPaths {
       const globIncPaths: string[] = [];
       for (const i of globPathsVars) {
         // use '/' to match only directories and not files
-        globIncPaths.push(...glob.sync(i + '/', { strict: false }));
+        globIncPaths.push(...glob.sync(i + '/'));
       }
       return globIncPaths;
       // if we failed again then our globs are somehow wrong. Abort

test/integration/index.ts

@@ -1,8 +1,8 @@
 import path from 'path';
 import Mocha from 'mocha';
-import glob from 'glob';
+import { glob } from 'glob';
 
-export function run(): Promise<void> {
+export async function run(): Promise<void> {
   // Create the mocha test
   const mocha = new Mocha({
     ui: 'tdd',
@@ -11,28 +11,30 @@ export function run(): Promise<void> {
 
   const testsRoot = __dirname;
 
-  return new Promise((c, e) => {
-    glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-      if (err) {
-        return e(err);
-      }
+  // Use glob promise API to find files
+  const files = await glob('**/**.test.js', { cwd: testsRoot });
 
-      // Add files to the test suite
-      files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+  // Add files to the test suite
+  files.forEach((f: string) => {
+    mocha.addFile(path.join(testsRoot, f));
+  });
+
+  // Run the mocha test
+  mocha.timeout(300000);
+  const runner = mocha.run();
 
-      try {
-        // Run the mocha test
-        mocha.timeout(900000);
-        mocha.run(failures => {
-          if (failures > 0) {
-            e(new Error(`${failures} tests failed.`));
-          } else {
-            c();
-          }
-        });
-      } catch (err) {
-        e(err);
-      }
+  // Wait for the test runner to complete
+  const failures = await new Promise<number>((resolve, reject) => {
+    runner.on('end', () => {
+      resolve(runner.failures);
+    });
+    runner.on('fail', (test: Mocha.Test, err: Error) => {
+      reject(err);
     });
   });
+
+  // Throw an error if there were any test failures
+  if (failures > 0) {
+    throw new Error(`${failures} tests failed.`);
+  }
 }

test/unitTest/index.ts

@@ -1,8 +1,8 @@
 import path from 'path';
 import Mocha from 'mocha';
-import glob from 'glob';
+import { glob } from 'glob';
 
-export function run(): Promise<void> {
+export async function run(): Promise<void> {
   // Create the mocha test
   const mocha = new Mocha({
     ui: 'tdd',
@@ -11,28 +11,30 @@ export function run(): Promise<void> {
 
   const testsRoot = __dirname;
 
-  return new Promise((c, e) => {
-    glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-      if (err) {
-        return e(err);
-      }
+  // Use glob promise API to find files
+  const files = await glob('**/**.test.js', { cwd: testsRoot });
 
-      // Add files to the test suite
-      files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+  // Add files to the test suite
+  files.forEach((f: string) => {
+    mocha.addFile(path.join(testsRoot, f));
+  });
+
+  // Run the mocha test
+  mocha.timeout(300000);
+  const runner = mocha.run();
 
-      try {
-        // Run the mocha test
-        mocha.timeout(300000);
-        mocha.run(failures => {
-          if (failures > 0) {
-            e(new Error(`${failures} tests failed.`));
-          } else {
-            c();
-          }
-        });
-      } catch (err) {
-        e(err);
-      }
+  // Wait for the test runner to complete
+  const failures = await new Promise<number>((resolve, reject) => {
+    runner.on('end', () => {
+      resolve(runner.failures);
+    });
+    runner.on('fail', (test: Mocha.Test, err: Error) => {
+      reject(err);
     });
   });
+
+  // Throw an error if there were any test failures
+  if (failures > 0) {
+    throw new Error(`${failures} tests failed.`);
+  }
 }