detox 19.1.0 → 19.3.0

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0-javadoc.jar.md5

@@ -0,0 +1 @@
+d4d970b43d6b113abfd4152017edfab2

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+f5c22b0b55f8fcf94d5cdeaf3dafd123b1711696

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+42175c539b389fee647b5dd3f4d7bb271a1c1900a27663498275b6ebc000a818

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+04dd66310a28bb63cf9e71580a3a74c8521bfae01ea872639402cff4b27c641478a14b82787fdd4cbd21ba5560a0023bc8052f27924cb5ceb2af1934f3c31529

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

@@ -0,0 +1 @@
+eaca9cb551c4d3454431605785da7445

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

@@ -0,0 +1 @@
+ccc218dc19145f4c3fba84f0777461c92a406dba

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

@@ -0,0 +1 @@
+301241bb6f38f53d9f78f41debca66897d25bce9432e4e9ce4bae8a9fc8b7482

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

@@ -0,0 +1 @@
+2868b459362e50d440322d5041eac0c57381847c65b27f47ce62baea301be6e27b2de5054d290ebedd17c78a53394950f2a8a5bd74ce9468cbdc4f2fc6ce31cd

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0.aar.md5

@@ -0,0 +1 @@
+37265557ea2042fc7b84163cc7eb4ddd

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0.aar.sha1

@@ -0,0 +1 @@
+4fa9e0bd79f1e519ba4af43d3a7673052ddad4a9

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0.aar.sha256

@@ -0,0 +1 @@
+75d310142663310ad9592fa8fd306469411b1f7e680fd41748ada4fa2ec5c24b

package/Detox-android/com/wix/detox/19.3.0/detox-19.3.0.aar.sha512

@@ -0,0 +1 @@
+a40481ba3bcf8a270e7e80bf3f8ca9b7832559bae082242898b13245e3bb6ae67c93c539b30883640b24df671943228c9631e8dc97006dbf189b5eb26c52e148

package/Detox-android/com/wix/detox/{19.1.0/detox-19.1.0.pom → 19.3.0/detox-19.3.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>19.1.0</version>
+  <version>19.3.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/19.3.0/detox-19.3.0.pom.md5

@@ -0,0 +1 @@
+7393bc8e3fa71d574801da7f4f64898e

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

@@ -0,0 +1 @@
+c567f308beec77a64cf8a8627a00ddbdc51654d0

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

@@ -0,0 +1 @@
+90f65a4b6f4d01f26c6d15d9ef1790cf7d16447c688d99abe8874dfdbbaab1f7

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

@@ -0,0 +1 @@
+fd9a10f2bfcdab85fa5a9b7629971137144c3991c67d89f5f0a62d6058e4f37444e94dd80e8c2180e39f001265cb514bcb9763c31f554a2438744e51949ec6f1

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>19.1.0</latest>
-    <release>19.1.0</release>
+    <latest>19.3.0</latest>
+    <release>19.3.0</release>
     <versions>
-      <version>19.1.0</version>
+      <version>19.3.0</version>
     </versions>
-    <lastUpdated>20211119165641</lastUpdated>
+    <lastUpdated>20211206165152</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-853511665d775584decad75dc265b347
+84221a4a04e90451e71509a7dbe6ff16

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

@@ -1 +1 @@
-5a0a9a5eb9e0a763346e78dad55a808c7275cee7
+93646e96676f5c63194ac7fbb7902b2b7fe0b1dd

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

@@ -1 +1 @@
-30e924b363eed64c79dda4be3c5f2a75ef7278fbed28e526d7bbbce8e013118d
+1d70c96ab43da06fc4b86924ae1eb4035c4443eebb3d36138537e2ae598fbd5a

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

@@ -1 +1 @@
-a74a66d1937f3e79943741e64e70b9c81970cab3bc420c7f9fd1f6a8600f9f2c90aee020d3cfd3624f53085caf37c6a149d27e800a1b6749125c5cc4b03b2e97
+85a5235aad97fc0780472e2d4ab92190b2e6b9c3697853c60f0eb6d580830fcb6ccec5f07f9f314f9e049b938bf9069b2a6b8a319a2d4bfab6e156a4ca861a73

package/android/detox/proguard-rules-app.pro

@@ -11,3 +11,4 @@
 -keep class kotlin.jvm.** { *; }
 -keep class kotlin.collections.** { *; }
 -keep class kotlin.text.** { *; }
+-keep class kotlin.io.** { *; }

package/android/detox/src/full/java/com/wix/detox/espresso/matcher/ViewAtIndexMatcher.kt

@@ -21,6 +21,6 @@ class ViewAtIndexMatcher(private val index: Int, private val innerMatcher: Match
     }
 
     override fun describeTo(description: Description) {
-        description.appendText("matches " + index + "th view.")
+        description.appendText("View at index #$index, of those matching MATCHER$innerMatcher")
     }
 }

