selenium-webdriver 2.48.2 → 2.53.3

package/http/util.js

@@ -19,36 +19,29 @@
  * @fileoverview Various HTTP utilities.
  */
 
-var base = require('../_base'),
+'use strict';
+
+const Executor = require('./index').Executor,
     HttpClient = require('./index').HttpClient,
-    checkResponse = base.require('bot.response').checkResponse,
-    Executor = base.require('webdriver.http.Executor'),
-    HttpRequest = base.require('webdriver.http.Request'),
-    Command = base.require('webdriver.Command'),
-    CommandName = base.require('webdriver.CommandName'),
-    promise = base.require('webdriver.promise');
+    HttpRequest = require('./index').Request,
+    Command = require('../lib/command').Command,
+    CommandName = require('../lib/command').Name,
+    error = require('../lib/error'),
+    promise = require('../lib/promise');
 
 
 
 /**
  * Queries a WebDriver server for its current status.
  * @param {string} url Base URL of the server to query.
- * @param {function(Error, *=)} callback The function to call with the
- *     response.
+ * @return {!promise.Promise.<!Object>} A promise that resolves with
+ *     a hash of the server status.
  */
-function getStatus(url, callback) {
+function getStatus(url) {
   var client = new HttpClient(url);
   var executor = new Executor(client);
   var command = new Command(CommandName.GET_SERVER_STATUS);
-  executor.execute(command, function(err, responseObj) {
-    if (err) return callback(err);
-    try {
-      checkResponse(responseObj);
-    } catch (ex) {
-      return callback(ex);
-    }
-    callback(null, responseObj['value']);
-  });
+  return executor.execute(command);
 }
 
 
@@ -58,31 +51,36 @@ function getStatus(url, callback) {
 /**
  * Queries a WebDriver server for its current status.
  * @param {string} url Base URL of the server to query.
- * @return {!webdriver.promise.Promise.<!Object>} A promise that resolves with
+ * @return {!promise.Promise.<!Object>} A promise that resolves with
  *     a hash of the server status.
  */
-exports.getStatus = function(url) {
-  return promise.checkedNodeCall(getStatus.bind(null, url));
-};
+exports.getStatus = getStatus;
 
 
 /**
  * Waits for a WebDriver server to be healthy and accepting requests.
  * @param {string} url Base URL of the server to query.
  * @param {number} timeout How long to wait for the server.
- * @return {!webdriver.promise.Promise} A promise that will resolve when the
+ * @return {!promise.Promise} A promise that will resolve when the
  *     server is ready.
  */
 exports.waitForServer = function(url, timeout) {
   var ready = promise.defer(),
-      start = Date.now(),
-      checkServerStatus = getStatus.bind(null, url, onResponse);
+      start = Date.now();
   checkServerStatus();
   return ready.promise;
 
-  function onResponse(err) {
-    if (!ready.isPending()) return;
-    if (!err) return ready.fulfill();
+  function checkServerStatus() {
+    return getStatus(url).then(ready.fulfill, onError);
+  }
+
+  function onError(e) {
+    // Some servers don't support the status command. If they are able to
+    // response with an error, then can consider the server ready.
+    if (e instanceof error.UnsupportedOperationError) {
+      ready.fulfill();
+      return;
+    }
 
     if (Date.now() - start > timeout) {
       ready.reject(
@@ -103,24 +101,22 @@ exports.waitForServer = function(url, timeout) {
  * timeout expires.
  * @param {string} url The URL to poll.
  * @param {number} timeout How long to wait, in milliseconds.
- * @return {!webdriver.promise.Promise} A promise that will resolve when the
+ * @return {!promise.Promise} A promise that will resolve when the
  *     URL responds with 2xx.
  */
 exports.waitForUrl = function(url, timeout) {
   var client = new HttpClient(url),
       request = new HttpRequest('GET', ''),
-      testUrl = client.send.bind(client, request, onResponse),
       ready = promise.defer(),
       start = Date.now();
   testUrl();
   return ready.promise;
 
-  function onResponse(err, response) {
-    if (!ready.isPending()) return;
-    if (!err && response.status > 199 && response.status < 300) {
-      return ready.fulfill();
-    }
+  function testUrl() {
+    client.send(request).then(onResponse, onError);
+  }
 
+  function onError() {
     if (Date.now() - start > timeout) {
       ready.reject(Error(
           'Timed out waiting for the URL to return 2xx: ' + url));
@@ -132,4 +128,12 @@ exports.waitForUrl = function(url, timeout) {
       }, 50);
     }
   }
+
+  function onResponse(response) {
+    if (!ready.isPending()) return;
+    if (response.status > 199 && response.status < 300) {
+      return ready.fulfill();
+    }
+    onError();
+  }
 };