resolve comments

Author: cnishina

lib/launcher.ts

@@ -12,6 +12,7 @@ import {Runner} from './runner';
 import {TaskRunner} from './taskRunner';
 import {TaskScheduler} from './taskScheduler';
 import * as helper from './util';
+import { reject } from 'q';
 
 let logger = new Logger('launcher');
 let RUNNERS_FAILED_EXIT_CODE = 100;
@@ -141,7 +142,7 @@ let initFn = async function(configFile: string, additionalConfig: Config) {
 
   // 3) If we're in `elementExplorer` mode, run only that.
   if (config.elementExplorer || config.framework === 'explorer') {
-    if (config.multiCapabilities.length != 1) {
+    if (config.multiCapabilities.length !== 1) {
       throw new Error('Must specify only 1 browser while using elementExplorer');
     } else {
       config.capabilities = config.multiCapabilities[0];
@@ -195,7 +196,7 @@ let initFn = async function(configFile: string, additionalConfig: Config) {
   // Run afterlaunch and exit
   const cleanUpAndExit = async (exitCode: number) => {
     try {
-      let returned =
+      const returned =
           await helper.runFilenameOrFn_(config.configDir, config.afterLaunch, [exitCode]);
       if (typeof returned === 'number') {
         process.exit(returned);
@@ -208,7 +209,7 @@ let initFn = async function(configFile: string, additionalConfig: Config) {
     }
   };
 
-  let totalTasks = scheduler.numTasksOutstanding();
+  const totalTasks = scheduler.numTasksOutstanding();
   let forkProcess = false;
   if (totalTasks > 1) {  // Start new processes only if there are >1 tasks.
     forkProcess = true;
@@ -219,35 +220,35 @@ let initFn = async function(configFile: string, additionalConfig: Config) {
   }
 
   const createNextTaskRunner = async () => {
-    return new Promise(resolve => {
-      let task = scheduler.nextTask();
+    return new Promise(async (resolve) => {
+      const task = scheduler.nextTask();
       if (task) {
-        let taskRunner = new TaskRunner(configFile, additionalConfig, task, forkProcess);
-        taskRunner.run()
-            .then(async (result) => {
-              if (result.exitCode && !result.failedCount) {
-                logger.error(
-                    'Runner process exited unexpectedly with error code: ' + result.exitCode);
-              }
-              taskResults_.add(result);
-              task.done();
-              createNextTaskRunner();
-              // If all tasks are finished
-              if (scheduler.numTasksOutstanding() === 0) {
-                resolve();
-              }
-              logger.info(scheduler.countActiveTasks() + ' instance(s) of WebDriver still running');
-            })
-            .catch(async (err: Error) => {
-              const errorCode = ErrorHandler.parseError(err);
-              logger.error('Error:', (err as any).stack || err.message || err);
-              await cleanUpAndExit(errorCode ? errorCode : RUNNERS_FAILED_EXIT_CODE);
-            });
+        const taskRunner = new TaskRunner(configFile, additionalConfig, task, forkProcess);
+        try {
+          const result = await taskRunner.run();
+          if (result.exitCode && !result.failedCount) {
+            logger.error(
+                'Runner process exited unexpectedly with error code: ' + result.exitCode);
+          }
+          taskResults_.add(result);
+          task.done();
+          createNextTaskRunner();
+          // If all tasks are finished
+          if (scheduler.numTasksOutstanding() === 0) {
+            resolve();
+          }
+          logger.info(scheduler.countActiveTasks() + ' instance(s) of WebDriver still running');
+        } catch (err) {
+          const errorCode = ErrorHandler.parseError(err);
+          logger.error('Error:', (err as any).stack || err.message || err);
+          await cleanUpAndExit(errorCode ? errorCode : RUNNERS_FAILED_EXIT_CODE);
+        }
       }
     });
   };
 
-  for (let i = 0; i < scheduler.maxConcurrentTasks(); ++i) {
+  const maxConcurrentTasks = scheduler.maxConcurrentTasks();
+  for (let i = 0; i < maxConcurrentTasks; ++i) {
     await createNextTaskRunner();
   }
   logger.info('Running ' + scheduler.countActiveTasks() + ' instances of WebDriver');

lib/runner.ts

@@ -144,7 +144,7 @@ export class Runner extends EventEmitter {
    * @param {int} Standard unix exit code
    */
   async exit_(exitCode: number): Promise<number> {
-    let returned =
+    const returned =
         await helper.runFilenameOrFn_(this.config_.configDir, this.config_.onCleanUp, [exitCode]);
     if (typeof returned === 'number') {
       return returned;
@@ -366,7 +366,7 @@ export class Runner extends EventEmitter {
     browser_ = this.createBrowser(plugins);
     this.setupGlobals_(browser_);
     try {
-      let session = await browser_.ready.then(browser_.getSession);
+      const session = await browser_.ready.then(browser_.getSession);
       logger.debug(
           'WebDriver session successfully started with capabilities ' +
           util.inspect(session.getCapabilities()));