[js] Moving from static to const to make js-dossier happy

javascript/node/gendocs.js

@@ -116,6 +116,7 @@ function getModules() {
     path.join(__dirname, 'selenium-webdriver/lib/safari'),
     path.join(__dirname, 'selenium-webdriver/lib/test'),
     path.join(__dirname, 'selenium-webdriver/lib/tools'),
+    path.join(__dirname, 'selenium-webdriver/devtools/generator'),
     path.join(__dirname, 'selenium-webdriver/node_modules'),
     path.join(__dirname, 'selenium-webdriver/test')
   ];

javascript/node/selenium-webdriver/lib/virtual_authenticator.js

@@ -17,30 +17,38 @@
 
 'use strict'
 
+/**
+ * Protocol for virtual authenticators
+ * @enum {string}
+ */
+const Protocol = {
+  'CTAP2': 'ctap2',
+  'U2F': 'ctap1/u2f',
+}
+
+/**
+ * AuthenticatorTransport values
+ * @enum {string}
+ */
+const Transport = {
+  'BLE': 'ble',
+  'USB': 'usb',
+  'NFC': 'nfc',
+  'INTERNAL': 'internal',
+}
+
 /**
  * Options for the creation of virtual authenticators.
  * @see http://w3c.github.io/webauthn/#sctn-automation
  */
 class VirtualAuthenticatorOptions {
 
-  static Protocol = {
-    "CTAP2": 'ctap2',
-    "U2F": 'ctap1/u2f',
-  }
-
-  static Transport = {
-    "BLE": 'ble',
-    "USB": 'usb',
-    "NFC": 'nfc',
-    "INTERNAL": 'internal',
-  }
-
   /**
    * Constructor to initialise VirtualAuthenticatorOptions object.
    */
   constructor() {
-    this._protocol = VirtualAuthenticatorOptions.Protocol["CTAP2"]
-    this._transport = VirtualAuthenticatorOptions.Transport["USB"]
+    this._protocol = Protocol['CTAP2']
+    this._transport = Transport['USB']
     this._hasResidentKey = false
     this._hasUserVerification = false
     this._isUserConsenting = true
@@ -102,8 +110,7 @@ class VirtualAuthenticatorOptions {
       "hasResidentKey": this.getHasResidentKey(),
       "hasUserVerification": this.getHasUserVerification(),
       "isUserConsenting": this.getIsUserConsenting(),
-      "isUserVerified": this.getIsUserVerified(),
-
+      'isUserVerified': this.getIsUserVerified()
     }
   }
 }
