selenium-webdriver 4.0.0-beta.1 → 4.0.0-beta.2

package/lib/webdriver.js

@@ -35,6 +35,7 @@ const WebSocket = require('ws')
 const http = require('../http/index')
 const fs = require('fs')
 const { Capabilities } = require('./capabilities')
+const path = require('path')
 
 // Capability names that are defined in the W3C spec.
 const W3C_CAPABILITY_NAMES = new Set([
@@ -648,6 +649,7 @@ function filterNonW3CCaps(capabilities) {
  * @implements {IWebDriver}
  */
 class WebDriver {
+
   /**
    * @param {!(./session.Session|IThenable<!./session.Session>)} session Either
    *     a known session or a promise that will be resolved to a session.
@@ -1159,12 +1161,13 @@ class WebDriver {
    */
   async createCDPConnection(target) {
     const caps = await this.getCapabilities()
-    const seOptions = caps['map_'].get('se:options') || new Map()
+    const seCdp = caps['map_'].get('se:cdp')
     const vendorInfo =
       caps['map_'].get(this.VENDOR_COMMAND_PREFIX + ':chromeOptions') ||
+      caps['map_'].get(this.VENDOR_CAPABILITY_PREFIX + ':edgeOptions') ||
       caps['map_'].get('moz:debuggerAddress') ||
-      new Map()
-    const debuggerUrl = seOptions['cdp'] || vendorInfo['debuggerAddress'] || vendorInfo
+      new Map();
+    const debuggerUrl = seCdp || vendorInfo['debuggerAddress'] || vendorInfo
     this._wsUrl = await this.getWsUrl(debuggerUrl, target)
 
     return new Promise((resolve, reject) => {
@@ -1196,12 +1199,21 @@ class WebDriver {
     if (target && cdpTargets.indexOf(target.toLowerCase()) === -1) {
       throw new error.InvalidArgumentError('invalid target value')
     }
-    let path = '/json/version'
-
+    let path
+    if (target === 'page') {
+      path = '/json'
+    } else {
+      path = '/json/version'
+    }
     let request = new http.Request('GET', path)
     let client = new http.HttpClient('http://' + debuggerAddress)
     let response = await client.send(request)
-    let url = JSON.parse(response.body)['webSocketDebuggerUrl']
+    let url
+    if (target.toLowerCase() === 'page') {
+      url = JSON.parse(response.body)[0]['webSocketDebuggerUrl']
+    } else {
+      url = JSON.parse(response.body)['webSocketDebuggerUrl']
+    }
 
     return url
   }
@@ -1362,7 +1374,7 @@ class WebDriver {
         .toString()
     } catch {
       mutationListener = fs
-        .readFileSync('./atoms/mutation-listener.js', 'utf-8')
+        .readFileSync(path.resolve(__dirname, './atoms/mutation-listener.js'), 'utf-8')
         .toString()
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [

package/testing/index.js

@@ -100,7 +100,7 @@ function getBrowsersToTestFromEnv() {
     const parts = spec.split(/:/, 3)
     let name = parts[0]
     if (name === 'ie') {
-      name = Browser.IE
+      name = Browser.INTERNET_EXPLORER
     } else if (name === 'edge') {
       name = Browser.EDGE
     }
@@ -120,13 +120,8 @@ function getAvailableBrowsers() {
   let targets = [
     [chrome.locateSynchronously, Browser.CHROME],
     [edge.locateSynchronously, Browser.EDGE],
-    [
-      () => edge.locateSynchronously('msedge'),
-      Browser.EDGE,
-      { 'ms:edgeChromium': true },
-    ],
     [firefox.locateSynchronously, Browser.FIREFOX],
-    [ie.locateSynchronously, Browser.IE],
+    [ie.locateSynchronously, Browser.INTERNET_EXPLORER],
     [safari.locateSynchronously, Browser.SAFARI],
     [opera.locateSynchronously, Browser.OPERA],
   ]