detox 21.0.0-rc.2 → 21.0.0-rc.4

package/index.d.ts

@@ -790,7 +790,7 @@ declare global {
             setLocation(lat: number, lon: number): Promise<void>;
 
             /**
-             * Disable EarlGrey's network synchronization mechanism on preferred endpoints. Useful if you want to on skip over synchronizing on certain URLs.
+             * Disable network synchronization mechanism on preferred endpoints. Useful if you want to on skip over synchronizing on certain URLs.
              *
              * @example await device.setURLBlacklist(['.*127.0.0.1.*']);
              */
@@ -971,20 +971,25 @@ declare global {
              * <TouchableOpacity testID={'tap_me'}>
              * // Then match with by.id:
              * await element(by.id('tap_me'));
+             * await element(by.id(/^tap_[a-z]+$/));
              */
-            id(id: string): NativeMatcher;
+            id(id: string | RegExp): NativeMatcher;
 
             /**
              * Find an element by text, useful for text fields, buttons.
-             * @example await element(by.text('Tap Me'));
+             * @example
+             * await element(by.text('Tap Me'));
+             * await element(by.text(/^Tap .*$/));
              */
-            text(text: string): NativeMatcher;
+            text(text: string | RegExp): NativeMatcher;
 
             /**
              * Find an element by accessibilityLabel on iOS, or by contentDescription on Android.
-             * @example await element(by.label('Welcome'));
+             * @example
+             * await element(by.label('Welcome'));
+             * await element(by.label(/[a-z]+/i));
              */
-            label(label: string): NativeMatcher;
+            label(label: string | RegExp): NativeMatcher;
 
             /**
              * Find an element by native view type.
@@ -1006,6 +1011,7 @@ declare global {
 
         interface ByWebFacade {
             /**
+             * (Android Only)
              * Find an element on the DOM tree by its id
              * @param id
              * @example
@@ -1014,6 +1020,7 @@ declare global {
             id(id: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an element on the DOM tree by its CSS class
              * @param className
              * @example
@@ -1022,6 +1029,7 @@ declare global {
             className(className: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an element on the DOM tree matching the given CSS selector
              * @param cssSelector
              * @example
@@ -1030,6 +1038,7 @@ declare global {
             cssSelector(cssSelector: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an element on the DOM tree by its "name" attribute
              * @param name
              * @example
@@ -1038,6 +1047,7 @@ declare global {
             name(name: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an element on the DOM tree by its XPath
              * @param xpath
              * @example
@@ -1046,6 +1056,7 @@ declare global {
             xpath(xpath: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an <a> element on the DOM tree by its link text (href content)
              * @param linkText
              * @example
@@ -1054,6 +1065,7 @@ declare global {
             href(linkText: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an <a> element on the DOM tree by its partial link text (href content)
              * @param linkTextFragment
              * @example
@@ -1062,12 +1074,31 @@ declare global {
             hrefContains(linkTextFragment: string): WebMatcher;
 
             /**
+             * (Android Only)
              * Find an element on the DOM tree by its tag name
              * @param tag
              * @example
              * web.element(by.web.tag('mark'))
              */
             tag(tagName: string): WebMatcher;
+
+            /**
+             * (iOS Only)
+             * Find an element on the web-view by its text content
+             * @param label
+             * @example
+             * web.element(by.web.label('Welcome'))
+             */
+            label(label: string): WebMatcher;
+
+            /**
+             * (iOS Only)
+             * Find an element on the web-view by its content description
+             * @param value
+             * @example
+             * web.element(by.web.value('Write a comment...'))
+             */
+            value(value: string): WebMatcher;
         }
 
         interface NativeMatcher {
@@ -1477,6 +1508,9 @@ declare global {
         }
 
         interface WebElementActions {
+            /**
+             * Taps the element
+             */
             tap(): Promise<void>;
 
             /**

package/local-cli/startCommand/AppStartCommand.js

@@ -36,7 +36,10 @@ class AppStartCommand {
       }
     };
 
-    this._cpHandle = execa.command(cmd, { stdio: 'inherit', shell: true });
+    this._cpHandle = execa.command(cmd, {
+      stdio: ['ignore', 'inherit', 'inherit'],
+      shell: true
+    });
     this._cpHandle.on('error', onError);
     this._cpHandle.on('exit', (code, signal) => {
       const reason = code == null ? `signal ${signal}` : `code ${code}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "21.0.0-rc.2",
+  "version": "21.0.0-rc.4",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -41,19 +41,20 @@
     "@types/node": "^14.18.33",
     "@types/node-ipc": "^9.2.0",
     "@types/ws": "^7.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
     "cross-env": "^7.0.3",
-    "eslint": "^8.3.0",
-    "eslint-plugin-import": "^2.23.3",
-    "eslint-plugin-no-only-tests": "^2.6.0",
+    "eslint": "^8.41.0",
+    "eslint-plugin-ecmascript-compat": "^3.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-unicorn": "^39.0.0",
+    "eslint-plugin-unicorn": "^47.0.0",
     "jest": "^28.1.3",
     "jest-allure2-reporter": "^1.2.1",
     "mockdate": "^2.0.1",
-    "prettier": "1.7.0",
-    "react-native": "0.70.7",
+    "prettier": "^2.4.1",
+    "react-native": "0.71.10",
     "react-native-codegen": "^0.0.8",
     "typescript": "^4.5.2",
     "wtfnode": "^0.9.1"
@@ -203,5 +204,8 @@
       }
     }
   },
-  "gitHead": "59d264be2c13855caa423f5f78c480186b79469d"
+  "browserslist": [
+    "node 14"
+  ],
+  "gitHead": "72ae4a95d8115737031a400ba44243b3ae7a42e0"
 }

package/src/android/espressoapi/DetoxMatcher.js

@@ -14,39 +14,51 @@ function sanitize_matcher(matcher) {
   return originalMatcher.type ? originalMatcher.value : originalMatcher;
 } 
 class DetoxMatcher {
-  static matcherForText(text) {
+  static matcherForText(text, isRegex) {
     if (typeof text !== "string") throw new Error("text should be a string, but got " + (text + (" (" + (typeof text + ")"))));
+    if (typeof isRegex !== "boolean") throw new Error("isRegex should be a boolean, but got " + (isRegex + (" (" + (typeof isRegex + ")"))));
     return {
       target: {
         type: "Class",
         value: "com.wix.detox.espresso.DetoxMatcher"
       },
       method: "matcherForText",
-      args: [text]
+      args: [text, {
+        type: "boolean",
+        value: isRegex
+      }]
     };
   }
 
-  static matcherForAccessibilityLabel(label) {
+  static matcherForAccessibilityLabel(label, isRegex) {
     if (typeof label !== "string") throw new Error("label should be a string, but got " + (label + (" (" + (typeof label + ")"))));
+    if (typeof isRegex !== "boolean") throw new Error("isRegex should be a boolean, but got " + (isRegex + (" (" + (typeof isRegex + ")"))));
     return {
       target: {
         type: "Class",
         value: "com.wix.detox.espresso.DetoxMatcher"
       },
       method: "matcherForAccessibilityLabel",
-      args: [label]
+      args: [label, {
+        type: "boolean",
+        value: isRegex
+      }]
     };
   }
 
-  static matcherForShallowAccessibilityLabel(label) {
+  static matcherForShallowAccessibilityLabel(label, isRegex) {
     if (typeof label !== "string") throw new Error("label should be a string, but got " + (label + (" (" + (typeof label + ")"))));
+    if (typeof isRegex !== "boolean") throw new Error("isRegex should be a boolean, but got " + (isRegex + (" (" + (typeof isRegex + ")"))));
     return {
       target: {
         type: "Class",
         value: "com.wix.detox.espresso.DetoxMatcher"
       },
       method: "matcherForShallowAccessibilityLabel",
-      args: [label]
+      args: [label, {
+        type: "boolean",
+        value: isRegex
+      }]
     };
   }
 
@@ -62,15 +74,19 @@ class DetoxMatcher {
     };
   }
 
-  static matcherForTestId(testId) {
+  static matcherForTestId(testId, isRegex) {
     if (typeof testId !== "string") throw new Error("testId should be a string, but got " + (testId + (" (" + (typeof testId + ")"))));
+    if (typeof isRegex !== "boolean") throw new Error("isRegex should be a boolean, but got " + (isRegex + (" (" + (typeof isRegex + ")"))));
     return {
       target: {
         type: "Class",
         value: "com.wix.detox.espresso.DetoxMatcher"
       },
       method: "matcherForTestId",
-      args: [testId]
+      args: [testId, {
+        type: "boolean",
+        value: isRegex
+      }]
     };
   }
 

package/src/android/matchers/index.js

@@ -10,6 +10,7 @@ module.exports = {
   type: (value) => new native.TypeMatcher(value),
   value: (value) => new native.ValueMatcher(value),
 
+  // label and value not supported
   web: {
     id: (value) => new web.IdMatcher(value),
     className: (value) => new web.ClassNameMatcher(value),
@@ -19,5 +20,7 @@ module.exports = {
     xpath: (value) => new web.XPathMatcher(value),
     href: (value) => new web.LinkTextMatcher(value),
     hrefContains: (value) => new web.PartialLinkTextMatcher(value),
+    label: (value) => new web.LabelMatcher(value),
+    value: (value) => new web.ValueMatcher(value),
   },
 };

package/src/android/matchers/native.js

@@ -1,26 +1,30 @@
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 const invoke = require('../../invoke');
+const { isRegExp } = require('../../utils/isRegExp');
 const { NativeMatcher } = require('../core/NativeMatcher');
 const DetoxMatcherApi = require('../espressoapi/DetoxMatcher');
 
 class LabelMatcher extends NativeMatcher {
   constructor(value) {
     super();
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForAccessibilityLabel(value));
+    const isRegex = isRegExp(value);
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForAccessibilityLabel(isRegex ? value.toString() : value, isRegex));
   }
 }
 
 class ShallowLabelMatcher extends NativeMatcher {
   constructor(value) {
     super();
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForShallowAccessibilityLabel(value));
+    const isRegex = isRegExp(value);
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForShallowAccessibilityLabel(isRegex ? value.toString() : value, isRegex));
   }
 }
 
 class IdMatcher extends NativeMatcher {
   constructor(value) {
     super();
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForTestId(value));
+    const isRegex = isRegExp(value);
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForTestId(isRegex ? value.toString() : value, isRegex));
   }
 }
 
@@ -53,7 +57,8 @@ class ExistsMatcher extends NativeMatcher {
 class TextMatcher extends NativeMatcher {
   constructor(value) {
     super();
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForText(value));
+    const isRegex = isRegExp(value);
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForText(isRegex ? value.toString() : value, isRegex));
   }
 }
 

package/src/android/matchers/web.js

@@ -1,6 +1,7 @@
 const invoke = require('../../invoke');
 const { WebMatcher } = require('../core/WebMatcher');
 const DetoxWebMatcherApi = require('../espressoapi/web/DetoxWebAtomMatcher');
+const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 
 class IdMatcher extends WebMatcher {
   constructor(id) {
@@ -51,6 +52,20 @@ class PartialLinkTextMatcher extends WebMatcher {
   }
 }
 
+class LabelMatcher extends WebMatcher {
+  constructor(_) {
+    super();
+    throw new DetoxRuntimeError('Label matching is not supported on Android');
+  }
+}
+
+class ValueMatcher extends WebMatcher {
+  constructor(_) {
+    super();
+    throw new DetoxRuntimeError('Label matching is not supported on Android');
+  }
+}
+
 class TagNameMatcher extends WebMatcher {
   constructor(tag) {
     super();
@@ -66,5 +81,7 @@ module.exports = {
   XPathMatcher,
   LinkTextMatcher,
   PartialLinkTextMatcher,
-  TagNameMatcher
+  TagNameMatcher,
+  LabelMatcher,
+  ValueMatcher
 };

package/src/devices/runtime/drivers/ios/XCUITestUtils.js

@@ -101,9 +101,8 @@ function runXCUITest(
   };
 
   const options = {
-    maxBuffer: 1024 * 1024 * 1024,
+    maxBuffer: 1024 * 1024 * 10, // 10MB
     retries: 1,
-    verbosity: 'high',
   };
 
   const command = `${env.TEST_RUNNER_IS_DETOX_ACTIVE ? Object.keys(env).map(key => `${key}=${env[key]}`).join(' ') : ''} ${xcodebuildBinary} ${flags.map(flag => flag.includes(' ') ? `"${flag}"` : flag).join(' ')}`;
@@ -124,9 +123,9 @@ function runXCUITest(
 }
 
 function _runCommandInTerminal(command, options) {
-  const escapedCommand = command.replace(/"/g, '\\"'); // escape double quotes
+  const escapedCommand = command.replace(/"/g, '\\"');
 
-  // opens the Terminal app and runs the command in a new window, then closes the window when the command is done running.
+  // Opens the Terminal app and runs the command in a new window, then closes the window when the command is done running.
   const appleScript = `
         tell application "Terminal"
             if not running then

package/src/invoke.js

@@ -1,4 +1,3 @@
-const EarlGrey = require('./invoke/EarlGrey');
 const Espresso = require('./invoke/Espresso');
 const EspressoWeb = require('./invoke/EspressoWeb');
 const Invoke = require('./invoke/Invoke');
@@ -15,7 +14,6 @@ class InvocationManager {
 
 module.exports = {
   InvocationManager,
-  EarlGrey,
   Espresso: Espresso.target,
   EspressoWeb: EspressoWeb.target,
   IOS: Invoke.genericInvokeObject,

package/src/ios/expectTwo.js

@@ -6,12 +6,16 @@ const fs = require('fs-extra');
 const _ = require('lodash');
 const tempfile = require('tempfile');
 
+
 const { assertEnum, assertNormalized } = require('../utils/assertArgument');
 const { removeMilliseconds } = require('../utils/dateUtils');
 const { actionDescription, expectDescription } = require('../utils/invocationTraceDescriptions');
+const { isRegExp } = require('../utils/isRegExp');
 const log = require('../utils/logger').child({ cat: 'ws-client, ws' });
 const traceInvocationCall = require('../utils/traceInvocationCall').bind(null, log);
 
+const { webElement, webMatcher, webExpect, isWebElement } = require('./web');
+
 const assertDirection = assertEnum(['left', 'right', 'up', 'down']);
 const assertSpeed = assertEnum(['fast', 'slow']);
 
@@ -231,7 +235,7 @@ class Element {
 
   performAccessibilityAction(actionName) {
     if (typeof actionName !== 'string') throw new Error('actionName should be a string, but got ' + (actionName + (' (' + (typeof actionName + ')'))));
-    
+
     const traceDescription = actionDescription.performAccessibilityAction(actionName);
     return this.withAction('accessibilityAction', traceDescription, actionName);
   }
@@ -399,7 +403,7 @@ class By {
   }
 
   get web() {
-    throw new Error('Detox does not support by.web matchers on iOS.');
+    return webMatcher();
   }
 }
 
@@ -409,14 +413,14 @@ class Matcher {
   }
 
   label(label) {
-    if (typeof label !== 'string') throw new Error('label should be a string, but got ' + (label + (' (' + (typeof label + ')'))));
-    this.predicate = { type: 'label', value: label };
+    if (typeof label !== 'string' && !isRegExp(label)) throw new Error('label should be a string or regex, but got ' + (label + (' (' + (typeof label + ')'))));
+    this.predicate = { type: 'label', value: label.toString(), isRegex: isRegExp(label) };
     return this;
   }
 
   id(id) {
-    if (typeof id !== 'string') throw new Error('id should be a string, but got ' + (id + (' (' + (typeof id + ')'))));
-    this.predicate = { type: 'id', value: id };
+    if (typeof id !== 'string' && !isRegExp(id)) throw new Error('id should be a string or regex, but got ' + (id + (' (' + (typeof id + ')'))));
+    this.predicate = { type: 'id', value: id.toString(), isRegex: isRegExp(id) };
     return this;
   }
 
@@ -439,8 +443,8 @@ class Matcher {
   }
 
   text(text) {
-    if (typeof text !== 'string') throw new Error('text should be a string, but got ' + (text + (' (' + (typeof text + ')'))));
-    this.predicate = { type: 'text', value: text };
+    if (typeof text !== 'string' && !isRegExp(text)) throw new Error(`text should be a string or regex, but got ` + (text + (' (' + (typeof text + ')'))));
+    this.predicate = { type: 'text', value: text.toString(), isRegex: isRegExp(text) };
     return this;
   }
 
@@ -754,7 +758,7 @@ class IosExpect {
     this.waitFor = this.waitFor.bind(this);
     this.by = new By();
     this.web = this.web.bind(this);
-    this.web.element = this.web;
+    this.web.element = this.web().element;
   }
 
   element(matcher) {
@@ -762,6 +766,10 @@ class IosExpect {
   }
 
   expect(element) {
+    if (isWebElement(element)) {
+      return webExpect(this._invocationManager, element);
+    }
+
     return expect(this._invocationManager, element);
   }
 
@@ -769,8 +777,17 @@ class IosExpect {
     return waitFor(this._invocationManager, this._emitter, element);
   }
 
-  web(_matcher) {
-    throw new Error('Detox does not support web(), web.element() API on iOS.');
+  web(matcher) {
+    return {
+      element: webMatcher => {
+        if (!(matcher instanceof Matcher) && matcher !== undefined) {
+          throwMatcherError(matcher);
+        }
+
+        const webViewElement = matcher ? element(this._invocationManager, this._emitter, matcher) : undefined;
+        return webElement(this._invocationManager, this._emitter, webViewElement, webMatcher);
+      }
+    };
   }
 }