js: remove a bunch of deprecated functions

Author: jleyba

Diff for: javascript/node/selenium-webdriver/CHANGES.md

@@ -1,5 +1,14 @@
 ## v2.46.0-dev
 
+* Removed deprecated functions:
+    * Capabilities#toJSON()
+    * UnhandledAlertError#getAlert()
+    * chrome.createDriver()
+    * phantomjs.createDriver()
+    * promise.ControlFlow#annotateError()
+    * promise.ControlFlow#await()
+    * promise.ControlFlow#clearHistory()
+    * promise.ControlFlow#getHistory()
 * Removed deprecated enum values: `ErrorCode.NO_MODAL_DIALOG_OPEN` and
     `ErrorCode.MODAL_DIALOG_OPENED`. Use `ErrorCode.NO_SUCH_ALERT` and
     `ErrorCode.UNEXPECTED_ALERT_OPEN`, respectively.

Diff for: javascript/node/selenium-webdriver/chrome.js

@@ -753,21 +753,6 @@ Options.prototype.serialize = function() {
 };
 
 
-/**
- * Creates a new ChromeDriver session.
- * @param {(webdriver.Capabilities|Options)=} opt_options The session options.
- * @param {remote.DriverService=} opt_service The session to use; will use
- *     the {@linkplain #getDefaultService default service} by default.
- * @param {webdriver.promise.ControlFlow=} opt_flow The control flow to use, or
- *     {@code null} to use the currently active flow.
- * @return {!webdriver.WebDriver} A new WebDriver instance.
- * @deprecated Use {@link Driver new Driver()}.
- */
-function createDriver(opt_options, opt_service, opt_flow) {
-  return new Driver(opt_options, opt_service, opt_flow);
-}
-
-
 /**
  * Creates a new WebDriver client for Chrome.
  *
@@ -812,6 +797,5 @@ Driver.prototype.setFileDetector = function() {
 exports.Driver = Driver;
 exports.Options = Options;
 exports.ServiceBuilder = ServiceBuilder;
-exports.createDriver = createDriver;
 exports.getDefaultService = getDefaultService;
 exports.setDefaultService = setDefaultService;

Diff for: javascript/node/selenium-webdriver/phantomjs.js

@@ -108,19 +108,6 @@ var WEBDRIVER_TO_PHANTOMJS_LEVEL = (function() {
 })();
 
 
-/**
- * Creates a new PhantomJS WebDriver client.
- * @param {webdriver.Capabilities=} opt_capabilities The desired capabilities.
- * @param {webdriver.promise.ControlFlow=} opt_flow The control flow to use, or
- *     {@code null} to use the currently active flow.
- * @return {!webdriver.WebDriver} A new WebDriver instance.
- * @deprecated Use {@link Driver}.
- */
-function createDriver(opt_capabilities, opt_flow) {
-  return new Driver(opt_capabilities, opt_flow);
-}
-
-
 /**
  * Creates a command executor with support for PhantomJS' custom commands.
  * @param {!webdriver.promise.Promise<string>} url The server's URL.
@@ -274,4 +261,3 @@ Driver.prototype.executePhantomJS = function(script, args) {
 // PUBLIC API
 
 exports.Driver = Driver;
-exports.createDriver = createDriver;

Diff for: javascript/webdriver/capabilities.js

@@ -284,16 +284,6 @@ webdriver.Capabilities.htmlunitwithjs = function() {
 };
 
 
-/**
- * @return {!Object} The JSON representation of this instance.
- * @deprecated Use {@link #serialize} since a component capability may be a
- *     promised value.
- */
-webdriver.Capabilities.prototype.toJSON = function() {
-  return this.caps_;
-};
-
-
 /**
  * @return {!Object.<string, ?>} The JSON representation of this instance. Note,
  *    the returned object may contain nested promises that are promised values.

Diff for: javascript/webdriver/promise.js

@@ -1353,40 +1353,6 @@ promise.ControlFlow.prototype.reset = function() {
 };
 
 
-/**
- * Returns a summary of the recent task activity for this instance. This
- * includes the most recently completed task, as well as any parent tasks. In
- * the returned summary, the task at index N is considered a sub-task of the
- * task at index N+1.
- * @return {!Array<string>} A summary of this instance's recent task
- *     activity.
- * @deprecated Now a no-op; will be removed in 2.46.0.
- */
-promise.ControlFlow.prototype.getHistory = function() {
-  return [];
-};
-
-
-/**
- * Clears this instance's task history.
- * @deprecated Now a no-op; will be removed in 2.46.0.
- */
-promise.ControlFlow.prototype.clearHistory = function() {};
-
-
-/**
- * Appends a summary of this instance's recent task history to the given
- * error's stack trace. This function will also ensure the error's stack trace
- * is in canonical form.
- * @param {!(Error|goog.testing.JsUnitException)} e The error to annotate.
- * @return {!(Error|goog.testing.JsUnitException)} The annotated error.
- * @deprecated Now a no-op; will be removed in 2.46.0.
- */
-promise.ControlFlow.prototype.annotateError = function(e) {
-  return e;
-};
-
-
 /**
  * Generates an annotated string describing the internal state of this control
  * flow, including the currently executing as well as pending tasks. If
@@ -1638,21 +1604,6 @@ promise.ControlFlow.prototype.wait = function(
 };
 
 
-/**
- * Schedules a task that will wait for another promise to resolve.  The resolved
- * promise's value will be returned as the task result.
- * @param {!promise.Promise} promise The promise to wait on.
- * @return {!promise.Promise} A promise that will resolve when the
- *     task has completed.
- * @deprecated Use {@link #wait() wait(promise)} instead.
- */
-promise.ControlFlow.prototype.await = function(promise) {
-  return this.execute(function() {
-    return promise;
-  });
-};
-
-
 /**
  * Schedules the interval for this instance's event loop, if necessary.
  * @private

Diff for: javascript/webdriver/test/webdriver_test.js

@@ -2079,9 +2079,7 @@ function testInterceptsAndTransformsUnhandledAlertErrors() {
   var driver = testHelper.createDriver();
   return driver.findElement(By.id('foo')).then(fail, function(e) {
     assertTrue(e instanceof webdriver.UnhandledAlertError);
-    return e.getAlert().getText();
-  }).then(function(text) {
-    assertEquals('hello', text);
+    assertEquals('hello', e.getAlertText());
   });
 }
 
@@ -2095,9 +2093,7 @@ testUnhandledAlertErrors_usesEmptyStringIfAlertTextOmittedFromResponse() {
   var driver = testHelper.createDriver();
   return driver.findElement(By.id('foo')).then(fail, function(e) {
     assertTrue(e instanceof webdriver.UnhandledAlertError);
-    return e.getAlert().getText();
-  }).then(function(text) {
-    assertEquals('', text);
+    assertEquals('', e.getAlertText());
   });
 }
 

Diff for: javascript/webdriver/testing/testcase.js

@@ -150,7 +150,6 @@ webdriver.testing.TestCase.prototype.logError = function(name, opt_e) {
  */
 webdriver.testing.TestCase.prototype.runSingleTest_ = function(test, onError) {
   var flow = webdriver.promise.controlFlow();
-  flow.clearHistory();
 
   return execute(test.name + '.setUp()', this.setUp)().
       then(execute(test.name + '()', test.ref)).

Diff for: javascript/webdriver/webdriver.js

@@ -2449,16 +2449,6 @@ webdriver.UnhandledAlertError.prototype.getAlertText = function() {
 };
 
 
-/**
- * @return {!webdriver.Alert} The open alert.
- * @deprecated Use {@link #getAlertText}. This method will be removed in
- *     2.45.0.
- */
-webdriver.UnhandledAlertError.prototype.getAlert = function() {
-  return this.alert_;
-};
-
-
 
 /**
  * Used with {@link webdriver.WebElement#sendKeys WebElement#sendKeys} on file