detox 20.22.1 → 20.23.0-smoke.0

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0-sources.jar.md5

@@ -0,0 +1 @@
+35960dfcb6e053dbdd1cddf842f8a932

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0-sources.jar.sha1

@@ -0,0 +1 @@
+280b11f2addf683c2a11d09d555079ca891aba5d

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0-sources.jar.sha256

@@ -0,0 +1 @@
+24dc946bbdc697e12f43d81d9867e5c5e713c88c93badd195e16874d9a0e865c

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0-sources.jar.sha512

@@ -0,0 +1 @@
+3446f3c4f924dc988149f58cfe0bc89a20720dfa81d2317bd74d30b3cf292da013d0a5a3f5f36f8621c05beb7917b524a15fdb97ed2ab53d234d7008a05f67fd

package/Detox-android/com/wix/detox/{20.22.1/detox-20.22.1.pom → 20.23.0-smoke.0/detox-20.23.0-smoke.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.22.1</version>
+  <version>20.23.0-smoke.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0.pom.md5

@@ -0,0 +1 @@
+01b16d5926dc555cc5aca7c9501c2f7f

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0.pom.sha1

@@ -0,0 +1 @@
+da14af43696da5fd72561d49f7bef89a86d76bd5

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0.pom.sha256

@@ -0,0 +1 @@
+6a8709f6a239e043a22435da51ef90f7d19ea6a95c526c14e0c2b211469d6d5b

package/Detox-android/com/wix/detox/20.23.0-smoke.0/detox-20.23.0-smoke.0.pom.sha512

@@ -0,0 +1 @@
+5bc04cef0eae6bdd6fdb51e94afa336c9f7758a90746ad1391360ea8dd1222e8157577e0518fea9d045061e20bc67edbbe0965846419d0e84f09e185764fbc0f

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.22.1</latest>
-    <release>20.22.1</release>
+    <latest>20.23.0-smoke.0</latest>
+    <release>20.23.0-smoke.0</release>
     <versions>
-      <version>20.22.1</version>
+      <version>20.23.0-smoke.0</version>
     </versions>
-    <lastUpdated>20240522140456</lastUpdated>
+    <lastUpdated>20240610043639</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-be375cfc5f6f5d52ccd52744de282b44
+143a2d3e3c326e37422bc57b233be521

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-b5e4ab1628b01486489fd6889ab1bee10df43ca2
+e23ee18844ac5e3c0aab78a8ee990282083ac459

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-14de207023f462ae370425b1669b6d13e5a02160d3a7f7b581b25ff113fc28cf
+3f7034ec2947d54dbaba93f26ef2fdd044020834c570958bba0af2f05272a716

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-591f800135fe68cdb99f56ea49997a74e5c353b1ecf77a70a0e3a779f33b4f174a1b478361056b349bdd4f966e1aa0437a168abf5f2dd74c8faa042317a8d7df
+72bc4724d4bab46f6cda6469072b2093b08b3a88786b7ee11eab97509b129a842b8b5a111b310d9e0130bda31e03d83c4c04633e4b7ca4bb54d08afc9c5e64de

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0-sources.jar.md5

@@ -0,0 +1 @@
+7c10ba4842c9bad0fd7d3cb7c68f4435

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0-sources.jar.sha1

@@ -0,0 +1 @@
+41fc777855b8cde1b72ce5d8fccd9b69b0f3d86d

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0-sources.jar.sha256

@@ -0,0 +1 @@
+fb8a89ec2730d466a946e144df0bdc48fc441da6cc14ca38c8bce43922a524aa

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0-sources.jar.sha512

@@ -0,0 +1 @@
+0f0dce8745a13baf07808c178751d19f2d667d921e6a4b05d983b2c6a31828dfc23c439b918123e82130cb52855fd591068ba021c12104aaf1a1d3271bea3115

package/Detox-android/com/wix/detox-legacy/{20.22.1/detox-legacy-20.22.1.pom → 20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
-  <version>20.22.1</version>
+  <version>20.23.0-smoke.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0.pom.md5

@@ -0,0 +1 @@
+0ae3733b61725a74c5072628f899982e

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0.pom.sha1

@@ -0,0 +1 @@
+8658c9475bc816f19537d92d9c3d077d75610a94

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0.pom.sha256

@@ -0,0 +1 @@
+d246e00073b7f935fe20c0a708c34f707503d5f052d520e36689ad4db34cd9ff

package/Detox-android/com/wix/detox-legacy/20.23.0-smoke.0/detox-legacy-20.23.0-smoke.0.pom.sha512

@@ -0,0 +1 @@
+141f3b5854900d41b777a0110edbb1aa9cac6703ca28ecfc5b07a0aa10e270eaa3d1c53fccd095c7290a0ebd9ea648181a63c6532ecc5e9a7c0ea6588139f214

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
   <versioning>
-    <latest>20.22.1</latest>
-    <release>20.22.1</release>
+    <latest>20.23.0-smoke.0</latest>
+    <release>20.23.0-smoke.0</release>
     <versions>
-      <version>20.22.1</version>
+      <version>20.23.0-smoke.0</version>
     </versions>
-    <lastUpdated>20240522140527</lastUpdated>
+    <lastUpdated>20240610043752</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.md5

@@ -1 +1 @@
-d800dd5b49eac3eb61df71c2f4609c6b
+237e4dabfdb650076ff4d4516c642737

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha1

@@ -1 +1 @@
-351f9fb4f8c062897ded72817f766ec70fa3efcd
+6d65e7dbd88a65a18b29567f074c8ab1d979332e

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha256

@@ -1 +1 @@
-54d45c0fc44b6e69c9fb7db576f8792b9d47bbd9fda8cc9e951c9282a2c53ab3
+6e53c962e3829538ae724dc1cb2e1b7a70a246ca075fa26ede1d661857ecbb92

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha512

@@ -1 +1 @@
-fa3890f141a927f269a7f2e4d807a65f9a2a4171c745858898229e826249ec830a6fbfae74eeb23e9602c6e40d274fc42f9c937bd3667f9784c36ef82d3da980
+e943c05deacc50394255d977b8409d46826419511dff50638810f1ee6c1436748af91b51bedef06ba1ed82b1d59389f7aca75eecc65b40138c1e96825b78de0e

package/detox.d.ts

@@ -1112,6 +1112,30 @@ declare global {
              * web.element(by.web.tag('mark'))
              */
             tag(tagName: string): WebMatcher;
+
+            /**
+             * (iOS Only) Find an element on the DOM tree by its value
+             * @param value
+             * @example
+             * web.element(by.web.value('hello'))
+             */
+            value(value: string): WebMatcher;
+
+            /**
+             * (iOS Only) Find an element or secured element on the web-view by its accessibility label.
+             * @param text
+             * @example
+             * web.securedElement(by.web.label('Submit'))
+             * web.element(by.web.label('Submit'))
+             */
+            label(text: string): MaybeSecuredWebMatcher;
+
+            /**
+             * (iOS Only) Find a secured element on the web-view by its accessibility type.
+             * @example
+             * web.securedElement(by.web.type('textField'))
+             */
+            type(type: string): SecuredWebMatcher;
         }
 
         interface BySystemFacade {
@@ -1156,6 +1180,14 @@ declare global {
             __web__: any; // prevent type coercion
         }
 
+        interface SecuredWebMatcher {
+            __securedWeb__: any; // prevent type coercion
+        }
+
+        interface MaybeSecuredWebMatcher {
+            __maybeSecuredWeb__: any; // prevent type coercion
+        }
+
         interface SystemMatcher {
           __system__: any; // prevent type coercion
         }
@@ -1165,15 +1197,22 @@ declare global {
 
             (webElement: WebElement): WebExpect;
 
+            (securedWebElement: SecuredWebElement): SecuredWebExpect;
+
             (systemElement: SystemElement): SystemExpect;
         }
 
+        type MaybeSecuredWebElement<T> = T extends MaybeSecuredWebMatcher ?
+            IndexableMaybeSecuredWebElement & SecuredWebElementFacade :
+            T extends SecuredWebMatcher ? IndexableSecuredWebElement & SecuredWebElementFacade :
+                IndexableWebElement;
+
         interface WebViewElement {
             /**
              * Find a web element by a matcher.
              * @param webMatcher a web matcher for the web element.
              */
-            element(webMatcher: WebMatcher): IndexableWebElement;
+            element<T extends WebMatcher>(webMatcher: T): MaybeSecuredWebElement<T>;
 
             /**
              * Returns the index-th web-view in the UI hierarchy that is matched by the given matcher.
@@ -1196,6 +1235,13 @@ declare global {
             (matcher?: NativeMatcher): WebViewElement;
         }
 
+        interface SecuredWebElementFacade {
+            /**
+             * Gets the secured webview element as a testing element.
+             */
+            asSecured(): IndexableSecuredWebElement;
+        }
+
         interface SystemFacade {
             /**
              * Find an element on the System-level using a system matcher.
@@ -1592,6 +1638,20 @@ declare global {
             toExist(): R;
         }
 
+        interface SecuredWebExpect<R = Promise<void>> {
+            /**
+             * (iOS Only) Negate the expectation.
+             * @example await expect(web.securedElement(by.web.id('sessionTimeout'))).not.toExist();
+             */
+            not: this;
+
+            /**
+             * (iOS Only) Expect the view to exist in the webview DOM tree.
+             * @example await expect(web.securedElement(by.web.id('submitButton'))).toExist();
+             */
+            toExist(): R;
+        }
+
         interface SystemExpect<R = Promise<void>> {
           /**
            * Negate the expectation.
@@ -1608,6 +1668,39 @@ declare global {
           toExist(): R;
         }
 
+        interface SecuredWebElement extends SecuredWebElementActions {
+        }
+
+        interface SecuredWebElementActions {
+            /**
+             * Tap on a secured web element.
+             * @example await web.securedElement(by.web.type('textField')).tap();
+             */
+            tap(): Promise<void>;
+
+            /**
+             * (iOS Only) Type text into a web element.
+             * @param text to type
+             * @param isContentEditable whether the element is content-editable, default is false. Ignored on iOS.
+             * @example await web.securedElement(by.web.type('textField')).typeText('passcode');
+             */
+            typeText(text: string, isContentEditable: boolean): Promise<void>;
+
+            /**
+             * (iOS Only) Replaces the input content with the new text.
+             * @param text to replace with the old content.
+             * @example await web.securedElement(by.web.type('textField')).replaceText('passcode');
+             */
+            replaceText(text: string): Promise<void>;
+
+            /**
+             * (iOS Only) Clears the input content.
+             * @note On Android, not working for content-editable elements.
+             * @example await web.securedElement(by.web.type('textField')).clearText();
+             */
+            clearText(): Promise<void>;
+        }
+
         interface IndexableWebElement extends WebElement {
             /**
              * Choose from multiple elements matching the same matcher using index.
@@ -1616,6 +1709,21 @@ declare global {
             atIndex(index: number): WebElement;
         }
 
+        interface IndexableSecuredWebElement extends SecuredWebElement {
+            /**
+             * Choose from multiple elements matching the same matcher using index.
+             * @example await web.securedElement(by.web.tag('p')).atIndex(2).tap();
+             */
+            atIndex(index: number): SecuredWebElement & SecuredWebElementFacade;
+        }
+
+        interface IndexableMaybeSecuredWebElement {
+            /**
+             * Choose from multiple elements matching the same matcher using index
+             */
+            atIndex(index: number): WebElement & SecuredWebElementFacade;
+        }
+
         interface WebElement extends WebElementActions {
         }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.22.1",
+  "version": "20.23.0-smoke.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -115,5 +115,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "20413288382d53854fe485784683117490e203c4"
+  "gitHead": "9bf6700bebfd49e49927cad7cf8b4ddd0731eb67"
 }

package/scripts/pack_ios.sh

@@ -15,18 +15,22 @@ cd ..
 echo "Packaging iOS sources and prebuilt frameworks"
 
 # Create temp build directory
-mkdir build_temp
+mkdir build_temp_framework
 
 # Package prebuilt framework
-scripts/build_framework.ios.sh "ios/Detox.xcodeproj" "build_temp"
+scripts/build_framework.ios.sh "ios/Detox.xcodeproj" "build_temp_framework"
+cd build_temp_framework
+tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios-framework.tbz .
+cd ..
+rm -rf build_temp_framework
 
-# Package prebuilt XCUITest runner
-scripts/build_xcuitest.ios.sh "ios/DetoxXCUITestRunner/DetoxXCUITestRunner.xcodeproj" "build_temp"
 
-cd build_temp
+# Create temp build directory
+mkdir build_temp_xcuitest
+
+# Package prebuilt XCUITest runner
+scripts/build_xcuitest.ios.sh "ios/DetoxXCUITestRunner/DetoxXCUITestRunner.xcodeproj" "build_temp_xcuitest"
+cd build_temp_xcuitest
 tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios-xcuitest.tbz .
-tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios-framework.tbz .
 cd ..
-
-# Cleanup
-rm -fr build_temp
+rm -rf build_temp_xcuitest

package/src/android/core/WebElement.js

@@ -26,6 +26,10 @@ class WebElement {
     this.atIndex(0);
   }
 
+  asSecured() {
+    throw new DetoxRuntimeError('asSecured() is not supported for Android WebElement');
+  }
+
   atIndex(index) {
     const webViewElementCall = this[_webViewElement]._call;
     const webMatcherCall = this[_webMatcher]._call;

package/src/android/matchers/index.js

@@ -21,6 +21,8 @@ module.exports = {
     xpath: (value) => new web.XPathMatcher(value),
     href: (value) => new web.LinkTextMatcher(value),
     hrefContains: (value) => new web.PartialLinkTextMatcher(value),
+    label: (_value) => { throw new DetoxRuntimeError('Label matcher is not supported on Android'); },
+    value: (_value) => { throw new DetoxRuntimeError('Value matcher is not supported on Android'); },
   },
 
   system: {

package/src/ios/XCUITestRunner.js

@@ -5,14 +5,14 @@ const environment = require('../utils/environment');
 const log = require('../utils/logger').child({ cat: 'xcuitest-runner' });
 
 class XCUITestRunner {
-    constructor({ simulatorId }) {
-        this.simulatorId = simulatorId;
+    constructor({ runtimeDevice }) {
+        this.runtimeDevice = runtimeDevice;
     }
 
     async execute(invocationParams) {
         log.trace(
           { event: 'XCUITEST_RUNNER' },
-          'invocation params: %j, simulator id: %s', invocationParams, this.simulatorId
+          'invocation params: %j, simulator id: %s, bundle id: %s', invocationParams, this.runtimeDevice.id, this.runtimeDevice._bundleId
         );
 
         const base64InvocationParams = Buffer.from(JSON.stringify(invocationParams)).toString('base64');
@@ -28,12 +28,16 @@ class XCUITestRunner {
         const flags = [
             '-xctestrun', runnerPath,
             '-sdk', 'iphonesimulator',
-            '-destination', `"platform=iOS Simulator,id=${this.simulatorId}"`,
+            '-destination', `"platform=iOS Simulator,id=${this.runtimeDevice.id}"`,
             'test-without-building',
         ];
 
+        log.info(`Running XUICTest runner. See target logs using:\n` +
+          `\t/usr/bin/xcrun simctl spawn ${this.runtimeDevice.id} log stream --level debug --style compact ` +
+          `--predicate 'process == "DetoxXCUITestRunner-Runner" && subsystem == "com.wix.DetoxXCUITestRunner.xctrunner"'`);
+
         try {
-            return await exec(`TEST_RUNNER_PARAMS="${base64InvocationParams}" xcodebuild ${flags.join(' ')}`);
+            return await exec(`TEST_RUNNER_PARAMS="${base64InvocationParams}" TEST_RUNNER_BUNDLE_ID="${this.runtimeDevice._bundleId}" xcodebuild ${flags.join(' ')}`);
         } catch (e) {
             const stdout = e.stdout.toString();
             const innerError = this.findInnerError(stdout);

package/src/ios/expectTwo.js

@@ -783,7 +783,7 @@ class IosExpect {
     }
 
     if (isWebElement(element)) {
-      return webExpect(this._invocationManager, element);
+      return webExpect(this._invocationManager, this._xcuitestRunner, element);
     }
 
     return expect(this._invocationManager, element);
@@ -807,7 +807,7 @@ class IosExpect {
         }
 
         const webViewElement = matcher ? element(this._invocationManager, this._emitter, matcher) : undefined;
-        return webElement(this._invocationManager, this._emitter, webViewElement, webMatcher);
+        return webElement(this._invocationManager, this._xcuitestRunner, this._emitter, webViewElement, webMatcher);
       }
     };
   }

package/src/ios/web.js

@@ -8,14 +8,17 @@ const traceInvocationCall = require('../utils/traceInvocationCall').bind(null, l
 
 
 class WebExpect {
-  constructor(invocationManager, element) {
+  constructor(invocationManager, xcuitestRunner, element) {
     this._invocationManager = invocationManager;
+    this._xcuitestRunner = xcuitestRunner;
     this.element = element;
     this.modifiers = [];
   }
 
   toHaveText(text) {
+    if (this.element.isSecured) throw new DetoxRuntimeError('toHaveText cannot be used with secured elements');
     if (typeof text !== 'string') throw new DetoxRuntimeError('text should be a string, but got ' + (text + (' (' + (typeof text + ')'))));
+
     const traceDescription = expectDescription.toHaveText(text);
     return this.expect('toHaveText', traceDescription, text);
   }
@@ -51,17 +54,39 @@ class WebExpect {
 
     const invocation = this.createInvocation(expectation, ...params);
     traceDescription = expectDescription.full(traceDescription, this.modifiers.includes('not'));
-    return _executeInvocation(this._invocationManager, invocation, traceDescription);
+
+    const invocationRunner = this.element.isSecured ? this._xcuitestRunner : this._invocationManager;
+    return _executeInvocation(invocationRunner, invocation, traceDescription);
   }
 }
 
 class WebElement {
-  constructor(invocationManager, emitter, webViewElement, matcher, index) {
+  constructor(invocationManager, xcuitestRunner, emitter, webViewElement, matcher, index) {
     this._invocationManager = invocationManager;
+    this._xcuitestRunner = xcuitestRunner;
     this._emitter = emitter;
     this.webViewElement = webViewElement;
     this.matcher = matcher;
     this.index = index;
+    this.isSecured = false;
+  }
+
+  asSecured() {
+    const supportedMatcherTypes = ['label', 'type'];
+    const matcherType = this.matcher.predicate.type;
+
+    if (!supportedMatcherTypes.includes(matcherType)) {
+      throw new DetoxRuntimeError(`Only matchers of type ${supportedMatcherTypes.join(', ')} can be secured, got ${matcherType}`);
+    }
+
+    this.isSecured = true;
+    return this;
+  }
+
+  assertUnsecured() {
+    if (this.isSecured) {
+      throw new DetoxRuntimeError('This action is not supported on secured elements');
+    }
   }
 
   atIndex(index) {
@@ -91,11 +116,15 @@ class WebElement {
   }
 
   selectAllText() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.selectAllText();
     return this.withAction('selectAllText', traceDescription);
   }
 
   async getText() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.getText();
     let result = await this.withAction('getText', traceDescription);
     return this.extractResult(result, { type: 'text' });
@@ -118,21 +147,29 @@ class WebElement {
   }
 
   scrollToView() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.scrollToView();
     return this.withAction('scrollToView', traceDescription);
   }
 
   focus() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.focus();
     return this.withAction('focus', traceDescription);
   }
 
   moveCursorToEnd() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.moveCursorToEnd();
     return this.withAction('moveCursorToEnd', traceDescription);
   }
 
   async runScript(script, args) {
+    this.assertUnsecured();
+
     if (args !== undefined && args.length !== 0) {
       return await this.runScriptWithArgs(script, args);
     }
@@ -147,6 +184,8 @@ class WebElement {
   }
 
   async runScriptWithArgs(script, args) {
+    this.assertUnsecured();
+
     if (typeof script === 'function') {
       script = script.toString();
     }
@@ -157,12 +196,16 @@ class WebElement {
   }
 
   async getCurrentUrl() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.getCurrentUrl();
     let result = await this.withAction('getCurrentUrl', traceDescription);
     return this.extractResult(result, { type: 'url' });
   }
 
   async getTitle() {
+    this.assertUnsecured();
+
     const traceDescription = webViewActionDescription.getTitle();
     let result = await this.withAction('getTitle', traceDescription);
     return this.extractResult(result, { type: 'title' });
@@ -183,7 +226,9 @@ class WebElement {
       ...(params.length !== 0 && { params }),
     };
     traceDescription = webViewActionDescription.full(traceDescription);
-    return _executeInvocation(this._invocationManager, invocation, traceDescription);
+
+    const invocationRunner = this.isSecured ? this._xcuitestRunner : this._invocationManager;
+    return _executeInvocation(invocationRunner, invocation, traceDescription);
   }
 }
 
@@ -247,18 +292,24 @@ class WebElementMatcher {
     this.predicate = { type: 'value', value: value.toString() };
     return this;
   }
+
+  type(type) {
+    if (typeof type !== 'string') throw new DetoxRuntimeError('type should be a string, but got ' + (type + (' (' + (typeof type + ')'))));
+    this.predicate = { type: 'type', value: type.toString() };
+    return this;
+  }
 }
 
 function webMatcher() {
   return new WebElementMatcher();
 }
 
-function webElement(invocationManager, emitter, webViewElement, matcher) {
+function webElement(invocationManager, xcuitestRunner, emitter, webViewElement, matcher) {
   if (!(matcher instanceof WebElementMatcher)) {
     throwWebViewMatcherError(matcher);
   }
 
-  return new WebElement(invocationManager, emitter, webViewElement, matcher);
+  return new WebElement(invocationManager, xcuitestRunner, emitter, webViewElement, matcher);
 }
 
 function throwWebViewMatcherError(param) {
@@ -266,8 +317,8 @@ function throwWebViewMatcherError(param) {
   throw new DetoxRuntimeError(`${paramDescription} is not a Detox web-view matcher. More about web-view matchers here: https://wix.github.io/Detox/docs/api/webviews`);
 }
 
-function webExpect(invocationManager, element) {
-  return new WebExpect(invocationManager, element);
+function webExpect(invocationManager, xcuitestRunner, element) {
+  return new WebExpect(invocationManager, xcuitestRunner, element);
 }
 
 function _executeInvocation(invocationManager, invocation, traceDescription) {

package/src/matchers/factories/index.js

@@ -15,7 +15,7 @@ class Ios extends MatchersFactory {
   createMatchers({ invocationManager, runtimeDevice, eventEmitter }) {
     const IosExpect = require('../../ios/expectTwo');
     const XCUITestRunner = require('../../ios/XCUITestRunner');
-    const xcuitestRunner = new XCUITestRunner({ simulatorId: runtimeDevice.id });
+    const xcuitestRunner = new XCUITestRunner({ runtimeDevice: runtimeDevice });
 
     return new IosExpect({
       invocationManager,

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1-sources.jar.md5

@@ -1 +0,0 @@
-12fc5f8f5320722c32cec05913e1ea6b

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1-sources.jar.sha1

@@ -1 +0,0 @@
-6c359a3d909e73c7a186d15a480de5d523803c0d

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1-sources.jar.sha256

@@ -1 +0,0 @@
-f7a62fd36fa62076f9273972eea7319f13a4ecc89b87efdf766523ba3a1b1b59

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1-sources.jar.sha512

@@ -1 +0,0 @@
-27fca15dfea754479b3d4932c65e57a305822286a148f4ed496be8726650c612367529ac6d7bf1f959086a674513ae141523fa4ada8480fc170518261d7b4292

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1.pom.md5

@@ -1 +0,0 @@
-6d487956856369ba599fef5ba68a73c9

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1.pom.sha1

@@ -1 +0,0 @@
-eaeeac7afa38642e32dd5e36396d78c724842a19

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1.pom.sha256

@@ -1 +0,0 @@
-0ac8080eaaf88cc82d30ed366786ab6c0023e591b33d3857e935fd34eb73ed19

package/Detox-android/com/wix/detox/20.22.1/detox-20.22.1.pom.sha512

@@ -1 +0,0 @@
-a60debc9e9267c3fa18c7a71539c6b35d4d2e60def71a08ba72a584217c602db2eac2c79c83a30beddea7d6b08fc2ac052bf9588660171c43dccab53ff314615

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1-sources.jar.md5

@@ -1 +0,0 @@
-68151b450b19bd10ebc8119f7a9382a5

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1-sources.jar.sha1

@@ -1 +0,0 @@
-55a0ede0c449fd4b7fca263566dfaa1dd0eb19ab

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1-sources.jar.sha256

@@ -1 +0,0 @@
-7b6e5ee416c4d6d7dfc834fdd59600f429c3abf51f12b038f8083bce6f9cf7dd

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1-sources.jar.sha512

@@ -1 +0,0 @@
-5faae34c57ba69628bb52fdb7dac52f85a8388977e316029525b66fb19a4d317574b847b280c23269b62b1d615b4e7f8bc0fcffd8c69c379a33b6378acbd4562

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1.pom.md5

@@ -1 +0,0 @@
-68ca5e83cbe1ded287a19e9e32b06982

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1.pom.sha1

@@ -1 +0,0 @@
-d1dfc9a900e3adc43218535a9461e47d9128aea5

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1.pom.sha256

@@ -1 +0,0 @@
-d507b9f1814be25348eb81707b668aaf44f212b7a17bbb2597a9bc174f3f4e60

package/Detox-android/com/wix/detox-legacy/20.22.1/detox-legacy-20.22.1.pom.sha512

@@ -1 +0,0 @@
-654a047e166839fed9b651bd1b1f22005b8d8b2d7ccfd0e4e43afb9d87f48a6d3e6d9375f6a71b0384443f65b61daf06475b7c526ebd263f99b8e80e28a09091