selenium-webdriver 4.19.0 → 4.21.0

package/eslint.config.js

@@ -0,0 +1,107 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+const globals = require('globals')
+const noOnlyTests = require('eslint-plugin-no-only-tests')
+const js = require('@eslint/js')
+const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended')
+const mochaPlugin = require('eslint-plugin-mocha')
+const nodePlugin = require('eslint-plugin-n')
+
+module.exports = [
+  js.configs.recommended,
+  eslintPluginPrettierRecommended,
+  mochaPlugin.configs.flat.recommended,
+  nodePlugin.configs['flat/recommended-script'],
+  {
+    languageOptions: {
+      globals: {
+        mocha: true,
+        es6: true,
+        ...globals.node,
+      },
+      parserOptions: {
+        ecmaVersion: 2022,
+      },
+    },
+    files: ['**/*.js', 'lib/http.js'],
+    ignores: ['node_modules/*', 'generator/*', 'devtools/generator/'],
+    plugins: {
+      'no-only-tests': noOnlyTests,
+    },
+    rules: {
+      'no-const-assign': 'error',
+      'no-this-before-super': 'error',
+      'no-undef': 'error',
+      'no-unreachable': 'error',
+      'no-unused-vars': [
+        'error',
+        {
+          varsIgnorePattern: '^_',
+          args: 'all',
+          argsIgnorePattern: '^_',
+        },
+      ],
+      'constructor-super': 'error',
+      'valid-typeof': 'error',
+      'no-only-tests/no-only-tests': 'error',
+      'n/no-deprecated-api': ['error'],
+      'n/no-missing-import': ['error'],
+      'n/no-missing-require': ['error'],
+      'n/no-mixed-requires': ['error'],
+      'n/no-new-require': ['error'],
+      'n/no-unpublished-import': ['error'],
+      'n/no-unpublished-require': [
+        'error',
+        {
+          allowModules: [
+            'globals',
+            '@eslint/js',
+            'eslint-plugin-mocha',
+            'eslint-plugin-prettier',
+            'eslint-plugin-n',
+            'eslint-plugin-no-only-tests',
+          ],
+          tryExtensions: ['.js'],
+        },
+      ],
+      'n/prefer-node-protocol': ['error'],
+      'mocha/no-skipped-tests': ['off'],
+      'mocha/no-mocha-arrows': ['off'],
+      'mocha/no-setup-in-describe': ['off'],
+      'mocha/no-top-level-hooks': ['off'],
+      'mocha/no-sibling-hooks': ['off'],
+      'mocha/no-exports': ['off'],
+      'mocha/no-empty-description': ['off'],
+      'mocha/max-top-level-suites': ['off'],
+      'mocha/consistent-spacing-between-blocks': ['off'],
+      'mocha/no-nested-tests': ['off'],
+      'mocha/no-pending-tests': ['off'],
+      'mocha/no-identical-title': ['off'],
+      'prettier/prettier': [
+        'error',
+        {
+          endOfLine: 'lf',
+          printWidth: 120,
+          semi: false,
+          singleQuote: true,
+          trailingComma: 'all',
+        },
+      ],
+    },
+  },
+]

package/firefox.js

@@ -107,8 +107,8 @@
 
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const Symbols = require('./lib/symbols')
 const command = require('./lib/command')
 const http = require('./http')
@@ -116,9 +116,9 @@ const io = require('./io')
 const remote = require('./remote')
 const webdriver = require('./lib/webdriver')
 const zip = require('./io/zip')
-const { Browser, Capabilities } = require('./lib/capabilities')
+const { Browser, Capabilities, Capability } = require('./lib/capabilities')
 const { Zip } = require('./io/zip')
