detox 21.0.0-rc.0 → 21.0.0-rc.10

package/runners/jest/testEnvironment/index.js

@@ -70,7 +70,14 @@ class DetoxCircusEnvironment extends NodeEnvironment {
     await this.initDetox();
   }
 
+  // @ts-expect-error TS2425
   async handleTestEvent(event, state) {
+    if (detox.session.unsafe_earlyTeardown) {
+      if (event.name === 'test_fn_start' || event.name === 'hook_start') {
+        throw new Error('Detox halted test execution due to an early teardown request');
+      }
+    }
+
     this._timer.schedule(state.testTimeout != null ? state.testTimeout : this.setupTimeout);
 
     if (SYNC_CIRCUS_EVENTS.has(event.name)) {
@@ -102,6 +109,10 @@ class DetoxCircusEnvironment extends NodeEnvironment {
    * @protected
    */
   async initDetox() {
+    if (detox.session.unsafe_earlyTeardown) {
+      throw new Error('Detox halted test execution due to an early teardown request');
+    }
+
     const opts = {
       global: this.global,
       workerId: `w${process.env.JEST_WORKER_ID}`,

package/src/DetoxWorker.js

@@ -33,7 +33,6 @@ class DetoxWorker {
       onError: this._onEmitError.bind(this),
     });
 
-
     /** @type {DetoxInternals.RuntimeConfig['apps']} */
     this._appsConfig = null;
     /** @type {DetoxInternals.RuntimeConfig['artifacts']} */
@@ -60,7 +59,6 @@ class DetoxWorker {
     /** @type {Detox.WebFacade} */
     this.web = null;
 
-    this._deviceAllocator = null;
     this._deviceCookie = null;
 
     this.trace = this._context.trace;
@@ -115,14 +113,13 @@ class DetoxWorker {
     const {
       // @ts-ignore
       envValidatorFactory,
-      deviceAllocatorFactory,
       // @ts-ignore
       artifactsManagerFactory,
       // @ts-ignore
       matchersFactory,
       // @ts-ignore
       runtimeDeviceFactory,
-    } = environmentFactory.createFactories(this._deviceConfig);
+    } = environmentFactory.createFactories(deviceConfig);
 
     const envValidator = envValidatorFactory.createValidator();
     yield envValidator.validate();
@@ -135,10 +132,7 @@ class DetoxWorker {
     };
 
     this._artifactsManager = artifactsManagerFactory.createArtifactsManager(this._artifactsConfig, commonDeps);
-    this._deviceAllocator = deviceAllocatorFactory.createDeviceAllocator(commonDeps);
-    this._deviceCookie = yield this._deviceAllocator.allocate(this._deviceConfig);
-
-    yield this._deviceAllocator.postAllocate(this._deviceCookie);
+    this._deviceCookie = yield this._context[symbols.allocateDevice]();
 
     this.device = runtimeDeviceFactory.createRuntimeDevice(
       this._deviceCookie,
@@ -157,6 +151,8 @@ class DetoxWorker {
     });
     Object.assign(this, matchers);
 
+    yield this._eventEmitter.emit('bootDevice', { deviceId: this.device.id });
+
     if (behaviorConfig.init.exposeGlobals) {
       const injectedGlobals = {
         ...matchers,
@@ -207,11 +203,9 @@ class DetoxWorker {
     }
 
     if (this._deviceCookie) {
-      const shutdown = this._behaviorConfig ? this._behaviorConfig.cleanup.shutdownDevice : false;
-      await this._deviceAllocator.free(this._deviceCookie, { shutdown });
+      await this._context[symbols.deallocateDevice](this._deviceCookie);
     }
 
-    this._deviceAllocator = null;
     this._deviceCookie = null;
     this.device = null;
   }

package/src/android/core/NativeElement.js

@@ -15,39 +15,37 @@ class NativeElement {
   constructor(invocationManager, emitter, matcher) {
     this._invocationManager = invocationManager;
     this._emitter = emitter;
-    this._originalMatcher = matcher;
-    this._selectElementWithMatcher(this._originalMatcher);
+    this._matcher = matcher;
   }
 
-  _selectElementWithMatcher(matcher) {
-    this._call = invoke.call(invoke.Espresso, 'onView', matcher._call);
+  get _call() {
+    return invoke.call(invoke.Espresso, 'onView', this._matcher._call);
   }
 
   atIndex(index) {
     if (typeof index !== 'number') throw new DetoxRuntimeError({ message: `Element atIndex argument must be a number, got ${typeof index}` });
-    const matcher = this._originalMatcher;
-    this._originalMatcher._call = invoke.callDirectly(DetoxMatcherApi.matcherForAtIndex(index, matcher._call.value));
+    const matcher = this._matcher;
+    this._matcher._call = invoke.callDirectly(DetoxMatcherApi.matcherForAtIndex(index, matcher._call.value));
 
-    this._selectElementWithMatcher(this._originalMatcher);
     return this;
   }
 
   async tap(value) {
     const action = new actions.TapAction(value);
     const traceDescription = actionDescription.tapAtPoint(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapAtPoint(value) {
     const action = new actions.TapAtPointAction(value);
     const traceDescription = actionDescription.tapAtPoint(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async longPress() {
     const action = new actions.LongPressAction();
     const traceDescription = actionDescription.longPress();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async multiTap(times) {
@@ -56,61 +54,61 @@ class NativeElement {
 
     const action = new actions.MultiClickAction(times);
     const traceDescription = actionDescription.multiTap(times);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapBackspaceKey() {
     const action = new actions.PressKeyAction(67);
     const traceDescription = actionDescription.tapBackspaceKey();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapReturnKey() {
     const action = new actions.TypeTextAction('\n');
     const traceDescription = actionDescription.tapReturnKey();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async typeText(value) {
     const action = new actions.TypeTextAction(value);
     const traceDescription = actionDescription.typeText(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async replaceText(value) {
     const action = new actions.ReplaceTextAction(value);
     const traceDescription = actionDescription.replaceText(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async clearText() {
     const action = new actions.ClearTextAction();
     const traceDescription = actionDescription.clearText();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scroll(amount, direction = 'down', startPositionX, startPositionY) {
     const action = new actions.ScrollAmountAction(direction, amount, startPositionX, startPositionY);
     const traceDescription = actionDescription.scroll(amount, direction, startPositionX, startPositionY);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scrollTo(edge) {
     // override the user's element selection with an extended matcher that looks for UIScrollView children
-    this._selectElementWithMatcher(this._originalMatcher._extendToDescendantScrollViews());
+    this._matcher = this._matcher._extendToDescendantScrollViews();
 
     const action = new actions.ScrollEdgeAction(edge);
     const traceDescription = actionDescription.scrollTo(edge);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scrollToIndex(index) {
     // override the user's element selection with an extended matcher that looks for UIScrollView children
-    this._selectElementWithMatcher(this._originalMatcher._extendToDescendantScrollViews());
+    this._matcher = this._matcher._extendToDescendantScrollViews();
 
     const action = new actions.ScrollToIndex(index);
     const traceDescription = actionDescription.scrollToIndex(index);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async setDatePickerDate(rawDateString, formatString) {
@@ -120,7 +118,7 @@ class NativeElement {
 
     const action = new actions.SetDatePickerDateAction(dateString, formatString);
     const traceDescription = actionDescription.setDatePickerDate(dateString, formatString);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   /**
@@ -134,18 +132,18 @@ class NativeElement {
     normalizedSwipeOffset = Number.isNaN(normalizedSwipeOffset) ? 0.75 : normalizedSwipeOffset;
 
     // override the user's element selection with an extended matcher that avoids RN issues with RCTScrollView
-    this._selectElementWithMatcher(this._originalMatcher._avoidProblematicReactNativeElements());
+    this._matcher = this._matcher._avoidProblematicReactNativeElements();
 
     const action = new actions.SwipeAction(direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY);
     const traceDescription = actionDescription.swipe(direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async takeScreenshot(screenshotName) {
     // TODO this should be moved to a lower-layer handler of this use-case
     const action = new actions.TakeElementScreenshot();
     const traceDescription = actionDescription.takeScreenshot(screenshotName);
-    const resultBase64 = await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    const resultBase64 = await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
     const filePath = tempfile('detox.element-screenshot.png');
     await fs.writeFile(filePath, resultBase64, 'base64');
 
@@ -160,19 +158,18 @@ class NativeElement {
   async getAttributes() {
     const action = new actions.GetAttributes();
     const traceDescription = actionDescription.getAttributes();
-    const result = await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
-    return JSON.parse(result);
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async adjustSliderToPosition(newPosition) {
     const action = new actions.AdjustSliderToPosition(newPosition);
     const traceDescription = actionDescription.adjustSliderToPosition(newPosition);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async performAccessibilityAction(actionName) {
     const traceDescription = actionDescription.performAccessibilityAction(actionName);
-    return await new ActionInteraction(this._invocationManager, this, new actions.AccessibilityActionAction(actionName), traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, new actions.AccessibilityActionAction(actionName), traceDescription).execute();
   }
 }
 

package/src/android/core/WebElement.js

@@ -1,5 +1,7 @@
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 const invoke = require('../../invoke');
+const assertIsFunction = require('../../utils/assertIsFunction');
+const isArrowFunction = require('../../utils/isArrowFunction');
 const actions = require('../actions/web');
 const EspressoWebDetoxApi = require('../espressoapi/web/EspressoWebDetox');
 const WebViewElementApi = require('../espressoapi/web/WebViewElement');
@@ -73,12 +75,14 @@ class WebElement {
     return await new ActionInteraction(this[_invocationManager], new actions.WebMoveCursorEnd(this)).execute();
   }
 
-  async runScript(script) {
-    return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptAction(this, script)).execute();
-  }
+  async runScript(maybeFunction, args) {
+    const script = stringifyScript(maybeFunction);
 
-  async runScriptWithArgs(script, args) {
-    return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptWithArgsAction(this, script, args)).execute();
+    if (args) {
+      return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptWithArgsAction(this, script, args)).execute();
+    } else {
+      return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptAction(this, script)).execute();
+    }
   }
 
   async getCurrentUrl() {
@@ -116,10 +120,24 @@ class WebViewElement {
       });
     }
 
-    throw new DetoxRuntimeError(`element() argument is invalid, expected a web matcher, but got ${typeof element}`);
+    throw new DetoxRuntimeError(`element() argument is invalid, expected a web matcher, but got ${typeof webMatcher}`);
   }
 }
 
+function stringifyScript(maybeFunction) {
+  if (typeof maybeFunction !== 'string' && typeof maybeFunction !== 'function') {
+    return maybeFunction;
+  }
+
+  const script = (typeof maybeFunction === 'function' ? maybeFunction.toString() : assertIsFunction(maybeFunction)).trim();
+  // WebElement interactions don't support arrow functions for some reason.
+  if (isArrowFunction(script)) {
+    return `function arrowWorkaround() { return (${script}).apply(this, arguments); }`;
+  }
+
+  return script;
+}
+
 module.exports = {
   WebElement,
   WebViewElement,

package/src/android/espressoapi/DetoxAssertion.js

@@ -14,7 +14,7 @@ function sanitize_matcher(matcher) {
   return originalMatcher.type ? originalMatcher.value : originalMatcher;
 } 
 class DetoxAssertion {
-  static assertMatcher(i, m) {
+  static assertMatcher(viewInteraction, viewMatcher) {
     return {
       target: {
         type: "Class",
@@ -23,15 +23,15 @@ class DetoxAssertion {
       method: "assertMatcher",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(m)
+        value: sanitize_matcher(viewMatcher)
       }]
     };
   }
 
-  static assertNotVisible(i) {
+  static assertNotVisible(viewInteraction) {
     return {
       target: {
         type: "Class",
@@ -40,12 +40,12 @@ class DetoxAssertion {
       method: "assertNotVisible",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }]
     };
   }
 
-  static assertNotExists(i) {
+  static assertNotExists(viewInteraction) {
     return {
       target: {
         type: "Class",
@@ -54,12 +54,12 @@ class DetoxAssertion {
       method: "assertNotExists",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }]
     };
   }
 
-  static waitForAssertMatcher(i, m, timeoutSeconds) {
+  static waitForAssertMatcher(viewInteraction, viewMatcher, timeoutSeconds) {
     if (typeof timeoutSeconds !== "number") throw new Error("timeoutSeconds should be a number, but got " + (timeoutSeconds + (" (" + (typeof timeoutSeconds + ")"))));
     return {
       target: {
@@ -69,10 +69,10 @@ class DetoxAssertion {
       method: "waitForAssertMatcher",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(m)
+        value: sanitize_matcher(viewMatcher)
       }, {
         type: "Double",
         value: timeoutSeconds
@@ -80,7 +80,8 @@ class DetoxAssertion {
     };
   }
 
-  static waitForAssertMatcherWithSearchAction(i, vm, searchAction, searchMatcher) {
+  static waitForAssertMatcherWithSearchAction(viewInteraction, viewMatcher, searchAction, searchMatcher
+  ) {
     return {
       target: {
         type: "Class",
@@ -89,13 +90,14 @@ class DetoxAssertion {
       method: "waitForAssertMatcherWithSearchAction",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(vm)
+        value: sanitize_matcher(viewMatcher)
       }, searchAction, {
         type: "Invocation",
-        value: sanitize_matcher(searchMatcher)
+        value: sanitize_matcher(searchMatcher
+        )
       }]
     };
   }

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/espressoapi/EspressoDetox.js

@@ -5,9 +5,16 @@
 */
 
 
+function sanitize_matcher(matcher) {
+  if (!matcher._call) {
+    return matcher;
+  }
 
+  const originalMatcher = typeof matcher._call === 'function' ? matcher._call() : matcher._call;
+  return originalMatcher.type ? originalMatcher.value : originalMatcher;
+} 
 class EspressoDetox {
-  static perform(interaction, action) {
+  static perform(matcher, action) {
     return {
       target: {
         type: "Class",
@@ -16,7 +23,7 @@ class EspressoDetox {
       method: "perform",
       args: [{
         type: "Invocation",
-        value: interaction
+        value: sanitize_matcher(matcher)
       }, action]
     };
   }

package/src/android/espressoapi/web/WebElement.js

@@ -76,10 +76,7 @@ class WebElement {
     return {
       target: element,
       method: "runScriptWithArgs",
-      args: [script, {
-        type: "ArrayList<Object>",
-        value: args
-      }]
+      args: [script, args]
     };
   }
 

package/src/android/interactions/native.js

@@ -25,9 +25,9 @@ class Interaction {
 }
 
 class ActionInteraction extends Interaction {
-  constructor(invocationManager, element, action, traceDescription) {
+  constructor(invocationManager, matcher, action, traceDescription) {
     super(invocationManager, traceDescription);
-    this._call = EspressoDetoxApi.perform(call(element._call), action._call);
+    this._call = EspressoDetoxApi.perform(matcher, action._call);
     // TODO: move this.execute() here from the caller
   }
 }
@@ -48,7 +48,6 @@ class WaitForInteraction extends Interaction {
     super(invocationManager, expectTraceDescription);
     this._element = element;
     this._assertionMatcher = assertionMatcher;
-    this._element._selectElementWithMatcher(this._element._originalMatcher);
   }
 
   async withTimeout(timeout) {

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, type and value not supported
   web: {
     id: (value) => new web.IdMatcher(value),
     className: (value) => new web.ClassNameMatcher(value),
@@ -19,5 +20,8 @@ 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),
+    accessibilityType: (value) => new web.AccessibilityTypeMatcher(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,27 @@ 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 AccessibilityTypeMatcher extends WebMatcher {
+  constructor(_) {
+    super();
+    throw new DetoxRuntimeError('Accessibility-type matching is not supported on Android');
+  }
+}
+
 class TagNameMatcher extends WebMatcher {
   constructor(tag) {
     super();
@@ -66,5 +88,8 @@ module.exports = {
   XPathMatcher,
   LinkTextMatcher,
   PartialLinkTextMatcher,
-  TagNameMatcher
+  TagNameMatcher,
+  LabelMatcher,
+  ValueMatcher,
+  AccessibilityTypeMatcher,
 };