[JS] Code cleanup and minor improvements

harsha509 · harsha509 · commit 944aad294d14 · 2021-12-01T23:51:08.000+05:30
diff --git a/javascript/node/selenium-webdriver/chrome.js b/javascript/node/selenium-webdriver/chrome.js
@@ -286,9 +286,13 @@ Driver.getDefaultService = getDefaultService
 Driver.prototype.VENDOR_COMMAND_PREFIX = 'goog'
 
 // PUBLIC API
-exports.Driver = Driver
-exports.Options = Options
-exports.ServiceBuilder = ServiceBuilder
-exports.getDefaultService = getDefaultService
-exports.setDefaultService = setDefaultService
-exports.locateSynchronously = locateSynchronously
+
+module.exports = {
+  Driver: Driver,
+  Options,
+  ServiceBuilder ,
+  getDefaultService,
+  setDefaultService,
+  locateSynchronously
+}
+
diff --git a/javascript/node/selenium-webdriver/chromium.js b/javascript/node/selenium-webdriver/chromium.js
@@ -105,6 +105,7 @@ const Command = {
 /**
  * Creates a command executor with support for Chromium's custom commands.
  * @param {!Promise<string>} url The server's URL.
+ * @param vendorPrefix
  * @return {!command.Executor} The new command executor.
  */
 function createExecutor(url, vendorPrefix) {
diff --git a/javascript/node/selenium-webdriver/index.js b/javascript/node/selenium-webdriver/index.js
@@ -76,13 +76,12 @@ function startSeleniumServer(jar) {
  * @return {function(new: webdriver.WebDriver, ...?)}
  */
 function ensureFileDetectorsAreEnabled(ctor) {
-  const mixin = class extends ctor {
+  return class extends ctor {
     /** @param {input.FileDetector} detector */
-    setFileDetector(detector) {
+    setFileDetector (detector) {
       webdriver.WebDriver.prototype.setFileDetector.call(this, detector)
     }
   }
-  return mixin
 }
 
 /**
diff --git a/javascript/node/selenium-webdriver/lib/input.js b/javascript/node/selenium-webdriver/lib/input.js
@@ -250,7 +250,7 @@ function checkCodePoint(key) {
   }
 
   key = key.normalize()
-  if (Array.from(key).length != 1) {
+  if (Array.from(key).length !== 1) {
     throw new InvalidArgumentError(
       `key input is not a single code point: ${key}`
     )
diff --git a/javascript/node/selenium-webdriver/lib/promise.js b/javascript/node/selenium-webdriver/lib/promise.js
@@ -262,8 +262,7 @@ async function fullyResolveKeys(obj) {
     ) {
       return
     }
-    let resolvedValue = await fullyResolved(partialValue)
-    obj[key] = resolvedValue
+    obj[key] = await fullyResolved(partialValue)
   })
   return obj
 }
diff --git a/javascript/node/selenium-webdriver/lib/webdriver.js b/javascript/node/selenium-webdriver/lib/webdriver.js
@@ -2994,7 +2994,7 @@ class ShadowRootPromise extends ShadowRoot {
   /**
    * @param {!WebDriver} driver The parent WebDriver instance for this
    *     element.
-   * @param {!Promise<!ShadowRoot>} el A promise
+   * @param {!Promise<!ShadowRoot>} shadow A promise
    *     that will resolve to the promised element.
    */
   constructor(driver, shadow) {
diff --git a/javascript/node/selenium-webdriver/remote/index.js b/javascript/node/selenium-webdriver/remote/index.js
@@ -33,12 +33,12 @@ const portprober = require('../net/portprober')
 /**
  * @typedef {(string|!Array<string|number|!stream.Stream|null|undefined>)}
  */
-var StdIoOptions // eslint-disable-line
+let StdIoOptions // eslint-disable-line
 
 /**
  * @typedef {(string|!IThenable<string>)}
  */
-var CommandLineFlag // eslint-disable-line
+let CommandLineFlag // eslint-disable-line
 
 /**
  * A record object that defines the configuration options for a DriverService
@@ -196,8 +196,8 @@ class DriverService {
       return this.address_
     }
 
-    var timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS
-    var self = this
+    const timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS
+    const self = this
 
     let resolveCommand
     this.command_ = new Promise((resolve) => (resolveCommand = resolve))
@@ -567,7 +567,7 @@ SeleniumServer.Options = class {
  * When a file path on the local machine running this script is entered with
  * {@link webdriver.WebElement#sendKeys WebElement#sendKeys}, this file detector
  * will transfer the specified file to the Selenium server's host; the sendKeys
- * command will be updated to use the transfered file's path.
+ * command will be updated to use the transferred file's path.
  *
  * __Note:__ This class depends on a non-standard command supported on the
  * Java Selenium server. The file detector will fail if used with a server that
@@ -618,7 +618,10 @@ class FileDetector extends input.FileDetector {
 
 // PUBLIC API
 
-exports.DriverService = DriverService
-exports.FileDetector = FileDetector
-exports.SeleniumServer = SeleniumServer
-exports.ServiceOptions = ServiceOptions // Exported for API docs.
+module.exports = {
+  DriverService,
+  FileDetector,
+  SeleniumServer,
+  // Exported for API docs.
+  ServiceOptions
+}
diff --git a/javascript/node/selenium-webdriver/test/actions_test.js b/javascript/node/selenium-webdriver/test/actions_test.js
@@ -107,8 +107,8 @@ test.suite(function (env) {
     // This appears to be a quirk of the timing around mocha tests and not
     // necessarily a bug in the chromedriver.
     // TODO(jleyba): dig into this more so we can remove this hack.
-    describe('dragAndDrop()', function () {
-      it('', async function () {
+   // describe('dragAndDrop()', function () {
+      it('dragAndDrop()', async function () {
         await driver.get(fileServer.whereIs('/data/actions/drag.html'))
 
         let slide = await driver.findElement(By.id('slide'))
@@ -125,7 +125,7 @@ test.suite(function (env) {
         assert.strictEqual(await slide.getCssValue('left'), '206px')
         assert.strictEqual(await slide.getCssValue('top'), '1px')
       })
-    })
+  //  })
 
     it('move()', async function () {
       await driver.get(fileServer.whereIs('/data/actions/drag.html'))
diff --git a/javascript/node/selenium-webdriver/test/chrome/devtools_test.js b/javascript/node/selenium-webdriver/test/chrome/devtools_test.js
@@ -38,7 +38,7 @@ test.suite(
         .setChromeOptions(new chrome.Options().headless())
         .build()
     })
-    after(() => driver.quit())
+    after(async () => await driver.quit())
 
     it('can send commands to devtools', async function () {
       await driver.get(test.Pages.ajaxyPage)
diff --git a/javascript/node/selenium-webdriver/test/chrome/options_test.js b/javascript/node/selenium-webdriver/test/chrome/options_test.js
@@ -145,13 +145,13 @@ test.suite(
 
     describe('Chrome options', function () {
       it('can start Chrome with custom args', async function () {
-        var options = new chrome.Options().addArguments('user-agent=foo;bar')
+        const options = new chrome.Options().addArguments('user-agent=foo;bar')
 
         driver = await env.builder().setChromeOptions(options).build()
 
         await driver.get(test.Pages.ajaxyPage)
 
-        var userAgent = await driver.executeScript(
+        const userAgent = await driver.executeScript(
           'return window.navigator.userAgent'
         )
         assert.strictEqual(userAgent, 'foo;bar')
diff --git a/javascript/node/selenium-webdriver/test/chrome/service_test.js b/javascript/node/selenium-webdriver/test/chrome/service_test.js
@@ -24,7 +24,7 @@ const test = require('../../lib/test')
 test.suite(
   function (_env) {
     describe('chromedriver', function () {
-      var service
+      let service
       afterEach(function () {
         if (service) {
           return service.kill()
diff --git a/javascript/node/selenium-webdriver/test/devtools_test.js b/javascript/node/selenium-webdriver/test/devtools_test.js
@@ -29,10 +29,10 @@ suite(
 
     let driver
 
-    beforeAll(async function () {
+    before(async function () {
       driver = await env.builder().build()
     })
-    afterAll(async () => await driver.quit())
+    after(async () => await driver.quit())
 
     it('sends Page.enable command using devtools', async function () {
       const cdpConnection = await driver.createCDPConnection('page')
diff --git a/javascript/node/selenium-webdriver/test/edge/options_test.js b/javascript/node/selenium-webdriver/test/edge/options_test.js
@@ -132,7 +132,7 @@ describe('edge.Options', function () {
 
 test.suite(
   function (env) {
-    var driver
+    let driver
 
     beforeEach(function() {
       driver = null;
@@ -144,7 +144,7 @@ test.suite(
 
     describe('Edge options', function () {
       it('can start edge with custom args', async function () {
-        var options = new edge.Options().addArguments('user-agent=foo;bar')
+        const options = new edge.Options().addArguments('user-agent=foo;bar')
 
         driver = await env.builder().setEdgeOptions(options).build()
 
diff --git a/javascript/node/selenium-webdriver/test/http/http_test.js b/javascript/node/selenium-webdriver/test/http/http_test.js
@@ -30,26 +30,26 @@ describe('HttpClient', function () {
     // eslint-disable-next-line node/no-deprecated-api
     const parsedUrl = url.parse(req.url)
 
-    if (req.method == 'GET' && req.url == '/echo') {
+    if (req.method === 'GET' && req.url === '/echo') {
       res.writeHead(200)
       res.end(JSON.stringify(req.headers))
-    } else if (req.method == 'GET' && req.url == '/redirect') {
+    } else if (req.method === 'GET' && req.url === '/redirect') {
       res.writeHead(303, { Location: server.url('/hello') })
       res.end()
-    } else if (req.method == 'GET' && req.url == '/hello') {
+    } else if (req.method === 'GET' && req.url === '/hello') {
       res.writeHead(200, { 'content-type': 'text/plain' })
       res.end('hello, world!')
-    } else if (req.method == 'GET' && req.url == '/chunked') {
+    } else if (req.method === 'GET' && req.url === '/chunked') {
       res.writeHead(200, {
         'content-type': 'text/html; charset=utf-8',
         'transfer-encoding': 'chunked',
       })
       res.write('<!DOCTYPE html>')
       setTimeout(() => res.end('<h1>Hello, world!</h1>'), 20)
-    } else if (req.method == 'GET' && req.url == '/badredirect') {
+    } else if (req.method === 'GET' && req.url === '/badredirect') {
       res.writeHead(303, {})
       res.end()
-    } else if (req.method == 'GET' && req.url == '/protected') {
+    } else if (req.method === 'GET' && req.url === '/protected') {
       const denyAccess = function () {
         res.writeHead(401, { 'WWW-Authenticate': 'Basic realm="test"' })
         res.end('Access denied')
@@ -74,7 +74,7 @@ describe('HttpClient', function () {
       res.writeHead(200, { 'content-type': 'text/plain' })
       res.end('Access granted!')
     } else if (
-      req.method == 'GET' &&
+      req.method === 'GET' &&
       parsedUrl.pathname &&
       parsedUrl.pathname.endsWith('/proxy')
     ) {
@@ -83,7 +83,7 @@ describe('HttpClient', function () {
       res.writeHead(200, headers)
       res.end()
     } else if (
-      req.method == 'GET' &&
+      req.method === 'GET' &&
       parsedUrl.pathname &&
       parsedUrl.pathname.endsWith('/proxy/redirect')
     ) {
diff --git a/javascript/node/selenium-webdriver/test/http/util_test.js b/javascript/node/selenium-webdriver/test/http/util_test.js
@@ -24,15 +24,15 @@ const error = require('../../lib/error')
 const util = require('../../http/util')
 
 describe('selenium-webdriver/http/util', function () {
-  var server, baseUrl
+  let server, baseUrl
 
-  var status, value, responseCode
+  let status, value, responseCode
 
   function startServer(done) {
     if (server) return done()
 
     server = http.createServer(function (_req, res) {
-      var data = JSON.stringify({ status: status, value: value })
+      const data = JSON.stringify({ status: status, value: value })
       res.writeHead(responseCode, {
         'Content-Type': 'application/json; charset=utf-8',
         'Content-Length': Buffer.byteLength(data, 'utf8'),
@@ -43,7 +43,7 @@ describe('selenium-webdriver/http/util', function () {
     server.listen(0, '127.0.0.1', function (e) {
       if (e) return done(e)
 
-      var addr = server.address()
+      const addr = server.address()
       baseUrl = 'http://' + addr.address + ':' + addr.port
       done()
     })
@@ -139,7 +139,7 @@ describe('selenium-webdriver/http/util', function () {
     it('can cancel wait', function () {
       status = 1
       let cancel = new Promise((resolve) => {
-        setTimeout((_) => resolve(), 50)
+        setTimeout(() => resolve(), 50)
       })
       return util.waitForServer(baseUrl, 200, cancel).then(
         () => {
@@ -189,7 +189,7 @@ describe('selenium-webdriver/http/util', function () {
     it('can cancel wait', function () {
       responseCode = 404
       let cancel = new Promise((resolve) => {
-        setTimeout((_) => resolve(), 50)
+        setTimeout(() => resolve(), 50)
       })
       return util.waitForUrl(baseUrl, 200, cancel).then(
         () => {
diff --git a/javascript/node/selenium-webdriver/test/io/io_test.js b/javascript/node/selenium-webdriver/test/io/io_test.js
@@ -17,15 +17,15 @@
 
 'use strict'
 
-var assert = require('assert'),
+const assert = require('assert'),
   fs = require('fs'),
   path = require('path')
 
-var io = require('../../io')
+const io = require('../../io')
 
 describe('io', function () {
   describe('copy', function () {
-    var tmpDir
+    let tmpDir
 
     before(function () {
       return io.tmpDir().then(function (d) {
@@ -229,7 +229,7 @@ describe('io', function () {
   })
 
   describe('unlink', function () {
-    var dir
+    let dir
 
     before(function () {
       return io.tmpDir().then(function (d) {
@@ -242,7 +242,7 @@ describe('io', function () {
     })
 
     it('deletes files', function () {
-      var file = path.join(dir, 'foo')
+      const file = path.join(dir, 'foo')
       fs.writeFileSync(file, '')
       return io
         .exists(file)
@@ -339,7 +339,7 @@ describe('io', function () {
   })
 
   describe('read', function () {
-    var tmpDir
+    let tmpDir
 
     before(function () {
       return io.tmpDir().then(function (d) {
diff --git a/javascript/node/selenium-webdriver/test/lib/by_test.js b/javascript/node/selenium-webdriver/test/lib/by_test.js
@@ -17,8 +17,8 @@
 
 'use strict'
 
-var assert = require('assert')
-var by = require('../../lib/by')
+const assert = require('assert')
+const by = require('../../lib/by')
 
 describe('by', function () {
   describe('By', function () {
diff --git a/javascript/node/selenium-webdriver/test/lib/capabilities_test.js b/javascript/node/selenium-webdriver/test/lib/capabilities_test.js
@@ -208,7 +208,7 @@ test.suite(function (env) {
           'File took longer than 10 seconds to upload!'
         )
 
-        var frame = await driver.findElement(By.id('upload_target'))
+        const frame = await driver.findElement(By.id('upload_target'))
         await driver.switchTo().frame(frame)
         assert.strictEqual(
           await driver.findElement(By.css('body')).getText(),
diff --git a/javascript/node/selenium-webdriver/test/lib/http_test.js b/javascript/node/selenium-webdriver/test/lib/http_test.js
diff --git a/javascript/node/selenium-webdriver/test/lib/webdriver_test.js b/javascript/node/selenium-webdriver/test/lib/webdriver_test.js
diff --git a/javascript/node/selenium-webdriver/test/net/index_test.js b/javascript/node/selenium-webdriver/test/net/index_test.js
diff --git a/javascript/node/selenium-webdriver/test/net/portprober_test.js b/javascript/node/selenium-webdriver/test/net/portprober_test.js

Original file line number	Diff line number	Diff line change
`@@ -76,13 +76,12 @@ function startSeleniumServer(jar) {`
`76`	`76`	`* @return {function(new: webdriver.WebDriver, ...?)}`
`77`	`77`	`*/`
`78`	`78`	`function ensureFileDetectorsAreEnabled(ctor) {`
`79`		`- const mixin = class extends ctor {`
	`79`	`+ return class extends ctor {`
`80`	`80`	`/** @param {input.FileDetector} detector */`
`81`		`- setFileDetector(detector) {`
	`81`	`+ setFileDetector (detector) {`
`82`	`82`	`webdriver.WebDriver.prototype.setFileDetector.call(this, detector)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`- return mixin`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ function checkCodePoint(key) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`key = key.normalize()`
`253`		`- if (Array.from(key).length != 1) {`
	`253`	`+ if (Array.from(key).length !== 1) {`
`254`	`254`	`throw new InvalidArgumentError(`
`255`	`255`	`key input is not a single code point: ${key}`
`256`	`256`	`)`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ async function fullyResolveKeys(obj) {`
`262`	`262`	`) {`
`263`	`263`	`return`
`264`	`264`	`}`
`265`		`- let resolvedValue = await fullyResolved(partialValue)`
`266`		`- obj[key] = resolvedValue`
	`265`	`+ obj[key] = await fullyResolved(partialValue)`
`267`	`266`	`})`
`268`	`267`	`return obj`
`269`	`268`	`}`