[js] Remove a bunch of deprecated stuff

SeleniumHQ · Jun 9, 2016 · 9f51796 · 9f51796
1 parent 85abf9d
commit 9f51796
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 586 deletions.
diff --git a/javascript/node/selenium-webdriver/CHANGES.md b/javascript/node/selenium-webdriver/CHANGES.md
@@ -1,4 +1,4 @@
-## v2.54.0-dev
+## v3.0.0-dev
 
 * Allow users to set the agent used for HTTP connections through
    `builder.Builder#usingHttpAgent()`
@@ -9,8 +9,25 @@
 * Internal cleanup replacing uses of managed promises with native promises
 * Removed the mandatory use of Firefox Dev Edition, when using Marionette driver
 * Fixed timeouts' URL
-* Removed the deprecated `webdriver.UnhandledAlertError`, which was just an
-   alias for `error.UnexpectedAlertOpenError`
+* Removed deprecated modules:
+   - `selenium-webdriver/error` (use `selenium-webdriver/lib/error`,\
+     or the `error` property exported by `selenium-webdriver`)
+* Removed deprecated types:
+   - `error.InvalidSessionIdError` (use `error.NoSuchSessionError`)
+   - `executors.DeferredExecutor` (use `command.DeferredExecutor`)
+   - `until.Condition` (use `webdriver.Condition`)
+   - `until.WebElementCondition` (use `webdriver.WebElementCondition`)
+   - `webdriver.UnhandledAlertError` (use `error.UnexpectedAlertOpenError`)
+* Removed deprecated functions:
+   - `Promise#thenCatch()`
+   - `Promise#thenFinally()`
+   - `WebDriver#isElementPresent()`
+   - `WebElement#getInnerHtml()`
+   - `WebElement#getOuterHtml()`
+   - `WebElement#getRawId()`
+   - `WebElement#isElementPresent()`
+* Removed deprecated properties:
+   - `WebDriverError#code`
 
 
 ## v2.53.2

diff --git a/javascript/node/selenium-webdriver/chrome.js b/javascript/node/selenium-webdriver/chrome.js
@@ -155,7 +155,7 @@ const Command = {
  * @return {!command.Executor} The new command executor.
  */
 function createExecutor(url) {
-  return new executors.DeferredExecutor(url.then(url => {
+  return new command.DeferredExecutor(url.then(url => {
     let client = new http.HttpClient(url);
     let executor = new http.Executor(client);
     executor.defineCommand(

diff --git a/javascript/node/selenium-webdriver/edge.js b/javascript/node/selenium-webdriver/edge.js
@@ -355,7 +355,7 @@ class Driver extends webdriver.WebDriver {
 
     /** @override */
     this.quit = function() {
-      return boundQuit().thenFinally(service.kill.bind(service));
+      return boundQuit().finally(service.kill.bind(service));
     };
   }
 

diff --git a/javascript/node/selenium-webdriver/error.js b/javascript/node/selenium-webdriver/error.js
diff --git a/javascript/node/selenium-webdriver/executors.js b/javascript/node/selenium-webdriver/executors.js
@@ -30,9 +30,6 @@ const HttpClient = require('./http').HttpClient,
 // PUBLIC API
 
 
-/** @deprecated Use {@link ./lib/command.DeferredExecutor} instead. */
-exports.DeferredExecutor = DeferredExecutor;
-
 /**
  * Creates a command executor that uses WebDriver's JSON wire protocol.
  * @param {(string|!Promise<string>)} url The server's URL, or a promise that

diff --git a/javascript/node/selenium-webdriver/ie.js b/javascript/node/selenium-webdriver/ie.js
@@ -423,7 +423,7 @@ class Driver extends webdriver.WebDriver {
 
     /** @override */
     this.quit = function() {
-      return boundQuit().thenFinally(service.kill.bind(service));
+      return boundQuit().finally(service.kill.bind(service));
     };
   }
 

diff --git a/javascript/node/selenium-webdriver/io/index.js b/javascript/node/selenium-webdriver/io/index.js
@@ -65,7 +65,7 @@ exports.rmDir = function(dirPath) {
       numAttempts += 1;
       rimraf(dirPath, function(err) {
         if (err) {
-          if (err.code === 'ENOTEMPTY' && numAttempts < 2) {
+          if (err.code && err.code === 'ENOTEMPTY' && numAttempts < 2) {
             attemptRm();
             return;
           }

diff --git a/javascript/node/selenium-webdriver/lib/actions.js b/javascript/node/selenium-webdriver/lib/actions.js
@@ -144,7 +144,7 @@ class ActionSequence {
     if (typeof location.x === 'number') {
       setOffset(/** @type {{x: number, y: number}} */(location));
     } else {
-      cmd.setParameter('element', location.getRawId());
+      cmd.setParameter('element', location.getId());
       if (opt_offset) {
         setOffset(opt_offset);
       }