-const { getPath } = require('./common/driverFinder')
+const { getBinaryPaths } = require('./common/driverFinder')
 const FIREFOX_CAPABILITY_KEY = 'moz:firefoxOptions'
 
 /**
@@ -444,6 +444,7 @@ const ExtensionCommand = {
   SET_CONTEXT: 'setContext',
   INSTALL_ADDON: 'install addon',
   UNINSTALL_ADDON: 'uninstall addon',
+  FULL_PAGE_SCREENSHOT: 'fullPage screenshot',
 }
 
 /**
@@ -470,6 +471,8 @@ function configureExecutor(executor) {
   executor.defineCommand(ExtensionCommand.INSTALL_ADDON, 'POST', '/session/:sessionId/moz/addon/install')
 
   executor.defineCommand(ExtensionCommand.UNINSTALL_ADDON, 'POST', '/session/:sessionId/moz/addon/uninstall')
+
+  executor.defineCommand(ExtensionCommand.FULL_PAGE_SCREENSHOT, 'GET', '/session/:sessionId/moz/screenshot/full')
 }
 
 /**
@@ -538,7 +541,7 @@ class Driver extends webdriver.WebDriver {
       configureExecutor(executor)
     } else if (opt_executor instanceof remote.DriverService) {
       if (!opt_executor.getExecutable()) {
-        const { driverPath, browserPath } = getPath(caps)
+        const { driverPath, browserPath } = getBinaryPaths(caps)
         opt_executor.setExecutable(driverPath)
         firefoxBrowserPath = browserPath
       }
@@ -547,7 +550,7 @@ class Driver extends webdriver.WebDriver {
     } else {
       let service = new ServiceBuilder().build()
       if (!service.getExecutable()) {
-        const { driverPath, browserPath } = getPath(caps)
+        const { driverPath, browserPath } = getBinaryPaths(caps)
         service.setExecutable(driverPath)
         firefoxBrowserPath = browserPath
       }
@@ -563,6 +566,7 @@ class Driver extends webdriver.WebDriver {
       } else {
         caps.set(FIREFOX_CAPABILITY_KEY, { binary: firefoxBrowserPath })
       }
+      caps.delete(Capability.BROWSER_VERSION)
     }
 
     return /** @type {!Driver} */ (super.createSession(executor, caps, onQuit))
@@ -645,6 +649,16 @@ class Driver extends webdriver.WebDriver {
     id = await Promise.resolve(id)
     return this.execute(new command.Command(ExtensionCommand.UNINSTALL_ADDON).setParameter('id', id))
   }
