address PR comments

Author: cnishina

lib/frameworks/jasmine.js

@@ -15,7 +15,7 @@ RunnerReporter.prototype.specStarted = function() {
 };
 
 RunnerReporter.prototype.specDone = function(result) {
-  let specInfo = {
+  const specInfo = {
     name: result.description,
     category: result.fullName.slice(0, -result.description.length).trim()
   };
@@ -26,7 +26,7 @@ RunnerReporter.prototype.specDone = function(result) {
     this.failedCount++;
   }
 
-  let entry = {
+  const entry = {
     description: result.fullName,
     assertions: [],
     duration: new Date().getTime() - this.startTime.getTime()
@@ -57,16 +57,16 @@ RunnerReporter.prototype.specDone = function(result) {
  */
 exports.run = async function(runner, specs) {
   const JasmineRunner = require('jasmine');
-  let jrunner = new JasmineRunner();
+  const jrunner = new JasmineRunner();
 
-  let jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
+  const jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
 
   // On timeout, the flow should be reset. This will prevent webdriver tasks
   // from overflowing into the next test and causing it to fail or timeout
   // as well. This is done in the reporter instead of an afterEach block
   // to ensure that it runs after any afterEach() blocks with webdriver tasks
   // get to complete first.
-  let reporter = new RunnerReporter(runner);
+  const reporter = new RunnerReporter(runner);
   jasmine.getEnv().addReporter(reporter);
 
   // Add hooks for afterEach
@@ -100,7 +100,7 @@ exports.run = async function(runner, specs) {
       jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineNodeOpts.defaultTimeoutInterval;
     }
 
-    let originalOnComplete = runner.getConfig().onComplete;
+    const originalOnComplete = runner.getConfig().onComplete;
 
     jrunner.onComplete(async(passed) => {
       try {

lib/frameworks/mocha.js

@@ -7,7 +7,7 @@
  */
 exports.run = (runner, specs) => {
   const Mocha = require('mocha');
-  let mocha = new Mocha(runner.getConfig().mochaOpts);
+  const mocha = new Mocha(runner.getConfig().mochaOpts);
 
   // Add hooks for afterEach
   require('./setupAfterEach').setup(runner, specs);
@@ -130,4 +130,4 @@ exports.run = (runner, specs) => {
       reject(err);
     }
   });  
-};
+};

lib/util.ts

@@ -34,36 +34,34 @@ export function filterStackTrace(text: string): string {
  * @param {Array.<object>}} args The args to pass into filenameOrFn.
  * @return {Promise} A promise that will resolve when filenameOrFn completes.
  */
-export function runFilenameOrFn_(configDir: string, filenameOrFn: any, args?: any[]): Promise<any> {
-  return new Promise(async (resolve) => {
-    if (filenameOrFn && !(typeof filenameOrFn === 'string' || typeof filenameOrFn === 'function')) {
-      throw new Error('filenameOrFn must be a string or function');
-    }
+export async function runFilenameOrFn_(configDir: string, filenameOrFn: any, args?: any[]): Promise<any> {
+  if (filenameOrFn && !(typeof filenameOrFn === 'string' || typeof filenameOrFn === 'function')) {
+    throw new Error('filenameOrFn must be a string or function');
+  }
 
-    if (typeof filenameOrFn === 'string') {
-      filenameOrFn = require(path.resolve(configDir, filenameOrFn));
-    }
-    if (typeof filenameOrFn === 'function') {
-      let results;
-      try {
-        results = await filenameOrFn.apply(null, args);
-      } catch (err) {
-        if (typeof err === 'string') {
-          err = new Error(err);
-        } else {
-          err = err as Error;
-          if (!err.stack) {
-            err.stack = new Error().stack;
-          }
+  if (typeof filenameOrFn === 'string') {
+    filenameOrFn = require(path.resolve(configDir, filenameOrFn));
+  }
+  if (typeof filenameOrFn === 'function') {
+    let results;
+    try {
+      results = await filenameOrFn.apply(null, args);
+    } catch (err) {
+      if (typeof err === 'string') {
+        err = new Error(err);
+      } else {
+        err = err as Error;
+        if (!err.stack) {
+          err.stack = new Error().stack;
         }
-        err.stack = exports.filterStackTrace(err.stack);
-        throw err;
       }
-      resolve(results);
-    } else {
-      resolve(undefined);
+      err.stack = exports.filterStackTrace(err.stack);
+      throw err;
     }
-  });
+    return results;
+  } else {
+    return undefined;
+  }
 }
 
 /**

spec/driverProviderTest.js

@@ -48,7 +48,8 @@ testDriverProvider(new Direct(chromeConfig)).
     then(() => {
       console.log('direct.dp with chrome working!');
     }, (err) => {
-      console.log('direct.dp with chrome failed with', err);
+      console.error('direct.dp with chrome failed with', err);
+      throw err;
     });
 
 const firefoxConfig = {
@@ -60,7 +61,8 @@ testDriverProvider(new Direct(firefoxConfig)).
     then(() => {
       console.log('direct.dp with firefox working!');
     }, (err) => {
-      console.log('direct.dp with firefox failed with', err);
+      console.error('direct.dp with firefox failed with', err);
+      throw err;
     });
 
 const hostedConfig = {
@@ -73,7 +75,8 @@ testDriverProvider(new Hosted(hostedConfig)).
     then(() => {
       console.log('hosted.dp working!');
     }, (err) => {
-      console.log('hosted.dp failed with', err);
+      console.error('hosted.dp failed with', err);
+      throw err;
     });
 
 const hostedPromisedConfig = {
@@ -86,7 +89,8 @@ testDriverProvider(new Hosted(hostedPromisedConfig)).
     then(() => {
       console.log('hosted.dp with promises working!');
     }, (err) => {
-      console.log('hosted.dp with promises failed with', err);
+      console.error('hosted.dp with promises failed with', err);
+      throw err;
     });
 
 const localConfig = {
@@ -99,7 +103,8 @@ testDriverProvider(new Local(localConfig)).
     then(() => {
       console.log('local.dp working!');
     }, (err) => {
-      console.log('local.dp failed with', err);
+      console.error('local.dp failed with', err);
+      throw err;
     });
 
 if (argv.sauceUser && argv.sauceKey) {
@@ -115,7 +120,8 @@ if (argv.sauceUser && argv.sauceKey) {
       then(() => {
         console.log('sauce.dp working!');
       }, (err) => {
-        console.log('sauce.dp failed with', err);
+        console.error('sauce.dp failed with', err);
+        throw err;
       });
 }
 
@@ -133,6 +139,7 @@ if (argv.browserstackUser && argv.browserstackKey) {
       then(() => {
         console.log('browserstack.dp working!');
       }, (err) => {
-        console.log('browserstack.dp failed with', err);
+        console.error('browserstack.dp failed with', err);
+        throw err;
       });
-}
+}