@@ -113,14 +120,13 @@ class VirtualAuthenticatorOptions {
  * @see https://w3c.github.io/webauthn/#credential-parameters
  */
 class Credential {
-  constructor(
+  constructor (
     credentialId,
     isResidentCredential,
     rpId,
     userHandle,
     privateKey,
-    signCount
-  ) {
+    signCount) {
     this._id = credentialId
     this._isResidentCredential = isResidentCredential
     this._rpId = rpId
@@ -224,7 +230,8 @@ class Credential {
   }
 }
 
-module.exports = {
-  Credential,
-  VirtualAuthenticatorOptions,
-}
+module.exports.Credential = Credential
+module.exports.VirtualAuthenticatorOptions = VirtualAuthenticatorOptions
+module.exports.Transport = Transport
+module.exports.Protocol = Protocol
+

javascript/node/selenium-webdriver/lib/webdriver.js

@@ -1531,7 +1531,7 @@ class WebDriver {
 
   /**
    * Adds a virtual authenticator with the given options.
-   * @param options VirtualAuthenticatorOptions object to set authenticator optons.
+   * @param options VirtualAuthenticatorOptions object to set authenticator options.
    */
   async addVirtualAuthenticator(options) {
     this.authenticatorId_ = await this.execute(

javascript/node/selenium-webdriver/test/lib/virtualauthenticatoroptions_test.js

@@ -20,6 +20,8 @@
 const assert = require('assert')
 const virtualAuthenticatorOptions =
   require('../../lib/virtual_authenticator').VirtualAuthenticatorOptions
+const Transport = require('../../lib/virtual_authenticator').Transport
+const Protocol = require('../../lib/virtual_authenticator').Protocol
 
 let options
 
@@ -29,34 +31,34 @@ describe('VirtualAuthenticatorOptions', function () {
   })
 
   it('can testSetTransport', function () {
-    options.setTransport(virtualAuthenticatorOptions.Transport['USB'])
+    options.setTransport(Transport['USB'])
     assert.equal(
       options.getTransport(),
-      virtualAuthenticatorOptions.Transport['USB']
+      Transport['USB']
     )
   })
 
   it('can testGetTransport', function () {
-    options._transport = virtualAuthenticatorOptions.Transport['NFC']
+    options._transport = Transport['NFC']
     assert.equal(
       options.getTransport(),
-      virtualAuthenticatorOptions.Transport['NFC']
+      Transport['NFC']
     )
   })
 
   it('can testSetProtocol', function () {
-    options.setProtocol(virtualAuthenticatorOptions.Protocol['U2F'])
+    options.setProtocol(Protocol['U2F'])
     assert.equal(
       options.getProtocol(),
-      virtualAuthenticatorOptions.Protocol['U2F']
+      Protocol['U2F']
     )
   })
 
   it('can testGetProtocol', function () {
-    options._protocol = virtualAuthenticatorOptions.Protocol['CTAP2']
+    options._protocol = Protocol['CTAP2']
     assert.equal(
       options.getProtocol(),
-      virtualAuthenticatorOptions.Protocol['CTAP2']
+      Protocol['CTAP2']
     )
   })
 
@@ -104,11 +106,11 @@ describe('VirtualAuthenticatorOptions', function () {
     let default_options = options.toDict()
     assert.equal(
       default_options['transport'],
-      virtualAuthenticatorOptions.Transport['USB']
+      Transport['USB']
     )
     assert.equal(
       default_options['protocol'],
-      virtualAuthenticatorOptions.Protocol['CTAP2']
+      Protocol['CTAP2']
     )
     assert.equal(default_options['hasResidentKey'], false)
     assert.equal(default_options['hasUserVerification'], false)

javascript/node/selenium-webdriver/test/virtualAuthenticator_test.js

@@ -22,6 +22,7 @@ const virtualAuthenticatorCredential =
   require('../lib/virtual_authenticator').Credential
 const virtualAuthenticatorOptions =
   require('../lib/virtual_authenticator').VirtualAuthenticatorOptions
+const Protocol = require('../lib/virtual_authenticator').Protocol
 const { ignore, suite } = require('../lib/test')
 const { Browser } = require('../lib/capabilities')
 const fileServer = require('../lib/test/fileserver')
@@ -37,7 +38,7 @@ const GET_CREDENTIAL = `getCredential([{
 async function createRkEnabledU2fAuthenticator(driver) {
   let options
   options = new virtualAuthenticatorOptions()
-  options.setProtocol(virtualAuthenticatorOptions.Protocol['U2F'])
+  options.setProtocol(Protocol['U2F'])
   options.setHasResidentKey(true)
   await driver.addVirtualAuthenticator(options)
   return driver
@@ -46,7 +47,7 @@ async function createRkEnabledU2fAuthenticator(driver) {
 async function createRkDisabledU2fAuthenticator(driver) {
   let options
   options = new virtualAuthenticatorOptions()
-  options.setProtocol(virtualAuthenticatorOptions.Protocol['U2F'])
+  options.setProtocol(Protocol['U2F'])
   options.setHasResidentKey(false)
   await driver.addVirtualAuthenticator(options)
   return driver
@@ -55,7 +56,7 @@ async function createRkDisabledU2fAuthenticator(driver) {
 async function createRkEnabledCTAP2Authenticator(driver) {
   let options
   options = new virtualAuthenticatorOptions()
-  options.setProtocol(virtualAuthenticatorOptions.Protocol['CTAP2'])
+  options.setProtocol(Protocol['CTAP2'])
   options.setHasResidentKey(true)
   options.setHasUserVerification(true)
   options.setIsUserVerified(true)
@@ -66,7 +67,7 @@ async function createRkEnabledCTAP2Authenticator(driver) {
 async function createRkDisabledCTAP2Authenticator(driver) {
   let options
   options = new virtualAuthenticatorOptions()
-  options.setProtocol(virtualAuthenticatorOptions.Protocol['CTAP2'])
+  options.setProtocol(Protocol['CTAP2'])
   options.setHasResidentKey(false)
   options.setHasUserVerification(true)
   options.setIsUserVerified(true)

javascript/node/selenium-webdriver/testing/index.js

@@ -88,7 +88,7 @@ function warn(msg) {
  * Extracts the browsers for a test suite to target from the `SELENIUM_BROWSER`
  * environment variable.
  *
- * @return {{name: string, version: string, platform: string}[]} the browsers to target.
+ * @return {{name: string, version: string, platform: string}}[] the browsers to target.
  */
 function getBrowsersToTestFromEnv() {
   let browsers = process.env['SELENIUM_BROWSER']