+
+  /**
+   * Take full page screenshot of the visible region
+   *
+   * @return {!Promise<string>} A promise that will be
+   *     resolved to the screenshot as a base-64 encoded PNG.
+   */
+  takeFullPageScreenshot() {
+    return this.execute(new command.Command(ExtensionCommand.FULL_PAGE_SCREENSHOT))
+  }
 }
 
 /**

package/http/index.js

@@ -22,9 +22,9 @@
 
 'use strict'
 
-const http = require('http')
-const https = require('https')
-const url = require('url')
+const http = require('node:http')
+const https = require('node:https')
+const url = require('node:url')
 
 const httpLib = require('../lib/http')
 
@@ -45,7 +45,7 @@ let RequestOptions // eslint-disable-line
  * @throws {Error} if the URL does not include a hostname.
  */
 function getRequestOptions(aUrl) {
-  //eslint-disable-next-line node/no-deprecated-api
+  // eslint-disable-next-line n/no-deprecated-api
   let options = url.parse(aUrl)
   if (!options.hostname) {
     throw new Error('Invalid URL: ' + aUrl)
@@ -140,7 +140,7 @@ class HttpClient {
     } else {
       path += httpRequest.path
     }
-    //eslint-disable-next-line node/no-deprecated-api
+    // eslint-disable-next-line n/no-deprecated-api
     let parsedPath = url.parse(path)
 
     let options = {
@@ -218,7 +218,7 @@ function sendRequest(options, onOk, onError, opt_data, opt_proxy, opt_retries) {
     if (response.statusCode == 302 || response.statusCode == 303) {
       let location
       try {
-        // eslint-disable-next-line node/no-deprecated-api
+        // eslint-disable-next-line n/no-deprecated-api
         location = url.parse(response.headers['location'])
       } catch (ex) {
         onError(

package/ie.js

@@ -33,7 +33,7 @@ const remote = require('./remote')
 const webdriver = require('./lib/webdriver')
 const { Browser, Capabilities } = require('./lib/capabilities')
 const error = require('./lib/error')
-const { getPath } = require('./common/driverFinder')
+const { getBinaryPaths } = require('./common/driverFinder')
 
 const OPTIONS_CAPABILITY_KEY = 'se:ieOptions'
 const SCROLL_BEHAVIOUR = {
@@ -223,7 +223,9 @@ class Options extends Capabilities {
 
   addBrowserCommandSwitches(...args) {
     let current = this.options_[Key.BROWSER_COMMAND_LINE_SWITCHES] || []
-    if (typeof current == 'string') current = current.split(' ')
+    if (typeof current == 'string') {
+      current = current.split(' ')
+    }
     this.options_[Key.BROWSER_COMMAND_LINE_SWITCHES] = current.concat(args).join(' ')
     return this
   }
@@ -239,7 +241,9 @@ class Options extends Capabilities {
 
   addArguments(...args) {
     let current = this.options_[Key.BROWSER_COMMAND_LINE_SWITCHES] || []
-    if (typeof current == 'string') current = current.split(' ')
+    if (typeof current == 'string') {
+      current = current.split(' ')
+    }
     this.options_[Key.BROWSER_COMMAND_LINE_SWITCHES] = current.concat(args).join(' ')
     return this
   }
@@ -447,7 +451,7 @@ class Driver extends webdriver.WebDriver {
       service = createServiceFromCapabilities(options)
     }
     if (!service.getExecutable()) {
-      service.setExecutable(getPath(options).driverPath)
+      service.setExecutable(getBinaryPaths(options).driverPath)
     }
 
     let client = service.start().then((url) => new http.HttpClient(url))

package/index.js

@@ -596,6 +596,17 @@ class Builder {
 
     browser = capabilities.get(Capability.BROWSER_NAME)
 
+    /**
+     * If browser is not defined in forBrowser, check if browserOptions are defined to pick the browserName
+     */
+    if (!browser) {
+      const options =
+        this.chromeOptions_ || this.firefoxOptions_ || this.ieOptions_ || this.safariOptions_ || this.edgeOptions_
+      if (options) {
+        browser = options['map_'].get(Capability.BROWSER_NAME)
+      }
+    }
+
     if (typeof browser !== 'string') {
       throw TypeError(
         `Target browser must be a string, but is <${typeof browser}>;` + ' did you forget to call forBrowser()?',

package/io/exec.js

@@ -17,7 +17,7 @@
 
 'use strict'
 
-const childProcess = require('child_process')
+const childProcess = require('node:child_process')
 
 /**
  * Options for configuring an executed command.

package/io/index.js

@@ -17,8 +17,8 @@
 
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const tmp = require('tmp')
 
 /**
@@ -219,6 +219,7 @@ function findInPath(file, opt_checkCwd) {
     try {
       let stats = fs.statSync(tmp)
       return stats.isFile() && !stats.isDirectory()
+      /*eslint no-unused-vars: "off"*/
     } catch (ex) {
       return false
     }

package/io/zip.js

@@ -18,7 +18,7 @@
 'use strict'
 
 const jszip = require('jszip')
-const path = require('path')
+const path = require('node:path')
 
 const io = require('./index')
 const { InvalidArgumentError } = require('../lib/error')

package/lib/atoms/find-elements.js

@@ -106,8 +106,8 @@ function gd(a){var b=a.shape.toLowerCase();a=a.coords.split(",");if("rect"==b&&4
 function hd(a){return a.replace(/^[^\S\xa0]+|[^\S\xa0]+$/g,"")}function id(a){var b=[];Yc?jd(a,b):kd(a,b);a=qa(b,hd);return hd(a.join("\n")).replace(/\xa0/g," ")}
 function ld(a,b,c){if(S(a,"BR"))b.push("");else{var d=S(a,"TD"),e=U(a,"display"),f=!d&&!(0<=oa(md,e)),g=void 0!==a.previousElementSibling?a.previousElementSibling:gb(a.previousSibling);g=g?U(g,"display"):"";var h=U(a,"float")||U(a,"cssFloat")||U(a,"styleFloat");!f||"run-in"==g&&"none"==h||/^[\s\xa0]*$/.test(b[b.length-1]||"")||b.push("");var n=ed(a),u=null,p=null;n&&(u=U(a,"white-space"),p=U(a,"text-transform"));l(a.childNodes,function(G){c(G,b,n,u,p)});a=b[b.length-1]||"";!d&&"table-cell"!=e||!a||
 za(a)||(b[b.length-1]+=" ");f&&"run-in"!=e&&!/^[\s\xa0]*$/.test(a)&&b.push("")}}function kd(a,b){ld(a,b,function(c,d,e,f,g){3==c.nodeType&&e?nd(c,d,f,g):S(c)&&kd(c,d)})}var md="inline inline-block inline-table none table-cell table-column table-column-group".split(" ");
-function nd(a,b,c,d){a=a.nodeValue.replace(/[\u200b\u200e\u200f]/g,"");a=a.replace(/(\r\n|\r|\n)/g,"\n");if("normal"==c||"nowrap"==c)a=a.replace(/\n/g," ");a="pre"==c||"pre-wrap"==c?a.replace(/[ \f\t\v\u2028\u2029]/g,"\u00a0"):a.replace(/[ \f\t\v\u2028\u2029]+/g," ");"capitalize"==d?a=a.replace(t?/(^|\s|\b)(\S)/g:/(^|[^\d\p{L}\p{S}])([\p{Ll}|\p{S}])/gu,function(e,f,g){return f+g.toUpperCase()}):"uppercase"==d?a=a.toUpperCase():"lowercase"==d&&(a=a.toLowerCase());c=b.pop()||"";za(c)&&0==a.lastIndexOf(" ",
-0)&&(a=a.substr(1));b.push(c+a)}function dd(a){if(Mc){if("relative"==U(a,"position"))return 1;a=U(a,"filter");return(a=a.match(/^alpha\(opacity=(\d*)\)/)||a.match(/^progid:DXImageTransform.Microsoft.Alpha\(Opacity=(\d*)\)/))?Number(a[1])/100:1}return od(a)}function od(a){var b=1,c=U(a,"opacity");c&&(b=Number(c));(a=Zc(a))&&(b*=od(a));return b}
+function nd(a,b,c,d){a=a.nodeValue.replace(/[\u200b\u200e\u200f]/g,"");a=a.replace(/(\r\n|\r|\n)/g,"\n");if("normal"==c||"nowrap"==c)a=a.replace(/\n/g," ");a="pre"==c||"pre-wrap"==c?a.replace(/[ \f\t\v\u2028\u2029]/g,"\u00a0"):a.replace(/[ \f\t\v\u2028\u2029]+/g," ");"capitalize"==d?a=a.replace(t?/(^|\s|\b)(\S)/g:/(^|\s|\b)(\S)/gu,function(e,f,g){return f+g.toUpperCase()}):"uppercase"==d?a=a.toUpperCase():"lowercase"==d&&(a=a.toLowerCase());c=b.pop()||"";za(c)&&0==a.lastIndexOf(" ",0)&&(a=a.substr(1));
+b.push(c+a)}function dd(a){if(Mc){if("relative"==U(a,"position"))return 1;a=U(a,"filter");return(a=a.match(/^alpha\(opacity=(\d*)\)/)||a.match(/^progid:DXImageTransform.Microsoft.Alpha\(Opacity=(\d*)\)/))?Number(a[1])/100:1}return od(a)}function od(a){var b=1,c=U(a,"opacity");c&&(b=Number(c));(a=Zc(a))&&(b*=od(a));return b}
 function pd(a,b,c,d,e){if(3==a.nodeType&&c)nd(a,b,d,e);else if(S(a))if(S(a,"CONTENT")||S(a,"SLOT")){for(var f=a;f.parentNode;)f=f.parentNode;f instanceof ShadowRoot?(f=S(a,"CONTENT")?a.getDistributedNodes():a.assignedNodes(),l(0<f.length?f:a.childNodes,function(g){pd(g,b,c,d,e)})):jd(a,b)}else if(S(a,"SHADOW")){for(f=a;f.parentNode;)f=f.parentNode;if(f instanceof ShadowRoot&&(a=f))for(a=a.olderShadowRoot;a;)l(a.childNodes,function(g){pd(g,b,c,d,e)}),a=a.olderShadowRoot}else jd(a,b)}
 function jd(a,b){a.shadowRoot&&l(a.shadowRoot.childNodes,function(c){pd(c,b,!0,null,null)});ld(a,b,function(c,d,e,f,g){var h=null;1==c.nodeType?h=c:3==c.nodeType&&(h=c);null!=h&&(null!=h.assignedSlot||h.getDestinationInsertionPoints&&0<h.getDestinationInsertionPoints().length)||pd(c,d,e,f,g)})};var qd={C:function(a,b){return!(!a.querySelectorAll||!a.querySelector)&&!/^\d.*/.test(b)},o:function(a,b){var c=eb(b),d="string"===typeof a?c.a.getElementById(a):a;return d?Uc(d,"id")==a&&b!=d&&hb(b,d)?d:ua(mb(c,"*"),function(e){return Uc(e,"id")==a&&b!=e&&hb(b,e)}):null},j:function(a,b){if(!a)return[];if(qd.C(b,a))try{return b.querySelectorAll("#"+qd.T(a))}catch(c){return[]}b=mb(eb(b),"*",null,b);return pa(b,function(c){return Uc(c,"id")==a})},T:function(a){return a.replace(/([\s'"\\#.:;,!?+<>=~*^$|%&@`{}\-\/\[\]\(\)])/g,
 "\\$1")}};var X={},rd={};X.N=function(a,b,c){try{var d=Nc.j("a",b)}catch(e){d=mb(eb(b),"A",null,b)}return ua(d,function(e){e=id(e);e=e.replace(/^[\s]+|[\s]+$/g,"");return c&&-1!=e.indexOf(a)||e==a})};X.K=function(a,b,c){try{var d=Nc.j("a",b)}catch(e){d=mb(eb(b),"A",null,b)}return pa(d,function(e){e=id(e);e=e.replace(/^[\s]+|[\s]+$/g,"");return c&&-1!=e.indexOf(a)||e==a})};X.o=function(a,b){return X.N(a,b,!1)};X.j=function(a,b){return X.K(a,b,!1)};rd.o=function(a,b){return X.N(a,b,!0)};

package/lib/http.js

@@ -25,7 +25,7 @@
 
 'use strict'
 
-const path = require('path')
+const path = require('node:path')
 const cmd = require('./command')
 const error = require('./error')
 const logging = require('./logging')
@@ -161,10 +161,10 @@ function resource(method, path) {
 }
 
 /** @typedef {{method: string, path: string}} */
-var CommandSpec // eslint-disable-line
+var CommandSpec
 
 /** @typedef {function(!cmd.Command): !cmd.Command} */
-var CommandTransformer // eslint-disable-line
+var CommandTransformer
 
 class InternalTypeError extends TypeError {}
 
@@ -337,7 +337,7 @@ class Client {
    * @return {!Promise<Response>} A promise that will be fulfilled with the
    *     server's response.
    */
-  send(httpRequest) {} // eslint-disable-line
+  send(httpRequest) {}
 }
 
 /**
@@ -472,6 +472,7 @@ class Executor {
 function tryParse(str) {
   try {
     return JSON.parse(str)
+    /*eslint no-unused-vars: "off"*/
   } catch (ignored) {
     // Do nothing.
   }

package/lib/input.js

@@ -162,7 +162,6 @@ class FileDetector {
    * @package
    */
   handleFile(_driver, path) {
-    // eslint-disable-line
     return Promise.resolve(path)
   }
 }

package/lib/pinnedScript.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 
 class PinnedScript {
   constructor(script) {

package/lib/select.js

@@ -36,7 +36,7 @@
 
 'use strict'
 
-const { By, escapeCss } = require('./by')
+const { By } = require('./by')
 const error = require('./error')
 
 /**
@@ -51,23 +51,23 @@ class ISelect {
    * @return {!Promise<boolean>} Whether this select element supports selecting multiple options at the same time? This
    * is done by checking the value of the "multiple" attribute.
    */
-  isMultiple() {} // eslint-disable-line
+  isMultiple() {}
 
   /**
    * @return {!Promise<!Array<!WebElement>>} All options belonging to this select tag
    */
-  getOptions() {} // eslint-disable-line
+  getOptions() {}
 
   /**
    * @return {!Promise<!Array<!WebElement>>} All selected options belonging to this select tag
    */
-  getAllSelectedOptions() {} // eslint-disable-line
+  getAllSelectedOptions() {}
 
   /**
    * @return {!Promise<!WebElement>} The first selected option in this select tag (or the currently selected option in a
    * normal select)
    */
-  getFirstSelectedOption() {} // eslint-disable-line
+  getFirstSelectedOption() {}
 
   /**
    * Select all options that display text matching the argument. That is, when given "Bar" this
@@ -105,7 +105,7 @@ class ISelect {
    *
    * @return {Promise<void>}
    */
-  deselectAll() {} // eslint-disable-line
+  deselectAll() {}
 
   /**
    * Deselect all options that display text matching the argument. That is, when given "Bar" this
@@ -146,6 +146,10 @@ class Select {
    * @param {WebElement} element Select WebElement.
    */
   constructor(element) {
+    if (element === null) {
+      throw new Error(`Element must not be null. Please provide a valid <select> element.`)
+    }
+
     this.element = element
 
     this.element.getAttribute('tagName').then(function (tagName) {
@@ -153,6 +157,10 @@ class Select {
         throw new Error(`Select only works on <select> elements`)
       }
     })
+
+    this.element.getAttribute('multiple').then((multiple) => {
+      this.multiple = multiple !== null && multiple !== 'false'
+    })
   }
 
   /**
@@ -216,9 +224,7 @@ class Select {
     let matched = false
     let isMulti = await this.isMultiple()
 
-    let options = await this.element.findElements({
-      css: 'option[value =' + escapeCss(value) + ']',
-    })
+    let options = await this.element.findElements(By.xpath('.//option[@value = ' + escapeQuotes(value) + ']'))
 
     for (let option of options) {
       await this.setSelected(option)
@@ -254,30 +260,46 @@ class Select {
   async selectByVisibleText(text) {
     text = typeof text === 'number' ? text.toString() : text
 
-    const normalized = text
-      .trim() // strip leading and trailing white-space characters
-      .replace(/\s+/, ' ') // replace sequences of whitespace characters by a single space
+    const xpath = './/option[normalize-space(.) = ' + escapeQuotes(text) + ']'
 
-    /**
-     * find option element using xpath
-     */
-    const formatted = /"/.test(normalized)
-      ? 'concat("' + normalized.split('"').join('", \'"\', "') + '")'
-      : `"${normalized}"`
-    const dotFormat = `[. = ${formatted}]`
-    const spaceFormat = `[normalize-space(text()) = ${formatted}]`
-
-    const selections = [
-      `./option${dotFormat}`,
-      `./option${spaceFormat}`,
-      `./optgroup/option${dotFormat}`,
-      `./optgroup/option${spaceFormat}`,
-    ]
-
-    const optionElement = await this.element.findElement({
-      xpath: selections.join('|'),
-    })
-    await this.setSelected(optionElement)
+    const options = await this.element.findElements(By.xpath(xpath))
+
+    for (let option of options) {
+      await this.setSelected(option)
+      if (!(await this.isMultiple())) {
+        return
+      }
+    }
+
+    let matched = Array.isArray(options) && options.length > 0
+
+    if (!matched && text.includes(' ')) {
+      const subStringWithoutSpace = getLongestSubstringWithoutSpace(text)
+      let candidates
+      if ('' === subStringWithoutSpace) {
+        candidates = await this.element.findElements(By.tagName('option'))
+      } else {
+        const xpath = './/option[contains(., ' + escapeQuotes(subStringWithoutSpace) + ')]'
+        candidates = await this.element.findElements(By.xpath(xpath))
+      }
+
+      const trimmed = text.trim()
+
+      for (let option of candidates) {
+        const optionText = await option.getText()
+        if (trimmed === optionText.trim()) {
+          await this.setSelected(option)
+          if (!(await this.isMultiple())) {
+            return
+          }
+          matched = true
+        }
+      }
+    }
+
+    if (!matched) {
+      throw new Error(`Cannot locate option with text: ${text}`)
+    }
   }
 
   /**
@@ -293,7 +315,7 @@ class Select {
    * @returns {Promise<boolean>}
    */
   async isMultiple() {
-    return (await this.element.getAttribute('multiple')) !== null
+    return this.multiple
   }
 
   /**
@@ -353,29 +375,9 @@ class Select {
      */
     text = typeof text === 'number' ? text.toString() : text
 
-    const normalized = text
-      .trim() // strip leading and trailing white-space characters
-      .replace(/\s+/, ' ') // replace sequences of whitespace characters by a single space
-
-    /**
-     * find option element using xpath
-     */
-    const formatted = /"/.test(normalized)
-      ? 'concat("' + normalized.split('"').join('", \'"\', "') + '")'
-      : `"${normalized}"`
-    const dotFormat = `[. = ${formatted}]`
-    const spaceFormat = `[normalize-space(text()) = ${formatted}]`
-
-    const selections = [
-      `./option${dotFormat}`,
-      `./option${spaceFormat}`,
-      `./optgroup/option${dotFormat}`,
-      `./optgroup/option${spaceFormat}`,
-    ]
-
-    const optionElement = await this.element.findElement({
-      xpath: selections.join('|'),
-    })
+    const optionElement = await this.element.findElement(
+      By.xpath('.//option[normalize-space(.) = ' + escapeQuotes(text) + ']'),
+    )
     if (await optionElement.isSelected()) {
       await optionElement.click()
     }
@@ -431,9 +433,11 @@ class Select {
 
     let matched = false
 
-    let options = await this.element.findElements({
-      css: 'option[value =' + escapeCss(value) + ']',
-    })
+    let options = await this.element.findElements(By.xpath('.//option[@value = ' + escapeQuotes(value) + ']'))
+
+    if (options.length === 0) {
+      throw new Error(`Cannot locate option with value: ${value}`)
+    }
 
     for (let option of options) {
       if (await option.isSelected()) {
@@ -457,4 +461,42 @@ class Select {
   }
 }
 
-module.exports = { Select }
+function escapeQuotes(toEscape) {
+  if (toEscape.includes(`"`) && toEscape.includes(`'`)) {
+    const quoteIsLast = toEscape.lastIndexOf(`"`) === toEscape.length - 1
+    const substrings = toEscape.split(`"`)
+
+    // Remove the last element if it's an empty string
+    if (substrings[substrings.length - 1] === '') {
+      substrings.pop()
+    }
+
+    let result = 'concat('
+
+    for (let i = 0; i < substrings.length; i++) {
+      result += `"${substrings[i]}"`
+      result += i === substrings.length - 1 ? (quoteIsLast ? `, '"')` : `)`) : `, '"', `
+    }
+    return result
+  }
+
+  if (toEscape.includes('"')) {
+    return `'${toEscape}'`
+  }
+
+  // Otherwise return the quoted string
+  return `"${toEscape}"`
+}
+
+function getLongestSubstringWithoutSpace(text) {
+  let words = text.split(' ')
+  let longestString = ''
+  for (let word of words) {
+    if (word.length > longestString.length) {
+      longestString = word
+    }
+  }
+  return longestString
+}
+
+module.exports = { Select, escapeQuotes }

package/lib/until.js

@@ -43,9 +43,9 @@
 
 const by = require('./by')
 const error = require('./error')
-const webdriver = require('./webdriver'),
-  Condition = webdriver.Condition,
-  WebElementCondition = webdriver.WebElementCondition
+const webdriver = require('./webdriver')
+const Condition = webdriver.Condition
+const WebElementCondition = webdriver.WebElementCondition
 
 /**
  * Creates a condition that will wait until the input driver is able to switch

package/lib/util.js

@@ -38,6 +38,7 @@ function isPromise(value) {
     // Use array notation so the Closure compiler does not obfuscate away our
     // contract.
     return (typeof value === 'object' || typeof value === 'function') && typeof value['then'] === 'function'
+    /*eslint no-unused-vars: "off"*/
   } catch (ex) {
     return false
   }