webdriverio 5.8.5 → 5.9.2

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

@@ -31,9 +31,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * </example>
  *
  * @alias browser.react$$
- * @param {String=} selector of React component
+ * @param {String} selector of React component
  * @param {Object=} props  React props the element should contain
- * @param {Object=} state  React state the element should be in
+ * @param {Array<any>|number|string|object|boolean=} state  React state the element should be in
  * @return {Element[]}
  *
  */

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

@@ -35,9 +35,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * </example>
  *
  * @alias browser.react$
- * @param {String=} selector of React component
+ * @param {String} selector of React component
  * @param {Object=} props  React props the element should contain
- * @param {Object=} state  React state the element should be in
+ * @param {Array<any>|number|string|object|boolean=} state  React state the element should be in
  * @return {Element}
  *
  */

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

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = react$$;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _getElementObject = require("../../utils/getElementObject");
+
+var _resq = require("../../scripts/resq");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ *
+ * The `react$$` command is a useful command to query multiple React Components
+ * by their actual name and filter them by props and state.
+ *
+ * **NOTE:** the command only works with applications using React v16.x
+ *
+ * <example>
+    :pause.js
+    it('should calculate 7 * 6', () => {
+        browser.url('https://ahfarmer.github.io/calculator/');
+        const appWrapper = browser.$('div#root')
+
+        const orangeButtons = appWrapper.react$$('t', { orange: true })
+        console.log(orangeButtons.map((btn) => btn.getText())); // prints "[ '÷', 'x', '-', '+', '=' ]"
+    });
+ * </example>
+ *
+ * @alias react$$
+ * @param {String} selector of React component
+ * @param {Object=} props  React props the element should contain
+ * @param {Array<any>|number|string|object|boolean=} state  React state the element should be in
+ * @return {Element[]}
+ *
+ */
+const resqScript = _fs.default.readFileSync(require.resolve('resq'));
+
+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);
+}

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

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = react$;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _getElementObject = require("../../utils/getElementObject");
+
+var _resq = require("../../scripts/resq");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ *
+ * The `react$` command is a useful command to query React Components by their
+ * actual name and filter them by props and state.
+ *
+ * **NOTE:** the command only works with applications using React v16.x
+ *
+ * <example>
+    :pause.js
+    it('should calculate 7 * 6', () => {
+        browser.url('https://ahfarmer.github.io/calculator/');
+        const appWrapper = browser.$('div#root')
+
+        appWrapper.react$('t', { name: '7' }).click()
+        appWrapper.react$('t', { name: 'x' }).click()
+        appWrapper.react$('t', { name: '6' }).click()
+        appWrapper.react$('t', { name: '=' }).click()
+
+        console.log($('.component-display').getText()); // prints "42"
+    });
+ * </example>
+ *
+ * @alias react$
+ * @param {String} selector of React component
+ * @param {Object=} props  React props the element should contain
+ * @param {Array<any>|number|string|object|boolean=} state  React state the element should be in
+ * @return {Element}
+ *
+ */
+const resqScript = _fs.default.readFileSync(require.resolve('resq'));
+
+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);
+}

package/build/scripts/resq.js

@@ -11,8 +11,8 @@ const waitToLoadReact = function waitToLoadReact() {
 
 exports.waitToLoadReact = waitToLoadReact;
 
-const react$ = function react$(selector, props = {}, state = {}) {
-  let element = window.resq.resq$(selector);
+const react$ = function react$(selector, props = {}, state = {}, reactElement) {
+  let element = window.resq.resq$(selector, reactElement);
 
   if (Object.keys(props).length) {
     element = element.byProps(props);
@@ -35,8 +35,8 @@ const react$ = function react$(selector, props = {}, state = {}) {
 
 exports.react$ = react$;
 
-const react$$ = function react$$(selector, props, state) {
-  let elements = window.resq.resq$$(selector);
+const react$$ = function react$$(selector, props, state, reactElement) {
+  let elements = window.resq.resq$$(selector, reactElement);
 
   if (Object.keys(props).length) {
     elements = elements.byProps(props);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen WebDriver test automation framework for Node.js",
-  "version": "5.8.5",
+  "version": "5.9.2",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "license": "MIT",
@@ -55,19 +55,19 @@
     "test:unit": "jest"
   },
   "dependencies": {
-    "@wdio/config": "^5.8.1",
-    "@wdio/logger": "^5.8.0",
-    "@wdio/repl": "^5.8.1",
+    "@wdio/config": "^5.9.1",
+    "@wdio/logger": "^5.9.0",
+    "@wdio/repl": "^5.9.1",
     "css-value": "^0.0.1",
     "grapheme-splitter": "^1.0.2",
     "lodash.isobject": "^3.0.2",
     "lodash.isplainobject": "^4.0.6",
     "lodash.merge": "^4.6.1",
     "lodash.zip": "^4.2.0",
-    "resq": "^1.4.0-rc.1",
+    "resq": "^1.5.0",
     "rgb2hex": "^0.1.0",
     "serialize-error": "^3.0.0",
-    "webdriver": "^5.8.5"
+    "webdriver": "^5.9.1"
   },
-  "gitHead": "3722b05f2b843a6c8b5b00e17781f87706a75ede"
+  "gitHead": "fc102df36cd2ab674aebf3eca1072d4866b0918b"
 }

package/webdriverio-core.d.ts

@@ -203,6 +203,16 @@ declare namespace WebdriverIO {
             xoffset?: number,
             yoffset?: number
         ): void;
+        react$$(
+            selector: string,
+            props?: object,
+            state?: any[] | number | string | object | boolean
+        ): Element[];
+        react$(
+            selector: string,
+            props?: object,
+            state?: any[] | number | string | object | boolean
+        ): Element;
         saveScreenshot(
             filename: string
         ): Buffer;
@@ -267,12 +277,6 @@ declare namespace WebdriverIO {
         executeAsync: ExecuteAsync;
         call: Call;
         options: Options;
-        waitUntil(
-            condition: () => boolean,
-            timeout?: number,
-            timeoutMsg?: string,
-            interval?: number
-        ): boolean
         $$(
             selector: string | Function
         ): Element[];
@@ -299,14 +303,14 @@ declare namespace WebdriverIO {
             milliseconds: number
         ): void;
         react$$(
-            selector?: string,
+            selector: string,
             props?: object,
-            state?: object
+            state?: any[] | number | string | object | boolean
         ): Element[];
         react$(
-            selector?: string,
+            selector: string,
             props?: object,
-            state?: object
+            state?: any[] | number | string | object | boolean
         ): Element;
         reloadSession(): void;
         saveRecordingScreen(

package/webdriverio.d.ts

@@ -45,7 +45,15 @@ declare namespace WebdriverIOAsync {
         options: WebdriverIO.MultiRemoteOptions
     ): WebDriver.ClientAsync;
 
-    interface Browser extends BrowserAsync, BrowserStatic { }
+    interface Browser extends BrowserAsync, BrowserStatic {
+        waitUntil(
+            condition: () => Promise<boolean>,
+            timeout?: number,
+            timeoutMsg?: string,
+            interval?: number
+        ): Promise<boolean>
+    }
+
     interface Element extends ElementAsync, ElementStatic { }
     interface Config {}
 }