webdriverio 5.12.4 → 5.13.1

package/build/commands/browser/$.js

@@ -9,7 +9,13 @@ var _utils = require("../../utils");
 
 var _getElementObject = require("../../utils/getElementObject");
 
+var _constants = require("../../constants");
+
 async function $(selector) {
+  if (selector && typeof selector[_constants.ELEMENT_KEY] === 'string') {
+    return _getElementObject.getElement.call(this, null, selector);
+  }
+
   const res = await _utils.findElement.call(this, selector);
   return _getElementObject.getElement.call(this, selector, res);
 }

package/build/commands/browser/react$$.js

@@ -19,5 +19,5 @@ async function react$$(selector, props = {}, state = {}) {
   await this.executeScript(resqScript.toString(), []);
   await this.execute(_resq.waitToLoadReact);
   const res = await this.execute(_resq.react$$, selector, props, state);
-  return _getElementObject.getElements.call(this, selector, res);
+  return _getElementObject.getElements.call(this, selector, res, true);
 }

package/build/commands/browser/react$.js

@@ -19,5 +19,5 @@ async function react$(selector, props = {}, state = {}) {
   await this.executeScript(resqScript.toString(), []);
   await this.execute(_resq.waitToLoadReact);
   const res = await this.execute(_resq.react$, selector, props, state);
-  return _getElementObject.getElement.call(this, selector, res);
+  return _getElementObject.getElement.call(this, selector, res, true);
 }

package/build/commands/browser/reloadSession.js

@@ -5,28 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = reloadSession;
 
