chore(promises): remove q and jasminewd

Author: cnishina

lib/bpRunner.ts

@@ -1,5 +1,4 @@
 import {ChildProcess, fork} from 'child_process';
-import * as q from 'q';
 
 import {Config} from './config';
 import {Logger} from './logger';
@@ -15,7 +14,7 @@ export class BlockingProxyRunner {
   constructor(private config: Config) {}
 
   start() {
-    return q.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.checkSupportedConfig();
 
       let args = [

lib/driverProviders/sauce.ts

@@ -4,7 +4,6 @@
  * it down, and setting up the driver correctly.
  */
 
-import * as q from 'q';
 import {Session, WebDriver} from 'selenium-webdriver';
 import * as util from 'util';
 

lib/frameworks/debugprint.js

@@ -1,5 +1,4 @@
 var util = require('util'),
-    q = require('q'),
     Logger = require('../logger').Logger;
 
 var logger = new Logger('debugger');
@@ -10,10 +9,10 @@ var logger = new Logger('debugger');
  *
  * @param {Runner} runner The current Protractor Runner.
  * @param {Array} specs Array of Directory Path Strings.
- * @return {q.Promise} Promise resolved with the test results
+ * @return {Promise} Promise resolved with the test results
  */
-exports.run = function(runner, specs) {
-  return q.promise(function(resolve) {
+exports.run = (runner, specs) => {
+  return new Promise(resolve => {
     logger.info('Resolved spec files: ' + util.inspect(specs));
     resolve({
       failedCount: 0

lib/frameworks/explorer.js

@@ -1,7 +1,4 @@
-var q = require('q');
-var webdriver = require('selenium-webdriver');
-
-var RunnerReporter = function(emitter) {
+let RunnerReporter = function(emitter) {
   this.emitter = emitter;
   this.testResult = [],
   this.failedCount = 0;
@@ -18,7 +15,7 @@ RunnerReporter.prototype.specStarted = function() {
 };
 
 RunnerReporter.prototype.specDone = function(result) {
-  var specInfo = {
+  let specInfo = {
     name: result.description,
     category: result.fullName.slice(0, -result.description.length).trim()
   };
@@ -29,7 +26,7 @@ RunnerReporter.prototype.specDone = function(result) {
     this.failedCount++;
   }
 
-  var entry = {
+  let entry = {
     description: result.fullName,
     assertions: [],
     duration: new Date().getTime() - this.startTime.getTime()
@@ -41,7 +38,7 @@ RunnerReporter.prototype.specDone = function(result) {
     });
   }
 
-  result.failedExpectations.forEach(function(item) {
+  result.failedExpectations.forEach(item => {
     entry.assertions.push({
       passed: item.passed,
       errorMsg: item.passed ? undefined : item.message,
@@ -56,23 +53,20 @@ RunnerReporter.prototype.specDone = function(result) {
  *
  * @param {Runner} runner The current Protractor Runner.
  * @param {Array} specs Array of Directory Path Strings.
- * @return {q.Promise} Promise resolved with the test results
+ * @return {Promise} Promise resolved with the test results
  */
-exports.run = function(runner, specs) {
-  var JasmineRunner = require('jasmine');
-  var jrunner = new JasmineRunner();
-  /* global jasmine */
-
-  require('jasminewd2').init(webdriver.promise.controlFlow(), webdriver);
+exports.run = async function(runner, specs) {
+  const JasmineRunner = require('jasmine');
+  let jrunner = new JasmineRunner();
 
-  var jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
+  let 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.
-  var reporter = new RunnerReporter(runner);
+  let reporter = new RunnerReporter(runner);
   jasmine.getEnv().addReporter(reporter);
 
   // Add hooks for afterEach
@@ -100,36 +94,32 @@ exports.run = function(runner, specs) {
     }
   }
 
-  return runner.runTestPreparer().then(function() {
-    return q.promise(function(resolve, reject) {
-      if (jasmineNodeOpts && jasmineNodeOpts.defaultTimeoutInterval) {
-        jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineNodeOpts.defaultTimeoutInterval;
-      }
+  await runner.runTestPreparer();
+  return new Promise((resolve, reject) => {
+    if (jasmineNodeOpts && jasmineNodeOpts.defaultTimeoutInterval) {
+      jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineNodeOpts.defaultTimeoutInterval;
+    }
 
-      var originalOnComplete = runner.getConfig().onComplete;
-
-      jrunner.onComplete(function(passed) {
-        try {
-          var completed = q();
-          if (originalOnComplete) {
-            completed = q(originalOnComplete(passed));
-          }
-          completed.then(function() {
-            resolve({
-              failedCount: reporter.failedCount,
-              specResults: reporter.testResult
-            });
-          });
-        } catch (err) {
-          reject(err);
-        }
-      });
+    let originalOnComplete = runner.getConfig().onComplete;
 
-      jrunner.configureDefaultReporter(jasmineNodeOpts);
-      jrunner.projectBaseDir = '';
-      jrunner.specDir = '';
-      jrunner.addSpecFiles(specs);
-      jrunner.execute();
+    jrunner.onComplete(async(passed) => {
+      try {
+        if (originalOnComplete) {
+          await originalOnComplete(passed);
+        }
+        resolve({
+          failedCount: reporter.failedCount,
+          specResults: reporter.testResult
+        });
+      } catch (err) {
+        reject(err);
+      }
     });
+
+    jrunner.configureDefaultReporter(jasmineNodeOpts);
+    jrunner.projectBaseDir = '';
+    jrunner.specDir = '';
+    jrunner.addSpecFiles(specs);
+    jrunner.execute();
   });
 };