package/android/detox/src/testFull/java/com/wix/detox/espresso/matcher/ViewAtIndexMatcherSpec.kt

@@ -0,0 +1,38 @@
+package com.wix.detox.espresso.matcher
+
+import android.view.View
+import com.nhaarman.mockitokotlin2.*
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.mockito.Matchers
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+
+object ViewAtIndexMatcherSpec: Spek({
+    describe("atIndex view-matcher") {
+
+        lateinit var innerMatcher: Matcher<View>
+        lateinit var description: Description
+        beforeEachTest {
+            innerMatcher = mock()
+            whenever(innerMatcher.toString()).thenReturn("(innerMatcher description)")
+
+            description = mock()
+        }
+
+        describe("describeTo") {
+            it("should append a valid description for index 0") {
+                val uut = ViewAtIndexMatcher(0, innerMatcher)
+                uut.describeTo(description)
+                verify(description).appendText("View at index #0, of those matching MATCHER(innerMatcher description)")
+            }
+            
+            it("should append a valid description for index≥0") {
+                val uut = ViewAtIndexMatcher(7, innerMatcher)
+                uut.describeTo(description)
+                com.nhaarman.mockitokotlin2.
+                verify(description).appendText(Matchers.contains("View at index #7"))
+            }
+        }
+    }
+});

package/detox-native/README.md

@@ -82,7 +82,7 @@ dependencies {
 }
 ```
 
-In your root-project’s `build.gradle` - be sure to add `mavenCentral()` as an artifacts repository:
+In your root-project’s `build.gradle` - be sure to add `mavenCentral()` as an artifacts' repository:
 
 ```groovy
 buildscript {

package/index.d.ts

@@ -1,5 +1,5 @@
 // TypeScript definitions for Detox
-// Original authors:
+// Original authors (from DefinitelyTyped):
 // * Jane Smith <jsmith@example.com>
 // * Tareq El-Masri <https://github.com/TareqElMasri>
 // * Steve Chun <https://github.com/stevechun>
@@ -8,7 +8,6 @@
 // * Max Komarychev <https://github.com/maxkomarychev>
 // * Dor Ben Baruch <https://github.com/Dor256>
 
-
 declare global {
     const device: Detox.DetoxExportWrapper['device'];
     const element: Detox.DetoxExportWrapper['element'];
@@ -1227,6 +1226,24 @@ declare global {
              * });
              */
              takeScreenshot(name: string): Promise<string>;
+
+            /**
+             * Gets the native (OS-dependent) attributes of the element.
+             * For more information, see {@link https://wix.github.io/Detox/docs/api/actions-on-element/#getattributes}
+             *
+             * @example
+             * test('Get the attributes for my text element', async () => {
+             *    const attributes = await element(by.id('myText')).getAttributes()
+             *    const jestExpect = require('expect');
+             *    // 'visible' attribute available on both iOS and Android
+             *    jestExpect(attributes.visible).toBe(true);
+             *    // 'activationPoint' attribute available on iOS only
+             *    jestExpect(attributes.activationPoint.x).toHaveValue(50);
+             *    // 'width' attribute available on Android only
+             *    jestExpect(attributes.width).toHaveValue(100);
+             * })
+             */
+             getAttributes(): Promise<IosElementAttributes | AndroidElementAttributes | { elements: IosElementAttributes[]; }>;
         }
 
         interface WebExpect<R = Promise<void>> {
@@ -1445,6 +1462,149 @@ declare global {
             };
         }
 