-var _request = _interopRequireDefault(require("webdriver/build/request"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function reloadSession() {
   const oldSessionId = this.sessionId;
   await this.deleteSession();
-  const {
-    w3cCaps,
-    jsonwpCaps
-  } = this.options.requestedCapabilities;
-  const sessionRequest = new _request.default('POST', '/session', {
-    capabilities: w3cCaps,
-    desiredCapabilities: jsonwpCaps
-  });
-  const response = await sessionRequest.makeRequest(this.options);
-  const newSessionId = response.sessionId || response.value && response.value.sessionId;
-  this.sessionId = newSessionId;
+
+  const ProtocolDriver = require(this.options.automationProtocol).default;
+
+  await ProtocolDriver.reloadSession(this);
 
   if (Array.isArray(this.options.onReload) && this.options.onReload.length) {
-    await Promise.all(this.options.onReload.map(hook => hook(oldSessionId, newSessionId)));
+    await Promise.all(this.options.onReload.map(hook => hook(oldSessionId, this.sessionId)));
   }
 
-  return newSessionId;
+  return this.sessionId;
 }

package/build/commands/element/$.js

@@ -9,7 +9,13 @@ var _utils = require("../../utils");
 
 var _getElementObject = require("../../utils/getElementObject");
 
+var _constants = require("../../constants");
+
 async function $(selector) {
+  if (selector && typeof selector[_constants.ELEMENT_KEY] === 'string') {
+    return _getElementObject.getElement.call(this, null, selector);
+  }
+
   const res = await _utils.findElement.call(this, selector);
   return _getElementObject.getElement.call(this, selector, res);
 }

package/build/commands/element/isDisplayed.js

@@ -19,14 +19,15 @@ async function isDisplayed() {
   let browser = (0, _utils.getBrowserObject)(this);
 
   if (!this.elementId) {
-    this.elementId = (await this.parent.$(this.selector)).elementId;
+    const method = this.isReactElement ? 'react$' : '$';
+    this.elementId = (await this.parent[method](this.selector)).elementId;
   }
 
   if (!this.elementId) {
     return false;
   }
 
-  return browser.isW3C && !browser.isMobile && noW3CEndpoint.includes(browser.capabilities.browserName.toLowerCase()) ? await browser.execute(_isElementDisplayed.default, {
+  return browser.isDevTools || browser.isW3C && !browser.isMobile && noW3CEndpoint.includes(browser.capabilities.browserName.toLowerCase()) ? await browser.execute(_isElementDisplayed.default, {
     [_constants.ELEMENT_KEY]: this.elementId,
     ELEMENT: this.elementId
   }) : await this.isElementDisplayed(this.elementId);

package/build/commands/element/isExisting.js

@@ -6,5 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = isExisting;
 
 function isExisting() {
-  return this.parent.$$(this.selector).then(res => res.length > 0);
+  const method = this.isReactElement ? 'react$$' : '$$';
+  return this.parent[method](this.selector).then(res => res.length > 0);
 }

package/build/commands/element/isFocused.js

@@ -13,9 +13,10 @@ var _isFocused = _interopRequireDefault(require("../../scripts/isFocused"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function isFocused() {
-  return (0, _utils.getBrowserObject)(this).execute(_isFocused.default, {
+async function isFocused() {
+  const isFocused = await (0, _utils.getBrowserObject)(this).execute(_isFocused.default, {
     [_constants.ELEMENT_KEY]: this.elementId,
     ELEMENT: this.elementId
   });
+  return Boolean(isFocused);
 }

package/build/commands/element/react$$.js

@@ -19,5 +19,5 @@ async function react$$(selector, props = {}, state = {}) {
   await this.executeScript(resqScript.toString(), []);
   await this.execute(_resq.waitToLoadReact);
   const res = await this.execute(_resq.react$$, selector, props, state, this);
-  return _getElementObject.getElements.call(this, selector, res);
+  return _getElementObject.getElements.call(this, selector, res, true);
 }

package/build/commands/element/react$.js

@@ -19,5 +19,5 @@ async function react$(selector, props = {}, state = {}) {
   await this.executeScript(resqScript.toString(), []);
   await this.execute(_resq.waitToLoadReact);
   const res = await this.execute(_resq.react$, selector, props, state, this);
-  return _getElementObject.getElement.call(this, selector, res);
+  return _getElementObject.getElement.call(this, selector, res, true);
 }

package/build/commands/element/selectByAttribute.js

@@ -11,5 +11,10 @@ async function selectByAttribute(attribute, value) {
   value = typeof value === 'number' ? value.toString() : value;
   const normalized = `[normalize-space(@${attribute.trim()}) = "${value.trim()}"]`;
   const optionElement = await this.findElementFromElement(this.elementId, 'xpath', `./option${normalized}|./optgroup/option${normalized}`);
+
+  if (optionElement && optionElement.error === 'no such element') {
+    throw new Error(`Option with attribute "${attribute}=${value}" not found.`);
+  }
+
   return this.elementClick((0, _utils.getElementFromResponse)(optionElement));
 }

package/build/commands/element/selectByVisibleText.js

@@ -15,5 +15,10 @@ async function selectByVisibleText(text) {
   const spaceFormat = `[normalize-space(text()) = ${formatted}]`;
   const selections = [`./option${dotFormat}`, `./option${spaceFormat}`, `./optgroup/option${dotFormat}`, `./optgroup/option${spaceFormat}`];
   const optionElement = await this.findElementFromElement(this.elementId, 'xpath', selections.join('|'));
+
+  if (optionElement && optionElement.error === 'no such element') {
+    throw new Error(`Option with text "${text}" not found.`);
+  }
+
   return this.elementClick((0, _utils.getElementFromResponse)(optionElement));
 }

package/build/constants.js

@@ -24,17 +24,33 @@ const HOOK_DEFINITION = {
 const ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
 exports.ELEMENT_KEY = ELEMENT_KEY;
 const WDIO_DEFAULTS = {
+  automationProtocol: {
+    default: 'webdriver',
+    type: param => {
+      if (typeof param !== 'string') {
+        throw new Error('the "automationProtocol" option needs to from type strings');
+      } else if (!['webdriver', 'devtools'].includes(param.toLowerCase())) {
+        throw new Error(`Currently only "webdriver" and "devtools" is supproted as automationProtocol, you set "${param}"`);
+      }
+
+      try {
+        require.resolve(param);
+      } catch (e) {
+        throw new Error('Automation protocol package is not installed!\n' + `Please install it via \`npm install ${param}\``);
+      }
+    }
+  },
   specs: {
     type: param => {
       if (!Array.isArray(param)) {
-        throw new Error('the "specs" options needs to be a list of strings');
+        throw new Error('the "specs" option needs to be a list of strings');
       }
     }
   },
   exclude: {
     type: param => {
       if (!Array.isArray(param)) {
-        throw new Error('the "exclude" options needs to be a list of strings');
+        throw new Error('the "exclude" option needs to be a list of strings');
       }
     }
   },

package/build/index.js

@@ -9,6 +9,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _webdriver = _interopRequireDefault(require("webdriver"));
 
+var _logger = _interopRequireDefault(require("@wdio/logger"));
+
 var _config = require("@wdio/config");
 
 var _multiremote = _interopRequireDefault(require("./multiremote"));
@@ -19,6 +21,8 @@ var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const log = (0, _logger.default)('webdriverio');
+
 const remote = async function (params = {}, remoteModifier) {
   const config = (0, _config.validateConfig)(_constants.WDIO_DEFAULTS, params);
 
@@ -40,14 +44,22 @@ const remote = async function (params = {}, remoteModifier) {
   }
 
   const prototype = (0, _utils.getPrototype)('browser');
-  const instance = await _webdriver.default.newSession(params, modifier, prototype, _config.wrapCommand);
-  const origAddCommand = instance.addCommand.bind(instance);
+  log.info(`Initiate new session using the ${config.automationProtocol} protocol`);
+
+  const ProtocolDriver = require(config.automationProtocol).default;
+
+  const commandWrapper = params.runner ? _config.wrapCommand : (_, origFn) => origFn;
+  const instance = await ProtocolDriver.newSession(params, modifier, prototype, commandWrapper);
+
+  if (params.runner) {
+    const origAddCommand = instance.addCommand.bind(instance);
 
-  instance.addCommand = (name, fn, attachToElement) => origAddCommand(name, (0, _config.runFnInFiberContext)(fn), attachToElement);
+    instance.addCommand = (name, fn, attachToElement) => origAddCommand(name, (0, _config.runFnInFiberContext)(fn), attachToElement);
 
-  const origOverwriteCommand = instance.overwriteCommand.bind(instance);
+    const origOverwriteCommand = instance.overwriteCommand.bind(instance);
 
-  instance.overwriteCommand = (name, fn, attachToElement) => origOverwriteCommand(name, (0, _config.runFnInFiberContext)(fn), attachToElement);
+    instance.overwriteCommand = (name, fn, attachToElement) => origOverwriteCommand(name, (0, _config.runFnInFiberContext)(fn), attachToElement);
+  }
 
   return instance;
 };
@@ -64,18 +76,8 @@ exports.attach = attach;
 const multiremote = async function (params = {}) {
   const multibrowser = new _multiremote.default();
   const browserNames = Object.keys(params);
-  await Promise.all(browserNames.map(browserName => {
-    const config = (0, _config.validateConfig)(_constants.WDIO_DEFAULTS, params[browserName]);
-
-    const modifier = (client, options) => {
-      Object.assign(options, config);
-      return client;
-    };
-
-    const prototype = (0, _utils.getPrototype)('browser');
-
-    const instance = _webdriver.default.newSession(params[browserName], modifier, prototype, _config.wrapCommand);
-
+  await Promise.all(browserNames.map(async browserName => {
+    const instance = await remote(params[browserName]);
     return multibrowser.addInstance(browserName, instance);
   }));
   const prototype = (0, _utils.getPrototype)('browser');

package/build/multiremote.js

@@ -9,13 +9,13 @@ var _lodash = _interopRequireDefault(require("lodash.zip"));
 
 var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
 
-var _webdriver = require("webdriver");
+var _utils = require("@wdio/utils");
 
 var _config = require("@wdio/config");
 
 var _middlewares = require("./middlewares");
 
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -65,11 +65,11 @@ class MultiRemote {
   }
 
   static elementWrapper(instances, result, propertiesObject) {
-    const prototype = _objectSpread({}, propertiesObject, {}, (0, _lodash2.default)((0, _utils.getPrototype)('element')), {
+    const prototype = _objectSpread({}, propertiesObject, {}, (0, _lodash2.default)((0, _utils2.getPrototype)('element')), {
       scope: 'element'
     });
 
-    const element = (0, _webdriver.webdriverMonad)({}, client => {
+    const element = (0, _utils.webdriverMonad)({}, client => {
       for (const [i, identifier] of Object.entries(Object.keys(instances))) {
         client[identifier] = result[i];
       }

package/build/utils/getElementObject.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getElements = exports.getElement = void 0;
 
-var _webdriver = require("webdriver");
+var _utils = require("@wdio/utils");
 
 var _config = require("@wdio/config");
 
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
 
-var _utils = require("../utils");
+var _utils2 = require("../utils");
 
 var _middlewares = require("../middlewares");
 
@@ -25,15 +25,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const getElement = function findElement(selector, res) {
-  const browser = (0, _utils.getBrowserObject)(this);
+const getElement = function findElement(selector, res, isReactElement = false) {
+  const browser = (0, _utils2.getBrowserObject)(this);
 
-  const prototype = _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils.getPrototype)('element'), {
+  const prototype = _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils2.getPrototype)('element'), {
     scope: 'element'
   });
 
-  const element = (0, _webdriver.webdriverMonad)(this.options, client => {
-    const elementId = (0, _utils.getElementFromResponse)(res);
+  const element = (0, _utils.webdriverMonad)(this.options, client => {
+    const elementId = (0, _utils2.getElementFromResponse)(res);
 
     if (elementId) {
       client.elementId = elementId;
@@ -50,6 +50,7 @@ const getElement = function findElement(selector, res) {
     client.selector = selector;
     client.parent = this;
     client.emit = this.emit.bind(this);
+    client.isReactElement = isReactElement;
     return client;
   }, prototype);
   const elementInstance = element(this.sessionId, (0, _middlewares.elementErrorHandler)(_config.wrapCommand));
@@ -67,11 +68,11 @@ const getElement = function findElement(selector, res) {
 
 exports.getElement = getElement;
 
-const getElements = function getElements(selector, res) {
-  const browser = (0, _utils.getBrowserObject)(this);
+const getElements = function getElements(selector, res, isReactElement = false) {
+  const browser = (0, _utils2.getBrowserObject)(this);
   const elements = res.map((res, i) => {
-    const element = (0, _webdriver.webdriverMonad)(this.options, client => {
-      const elementId = (0, _utils.getElementFromResponse)(res);
+    const element = (0, _utils.webdriverMonad)(this.options, client => {
+      const elementId = (0, _utils2.getElementFromResponse)(res);
 
       if (elementId) {
         client.elementId = elementId;
@@ -89,8 +90,9 @@ const getElements = function getElements(selector, res) {
       client.parent = this;
       client.index = i;
       client.emit = this.emit.bind(this);
+      client.isReactElement = isReactElement;
       return client;
-    }, _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils.getPrototype)('element'), {
+    }, _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils2.getPrototype)('element'), {
       scope: 'element'
     }));
     const elementInstance = element(this.sessionId, (0, _middlewares.elementErrorHandler)(_config.wrapCommand));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen WebDriver test automation framework for Node.js",
-  "version": "5.12.4",
+  "version": "5.13.1",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "testingbot"
   ],
   "types": "./webdriverio.d.ts",
-  "typeScriptVersion": "3.2.1",
+  "typeScriptVersion": "3.5.1",
   "scripts": {
     "build": "run-s clean compile",
     "clean": "rimraf ./build",
@@ -55,9 +55,10 @@
     "test:unit": "jest"
   },
   "dependencies": {
-    "@wdio/config": "^5.12.1",
+    "@wdio/config": "^5.13.0-alpha.0",
     "@wdio/logger": "^5.12.1",
-    "@wdio/repl": "^5.12.1",
+    "@wdio/repl": "^5.13.0-alpha.0",
+    "@wdio/utils": "^5.13.0",
     "archiver": "^3.0.0",
     "css-value": "^0.0.1",
     "grapheme-splitter": "^1.0.2",
@@ -68,7 +69,7 @@
     "resq": "^1.6.0",
     "rgb2hex": "^0.1.0",
     "serialize-error": "^4.1.0",
-    "webdriver": "^5.12.1"
+    "webdriver": "^5.13.1"
   },
-  "gitHead": "3786d36b4ad1cf79e3759ccdcb8414fb9d166d6a"
+  "gitHead": "545fdcc3ca20842417ca17b490df2546b0806922"
 }

package/webdriverio-core.d.ts

@@ -291,7 +291,7 @@ declare namespace WebdriverIO {
             selector: string | Function
         ): Element[];
         $(
-            selector: string | Function
+            selector: string | Function | object
         ): Element;
         debug(): void;
         deleteCookies(