Created runTestAndWait as a wrapper around runtest

Author: Siddhantshukla814

lib/webpagetest.js

@@ -5,6 +5,7 @@
  * Released under the MIT License
  */
 
+const { Console } = require("console");
 var http = require("http"),
   https = require("https"),
   url = require("url"),
@@ -395,6 +396,11 @@ function runTest(what, options, callback) {
       (!data || (data && data.data && data.statusCode !== 200)) &&
       !(typeof err === "number" && data === undefined)
     ) {
+      console.log(
+        data && data.data && data.data.statusText
+          ? data.data.statusText
+          : "Testing is in progress, please be patient"
+      );
       polling = setTimeout(
         getTestResults.bind(this, testId, resultsOptions, poll.bind(this)),
         options.pollResults
@@ -531,199 +537,15 @@ function runTest(what, options, callback) {
 }
 
 function runTestAndWait(what, options, callback) {
-  delete options.pollResults;
+  delete options.pollResults, options.timeout;
   delete options.timeout;
-  options = Object.assign(options, { pollResults: 10 });
-
-  var query = {};
-
-  callback = callback || options;
-  options = options === callback ? {} : helper.deepClone(options);
-
-  // testing url or script?
-  query[reSpace.test(what) ? "script" : "url"] = what;
-  // set dummy url when scripting, needed when webdriver script
-  if (query.script) {
-    query.url = "https://www.webpagetest.org";
-  }
-  helper.setQuery(mapping.commands.test, options, query);
-
-  // connectivity
-  if (reConnectivity.test(options.connectivity) && query.location) {
-    query.location += "." + options.connectivity;
-  }
-
-  // json output format
-  query.f = "json";
-
-  // API key
-  if (!query.k && this.config.key) {
-    query.k = this.config.key;
-  }
-
-  // synchronous tests with results
-  var testId,
-    polling,
-    server,
-    listen,
-    timerout,
-    resultsOptions = {};
-
-  function resultsCallback(err, data) {
-    clearTimeout(timerout);
-    if (options.exitOnResults) {
-      process.exit(err);
-    } else {
-      callback(err, data);
-    }
-  }
-
-  function poll(err, data) {
-    // poll again when test started but not complete
-    // and not when specs are done testing
-    if (
-      !err &&
-      (!data || (data && data.data && data.statusCode !== 200)) &&
-      !(typeof err === "number" && data === undefined)
-    ) {
-      console.log(
-        data && data.data && data.data.statusText
-          ? data.data.statusText
-          : "Testing in progress"
-      );
-      polling = setTimeout(
-        getTestResults.bind(this, testId, resultsOptions, poll.bind(this)),
-        options.pollResults
-      );
-    } else {
-      if (!data) {
-        data = { testId: testId };
-      }
-      resultsCallback(err, data);
-    }
-  }
-
-  function testCallback(cb, err, data) {
-    if (err || !(data && data.data && data.data.testId)) {
-      return callback(err || data);
-    }
-
-    testId = data.data.testId;
-
-    if (options.timeout) {
-      timerout = setTimeout(timeout, options.timeout);
-    }
-
-    if (cb) {
-      cb.call(this);
-    }
-  }
-
-  function timeout() {
-    if (server) {
-      server.close();
-    }
-    clearTimeout(polling);
-    callback({
-      error: {
-        code: "TIMEOUT",
-        testId: testId,
-        message: "timeout",
-      },
-    });
-  }
-
-  function listener() {
-    query.pingback = url.format({
-      protocol: "http",
-      hostname: options.waitResults.hostname,
-      port: options.waitResults.port,
-      pathname: "/testdone",
-    });
-
-    api.call(this, paths.test, testCallback.bind(this, null), query, options);
-  }
-
-  function wait() {
-    server.listen(options.waitResults.port, listen);
-    return options.waitResults;
-  }
-
-  // poll|wait results timeout
-  if (options.timeout) {
-    options.timeout = (parseInt(options.timeout, 10) || 0) * 1000;
-  }
 
-  // poll|wait results options
-  Object.keys(mapping.options.results).forEach(function resultsOpts(key) {
-    var name = mapping.options.results[key].name,
-      value = options[name] || options[key];
+  options = Object.assign(options, { pollResults: 10 });
 
-    if (value !== undefined) {
-      resultsOptions[name] = value;
-    }
+  new Promise((resolve) => {
+    let test = runTest.bind(this, what, options, callback);
+    resolve(test());
   });
-
-  // poll results
-  if (options.pollResults && !options.dryRun) {
-    options.pollResults = parseInt(options.pollResults * 1000, 10) || 5000;
-
-    return api.call(
-      this,
-      paths.test,
-      testCallback.bind(this, poll),
-      query,
-      options
-    );
-  }
-
-  // wait results
-  if (options.waitResults && !options.dryRun) {
-    options.waitResults = helper.localhost(
-      options.waitResults,
-      WebPageTest.defaultWaitResultsPort
-    );
-
-    listen = listener.bind(this);
-
-    server = http.createServer(
-      function (req, res) {
-        var uri = url.parse(req.url, true);
-
-        res.statusCode = 204;
-        res.end();
-
-        if (uri.pathname === "/testdone" && uri.query.id === testId) {
-          server.close(
-            getTestResults.bind(
-              this,
-              uri.query.id,
-              resultsOptions,
-              resultsCallback
-            )
-          );
-        }
-      }.bind(this)
-    );
-
-    server.on(
-      "error",
-      function (err) {
-        if (["EACCES", "EADDRINUSE"].indexOf(err.code) > -1) {
-          // remove old unused listener and bump port for next attempt
-          server.removeListener("listening", listen);
-          options.waitResults.port++;
-          wait.call(this);
-        } else {
-          callback(err);
-        }
-      }.bind(this)
-    );
-
-    return wait.call(this);
-  }
-
-  return api.call(this, paths.test, callback, query, options);
 }
 
 function restartTest(id, options, callback) {