+        // Element Attributes Shared Among iOS and Android
+        interface ElementAttributes {
+            /**
+             * Whether or not the element is enabled for user interaction.
+             */
+            enabled: boolean;
+            /**
+             * The identifier of the element. Matches accessibilityIdentifier on iOS, and the main view tag, on Android - both commonly holding the component's test ID in React Native apps.
+             */
+            identifier: string;
+            /**
+             * Whether the element is visible. On iOS, visibility is calculated for the activation point. On Android, the attribute directly holds the value returned by View.getLocalVisibleRect()).
+             */
+            visible: boolean;
+            /**
+             * The text value of any textual element.
+             */
+            text?: string;
+            /**
+             * The label of the element. Matches accessibilityLabel for ios, and contentDescription for android.
+             */
+            label?: string;
+            /**
+             * The placeholder text value of the element. Matches hint on android.
+             */
+            placeholder?: string;
+            /**
+             * The value of the element, where applicable.
+             * Matches accessibilityValue, on iOS.
+             * For example: the position of a slider, or whether a checkbox has been marked (Android).
+             */
+            value?: unknown;
+        }
+
+        interface IosElementAttributeFrame {
+            y: number;
+            x: number;
+            width: number;
+            height: number;
+        }
+
+        interface IosElementAttributeInsets {
+            right: number;
+            top: number;
+            left: number;
+            bottom: number;
+        }
+
+        // iOS Specific Attributes
+        interface IosElementAttributes extends ElementAttributes {
+            /**
+             * The [activation point]{@link https://developer.apple.com/documentation/objectivec/nsobject/1615179-accessibilityactivationpoint} of the element, in element coordinate space.
+             */
+            activationPoint: Point2D;
+            /**
+             * The activation point of the element, in normalized percentage ([0.0, 1.0]).
+             */
+            normalizedActivationPoint: Point2D;
+            /**
+             * Whether the element is hittable at the activation point.
+             */
+            hittable: boolean;
+            /**
+             * The frame of the element, in screen coordinate space.
+             */
+            frame: IosElementAttributeFrame;
+            /**
+             * The frame of the element, in container coordinate space.
+             */
+            elementFrame: IosElementAttributeFrame;
+            /**
+             * The bounds of the element, in element coordinate space.
+             */
+            elementBounds: IosElementAttributeFrame;
+            /**
+             * The safe area insets of the element, in element coordinate space.
+             */
+            safeAreaInsets: IosElementAttributeInsets;
+            /**
+             * The safe area bounds of the element, in element coordinate space.
+             */
+            elementSafeBounds: IosElementAttributeFrame;
+            /**
+             * The date of the element (if it is a date picker).
+             */
+            date?: string;
+            /**
+             * The normalized slider position (if it is a slider).
+             */
+            normalizedSliderPosition?: number;
+            /**
+             * The content offset (if it is a scroll view).
+             */
+            contentOffset?: Point2D;
+            /**
+             * The content inset (if it is a scroll view).
+             */
+            contentInset?: IosElementAttributeInsets;
+            /**
+             * The adjusted content inset (if it is a scroll view).
+             */
+            adjustedContentInset?: IosElementAttributeInsets;
+            /**
+             * @example "<CALayer: 0x600003f759e0>"
+             */
+            layer: string;
+        }
+
+        // Android Specific Attributes
+        interface AndroidElementAttributes extends ElementAttributes {
+            /**
+             * The OS visibility type associated with the element: visible, invisible or gone.
+             */
+            visibility: 'visible' | 'invisible' | 'gone';
+            /**
+             * Width of the element, in pixels.
+             */
+            width: number;
+            /**
+             * Height of the element, in pixels.
+             */
+            height: number;
+            /**
+             * Elevation of the element.
+             */
+            elevation: number;
+            /**
+             * Alpha value for the element.
+             */
+            alpha: number;
+            /**
+             * Whether the element is the one currently in focus.
+             */
+            focused: boolean;
+            /**
+             * The text size for the text element.
+             */
+            textSize?: number;
+            /**
+             * The length of the text element (character count).
+             */
+            length?: number;
+        }
     }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "19.1.0",
+  "version": "19.3.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "@types/child-process-promise": "^2.2.1",
+    "@types/node": "^12.20.37",
     "@types/ws": "^7.4.0",
     "eslint": "^4.11.0",
     "eslint-plugin-import": "^2.23.3",
@@ -119,7 +120,6 @@
       "src/devices/allocation/factories",
       "src/devices/allocation/factories/drivers",
       "src/devices/cookies",
-      "src/devices/common/drivers/android/exec/AAPT.js",
       "src/devices/common/drivers/android/exec/ADB.js",
       "src/devices/common/drivers/android/emulator/exec/EmulatorExec.js",
       "src/devices/common/drivers/android/tools/EmulatorTelnet.js",
@@ -166,5 +166,5 @@
       }
     }
   },
-  "gitHead": "4b4d018ca01716802f21dae3bbb941775cc05077"
+  "gitHead": "a9db26d8caa157fc39938784c937ce863247f974"
 }

package/src/artifacts/screenshot/ScreenshotArtifactPlugin.js

@@ -14,12 +14,8 @@ class ScreenshotArtifactPlugin extends TwoSnapshotsPerTestPlugin {
     });
   }
 
-  async preparePathForSnapshot(testSummary, name) {
-    const artifactName = name.endsWith('/')
-      ? name.slice(0, -1)
-      : `${name}.png`;
-
-    return this.api.preparePathForArtifact(artifactName, testSummary);
+  async preparePathForSnapshot(testSummary, artifactName) {
+    return this.api.preparePathForArtifact(`${artifactName}.png`, testSummary);
   }
 
   async onBeforeCleanup(e) {

package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 const fs = require('../../utils/fsext');
 const log = require('../../utils/logger').child({ __filename });
 const FileArtifact = require('../templates/artifact/FileArtifact');
@@ -51,19 +53,21 @@ class SimulatorScreenshotPlugin extends ScreenshotArtifactPlugin {
   }
 
   _onInvokeFailure({ params }) {
-    const artifacts = {
-      visibilityFailingScreenshots: params.visibilityFailingScreenshotsURL,
-      visibilityFailingRects: params.visibilityFailingRectsURL,
-    };
-
-    for (const [key, artifactPath] of Object.entries(artifacts)) {
-      if (!artifactPath || fs.isDirEmptySync(artifactPath)) {
-        continue;
+    const visibilityArtifactDirs = [
+      params.visibilityFailingScreenshotsURL,
+      params.visibilityFailingRectsURL
+    ].filter(Boolean);
+
+    for (const visibilityDir of visibilityArtifactDirs) {
+      for (const innerFile of fs.readdirSync(visibilityDir)) {
+        const ext = path.extname(innerFile);
+        if (ext === '.png') {
+          const artifactName = path.basename(innerFile, ext).replace(/ /g, '_');
+          this._registerSnapshot(artifactName, new FileArtifact({
+            temporaryPath: path.join(visibilityDir, innerFile),
+          }));
+        }
       }
-
-      this._registerSnapshot(`${key}/`, new FileArtifact({
-        temporaryPath: artifactPath,
-      }));
     }
   }
 

package/src/client/AsyncWebSocket.js

@@ -95,6 +95,9 @@ class AsyncWebSocket {
 
     const messageId = message.messageId;
     const inFlight = this.inFlightPromises[messageId] = new InflightRequest(message).withTimeout(options.timeout);
+
+    this.handleMultipleNonAtomicPendingActions();
+
     const messageAsString = JSON.stringify(message);
     this._log.trace(EVENTS.SEND, messageAsString);
     this._ws.send(messageAsString);
@@ -102,6 +105,25 @@ class AsyncWebSocket {
     return inFlight.promise;
   }
 
+  handleMultipleNonAtomicPendingActions() {
+    const pendingNonAtomicRequests = this.getNonAtomicPendingActions();
+    for (const inflight of pendingNonAtomicRequests) {
+        inflight.reject(new DetoxRuntimeError({
+          message: 'Detox has detected multiple interactions taking place simultaneously. Have you forgotten to apply an await over one of the Detox actions in your test code?',
+        }));
+    }
+  }
+
+  getNonAtomicPendingActions() {
+    const remaining = Object.keys(this.inFlightPromises).map((key) => {
+      return this.inFlightPromises[key];
+    }).filter(item => {
+      return item.message.isAtomic === true;
+    });
+
+    return remaining.length > 1 ? remaining : [];
+  }
+
   setEventCallback(event, callback) {
     if (_.isEmpty(this._eventCallbacks[event])) {
       this._eventCallbacks[event] = [callback];

package/src/client/Client.js

@@ -131,22 +131,18 @@ class Client {
   }
 
   async sendAction(action) {
-    const { queryStatus, ...options } = this._inferSendOptions(action);
+    const { shouldQueryStatus, ...options } = this._inferSendOptions(action);
 
-    return await (queryStatus
+    return await (shouldQueryStatus
       ? this._sendMonitoredAction(action, options)
       : this._doSendAction(action, options));
   }
 
   _inferSendOptions(action) {
-    if ( action instanceof actions.CurrentStatus
-      || action instanceof actions.Login
-      || action instanceof actions.Cleanup
-    ) {
-      return { queryStatus: false, timeout: 5000 };
-    }
+    const timeout = action.timeout;
+    const shouldQueryStatus = timeout === 0;
 
-    return { queryStatus: true, timeout: 0 };
+    return { shouldQueryStatus, timeout };
   }
 
   async _sendMonitoredAction(action, options) {