detox 20.6.0 → 20.7.0

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

@@ -0,0 +1 @@
+f81d27f94760c9593fb2465e3e85b8c6

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

@@ -0,0 +1 @@
+d54cd363e0644bcd2c5e80d38aea9951ed5a5875

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

@@ -0,0 +1 @@
+8a069a0d9b81a4da63c1669dda4132884116d1fd59535b9f2042a2de1d2192fb

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

@@ -0,0 +1 @@
+b5b1b636a1a188f0fbab9fdcea0778bc7843c32b11f3d7f4723de639d44cf2954e94f4724e86a04bc25e93701aea54210786f36a97804c514b6c37c54cc7c694

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

@@ -0,0 +1 @@
+1d700c36ee5a9f920dc9b11b8aaba734

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

@@ -0,0 +1 @@
+cde0211d368551547ba536f6d48f82701f0cb54d

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

@@ -0,0 +1 @@
+098e816f3ba9c3a19cfdaa7a3a42d6282d2fce21f311388503f1cac1677af4a7

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

@@ -0,0 +1 @@
+7a5d1df7fcb8894f17f4e1ecd502c977369bcfb83f1f86c4df4d53f05517f710a49fe0a1bb417ee621027f8effc8344d6d0ceb5d8b5f46f9caa739f8cbfb2d3f

package/Detox-android/com/wix/detox/{20.6.0/detox-20.6.0.pom → 20.7.0/detox-20.7.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.6.0</version>
+  <version>20.7.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.7.0/detox-20.7.0.pom.md5

@@ -0,0 +1 @@
+5613ab9eb27dcbb4d5e7779c2137b156

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

@@ -0,0 +1 @@
+622796a4e65be99d5fc209fb47cf2f8dd11f0c6b

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

@@ -0,0 +1 @@
+6a3a55e38f2a0f92863399c78071ba55c8ccfdd8fae13e668f13a52f1d8a20a1

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

@@ -0,0 +1 @@
+19988e0ea2b71c2283a48de7a4a35ac043ddba4629f9db146fe320392f8961d51e1ea570dde8c282e7a191fec69683321f6db223a7bb663e7b2c950deff3dc7f

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.6.0</latest>
-    <release>20.6.0</release>
+    <latest>20.7.0</latest>
+    <release>20.7.0</release>
     <versions>
-      <version>20.6.0</version>
+      <version>20.7.0</version>
     </versions>
-    <lastUpdated>20230322171518</lastUpdated>
+    <lastUpdated>20230411123945</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-f72e8f5e279054eb2e8e8faab020aaab
+9e29832400056f30d8baa679804465e1

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

@@ -1 +1 @@
-4e3513e973cd69a3ce1b30d0756ba26660ae1ba6
+95431bbe6516e3f812d80a6fa2a874591f4db65b

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

@@ -1 +1 @@
-319540a82e8d028d9fe417155b17c95ae4d62f0cf9f18a751a1827a27acf1802
+8ced38de926b73ba9b74dd7ffe47c7775885527060e97544bf37e0d8edf847f9

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

@@ -1 +1 @@
-92f9a95efb7117c43c5df7765e56d81d8ef34b2413ef04e6133d7a3d51ccb88bec0aa80bba83d302ebe4dee638270ec57e03b0a3fc972e8552fd94365065fd3a
+25c96c6db588afca21ce6a630e25c8cb619f8fa7967ad641fd0f6811d243e736ac3986b4828773d9152cd7f789fca65308fd6f8094f52822d6edff5674719afb

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.6.0",
+  "version": "20.7.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -61,7 +61,7 @@
     "bunyan": "^1.8.12",
     "bunyan-debug-stream": "^3.1.0",
     "caf": "^15.0.1",
-    "chalk": "^2.4.2",
+    "chalk": "^4.0.0",
     "child-process-promise": "^2.2.0",
     "execa": "^5.1.1",
     "find-up": "^4.1.0",
@@ -200,5 +200,5 @@
       }
     }
   },
-  "gitHead": "03e23e76b54f1e7de70495e0ec8a8db45872b0e6"
+  "gitHead": "4d316b08ec884b8dbc6bb8a19eeb134e2e4dc4d2"
 }

package/runners/jest/testEnvironment/listeners/SpecReporter.js

@@ -1,4 +1,4 @@
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const noop = require('lodash/noop');
 
 const { config, log, session } = require('../../../../internals');

package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const _ = require('lodash');
 
 const { device } = require('../../../..');

package/src/DetoxWorker.js

@@ -138,6 +138,8 @@ class DetoxWorker {
     this._deviceAllocator = deviceAllocatorFactory.createDeviceAllocator(commonDeps);
     this._deviceCookie = yield this._deviceAllocator.allocate(this._deviceConfig);
 
+    yield this._deviceAllocator.postAllocate(this._deviceCookie);
+
     this.device = runtimeDeviceFactory.createRuntimeDevice(
       this._deviceCookie,
       commonDeps,
@@ -200,9 +202,12 @@ class DetoxWorker {
     }
 
     if (this.device) {
-      const shutdown = this._behaviorConfig ? this._behaviorConfig.cleanup.shutdownDevice : false;
       // @ts-ignore
       await this.device._cleanup();
+    }
+
+    if (this._deviceCookie) {
+      const shutdown = this._behaviorConfig ? this._behaviorConfig.cleanup.shutdownDevice : false;
       await this._deviceAllocator.free(this._deviceCookie, { shutdown });
     }
 

package/src/devices/allocation/DeviceAllocator.js

@@ -8,7 +8,7 @@ class DeviceAllocator {
    */
   constructor(allocationDriver) {
     this._driver = allocationDriver;
-    traceMethods(log, this, ['allocate', 'free']);
+    traceMethods(log, this, ['allocate', 'postAllocate', 'free']);
   }
 
   /**
@@ -19,6 +19,18 @@ class DeviceAllocator {
     return this._driver.allocate(deviceConfig);
   }
 
+  /**
+   * @param {DeviceCookie} deviceCookie
+   * @return {Promise<unknown>}
+   */
+  postAllocate(deviceCookie) {
+    if (typeof this._driver.postAllocate !== 'function') {
+      return Promise.resolve();
+    }
+
+    return this._driver.postAllocate(deviceCookie);
+  }
+
   /**
    * @param cookie { DeviceCookie }
    * @param options { DeallocOptions }

package/src/devices/allocation/drivers/AllocationDriverBase.js

@@ -13,6 +13,12 @@ class AllocationDriverBase {
    */
   async allocate(deviceConfig) {}
 
+  /**
+   * @param {DeviceCookie} deviceCookie
+   * @return {Promise<void>}
+   */
+  async postAllocate(deviceCookie) {}
+
   /**
    * @param cookie { DeviceCookie }
    * @param options { DeallocOptions }

package/src/devices/allocation/drivers/android/attached/AttachedAndroidAllocDriver.js

@@ -25,11 +25,20 @@ class AttachedAndroidAllocDriver extends AllocationDriverBase {
     const adbNamePattern = deviceConfig.device.adbName;
     const adbName = await this._deviceRegistry.allocateDevice(() => this._freeDeviceFinder.findFreeDevice(adbNamePattern));
 
+    return new AttachedAndroidDeviceCookie(adbName);
+  }
+
+  /**
+   * @param {AttachedAndroidDeviceCookie} deviceCookie
+   * @returns {Promise<void>}
+   */
+  async postAllocate(deviceCookie) {
+    const { adbName } = deviceCookie;
+
     // TODO Also disable native animations?
     await this._adb.apiLevel(adbName);
     await this._adb.unlockScreen(adbName);
     await this._attachedAndroidLauncher.notifyLaunchCompleted(adbName);
-    return new AttachedAndroidDeviceCookie(adbName);
   }
 
   /**

package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js

@@ -1,8 +1,6 @@
 // @ts-nocheck
 const _ = require('lodash');
 
-const log = require('../../../../../utils/logger').child({ cat: 'device' });
-const traceMethods = require('../../../../../utils/traceMethods');
 const AndroidEmulatorCookie = require('../../../../cookies/AndroidEmulatorCookie');
 const AllocationDriverBase = require('../../AllocationDriverBase');
 
@@ -23,8 +21,7 @@ class EmulatorAllocDriver extends AllocationDriverBase {
     this._emulatorVersionResolver = emulatorVersionResolver;
     this._emulatorLauncher = emulatorLauncher;
     this._allocationHelper = allocationHelper;
-
-    traceMethods(log, this, ['_launchEmulator']);
+    this._launchInfo = {};
   }
 
   /**
@@ -38,21 +35,37 @@ class EmulatorAllocDriver extends AllocationDriverBase {
     await this._fixAvdConfigIniSkinNameIfNeeded(avdName, deviceConfig.headless);
 
     const allocResult = await this._allocationHelper.allocateDevice(avdName);
-    const { adbName, placeholderPort, isRunning } = allocResult;
-    const launchOptions = {
-      bootArgs: deviceConfig.bootArgs,
-      gpuMode: deviceConfig.gpuMode,
-      headless: deviceConfig.headless,
-      readonly: deviceConfig.readonly,
-      port: placeholderPort,
+    const { adbName } = allocResult;
+
+    this._launchInfo[adbName] = {
+      avdName,
+      isRunning: allocResult.isRunning,
+      launchOptions: {
+        bootArgs: deviceConfig.bootArgs,
+        gpuMode: deviceConfig.gpuMode,
+        headless: deviceConfig.headless,
+        readonly: deviceConfig.readonly,
+        port: allocResult.placeholderPort,
+      },
     };
 
-    await this._launchEmulator(avdName, adbName, isRunning, launchOptions);
-    await this._prepareEmulator(adbName);
-
     return new AndroidEmulatorCookie(adbName);
   }
 
+  /**
+   * @param {AndroidEmulatorCookie} deviceCookie
+   * @returns {Promise<void>}
+   */
+  async postAllocate(deviceCookie) {
+    const { adbName } = deviceCookie;
+    const { avdName, isRunning, launchOptions } = this._launchInfo[adbName];
+
+    await this._emulatorLauncher.launch(avdName, adbName, isRunning, launchOptions);
+    await this._adb.apiLevel(adbName);
+    await this._adb.disableAndroidAnimations(adbName);
+    await this._adb.unlockScreen(adbName);
+  }
+
   /**
    * @param cookie { AndroidEmulatorCookie }
    * @param options { DeallocOptions }
@@ -73,21 +86,6 @@ class EmulatorAllocDriver extends AllocationDriverBase {
     const binaryVersion = _.get(rawBinaryVersion, 'major');
     return await patchAvdSkinConfig(avdName, binaryVersion);
   }
-
-  async _launchEmulator(avdName, adbName, isRunning, options) {
-    try {
-      await this._emulatorLauncher.launch(avdName, adbName, isRunning, options);
-    } catch (e) {
-      await this._allocationHelper.deallocateDevice(adbName);
-      throw e;
-    }
-  }
-
-  async _prepareEmulator(adbName) {
-    await this._adb.apiLevel(adbName);
-    await this._adb.disableAndroidAnimations(adbName);
-    await this._adb.unlockScreen(adbName);
-  }
 }
 
 module.exports = EmulatorAllocDriver;

package/src/devices/allocation/drivers/android/genycloud/GenyAllocDriver.js

@@ -1,22 +1,25 @@
-// @ts-nocheck
-const DetoxRuntimeError = require('../../../../../errors/DetoxRuntimeError');
+const { DetoxRuntimeError } = require('../../../../../errors');
+const Timer = require('../../../../../utils/Timer');
 const GenycloudEmulatorCookie = require('../../../../cookies/GenycloudEmulatorCookie');
 const AllocationDriverBase = require('../../AllocationDriverBase');
 
 class GenyAllocDriver extends AllocationDriverBase {
 
   /**
-   * @param adb { ADB }
-   * @param recipeQuerying { GenyRecipeQuerying }
-   * @param allocationHelper { GenyInstanceAllocationHelper }
-   * @param instanceLauncher { GenyInstanceLauncher }
+   * @param {object} options
+   * @param {import('../../../../common/drivers/android/exec/ADB')} options.adb
+   * @param {import('./GenyRecipeQuerying')} options.recipeQuerying
+   * @param {import('./GenyInstanceAllocationHelper')} options.allocationHelper
+   * @param {import('./GenyInstanceLauncher')} options.instanceLauncher
    */
   constructor({ adb, recipeQuerying, allocationHelper, instanceLauncher }) {
     super();
+
     this._adb = adb;
     this._recipeQuerying = recipeQuerying;
     this._instanceLauncher = instanceLauncher;
     this._instanceAllocationHelper = allocationHelper;
+    this._launchInfo = {};
   }
 
   /**
@@ -28,21 +31,26 @@ class GenyAllocDriver extends AllocationDriverBase {
     const recipe = await this._recipeQuerying.getRecipeFromQuery(deviceQuery);
     this._assertRecipe(deviceQuery, recipe);
 
-    const allocResult = await this._instanceAllocationHelper.allocateDevice(recipe);
-    let { instance, isNew } = allocResult;
+    const { instance, isNew } = await this._instanceAllocationHelper.allocateDevice(recipe);
+    this._launchInfo[instance.uuid] = { isNew };
+    return new GenycloudEmulatorCookie(instance);
+  }
 
-    try {
-      instance = await this._instanceLauncher.launch(instance, isNew);
-    } catch (e) {
-      await this._instanceAllocationHelper.deallocateDevice(instance.uuid);
-      throw e;
-    }
-    const { adbName } = instance;
+  /**
+   * @param {GenycloudEmulatorCookie} cookie
+   * @returns {Promise<void>}
+   */
+  async postAllocate(cookie) {
+    const { instance } = cookie;
+    const { isNew } = this._launchInfo[instance.uuid];
+    const readyInstance = cookie.instance = await this._instanceLauncher.launch(instance, isNew);
 
-    await this._adb.disableAndroidAnimations(adbName);
-    await this._adb.setWiFiToggle(adbName, true);
-    await this._adb.apiLevel(adbName);
-    return new GenycloudEmulatorCookie(instance);
+    const { adbName } = readyInstance;
+    await Timer.run(20000, 'waiting for device to respond', async () => {
+      await this._adb.disableAndroidAnimations(adbName);
+      await this._adb.setWiFiToggle(adbName, true);
+      await this._adb.apiLevel(adbName);
+    });
   }
 
   /**

package/src/devices/allocation/drivers/ios/SimulatorAllocDriver.js

@@ -16,6 +16,7 @@ class SimulatorAllocDriver extends AllocationDriverBase {
     this._deviceRegistry = deviceRegistry;
     this._applesimutils = applesimutils;
     this._simulatorLauncher = simulatorLauncher;
+    this._launchInfo = {};
   }
 
   /**
@@ -35,16 +36,20 @@ class SimulatorAllocDriver extends AllocationDriverBase {
       throw new DetoxRuntimeError(`Failed to find device matching ${deviceComment}`);
     }
 
-    try {
-      await this._simulatorLauncher.launch(udid, deviceConfig.type, deviceConfig.bootArgs, deviceConfig.headless);
-    } catch (e) {
-      await this._deviceRegistry.disposeDevice(udid);
-      throw e;
-    }
-
+    this._launchInfo[udid] = { deviceConfig };
     return new IosSimulatorCookie(udid);
   }
 
+  /**
+   * @param {IosSimulatorCookie} deviceCookie
+   * @returns {Promise<void>}
+   */
+  async postAllocate(deviceCookie) {
+    const { udid } = deviceCookie;
+    const { deviceConfig } = this._launchInfo[udid];
+    await this._simulatorLauncher.launch(udid, deviceConfig.type, deviceConfig.bootArgs, deviceConfig.headless);
+  }
+
   /**
    * @param cookie { IosSimulatorCookie }
    * @param options { DeallocOptions }

package/src/logger/DetoxLogger.js

@@ -310,19 +310,19 @@ class DetoxLogger {
   /** @internal */
   static defaultOptions({ level }) {
     const ph = level === 'trace' || level === 'debug'
-      ? value => require('chalk').default.grey(value) + ' '
-      : value => require('chalk').default.grey(value);
+      ? value => require('chalk').grey(value) + ' '
+      : value => require('chalk').grey(value);
 
     const id = level === 'trace'
-      ? value => require('chalk').default.yellow(`@${value}`)
+      ? value => require('chalk').yellow(`@${value}`)
       : undefined;
 
     const cat = level === 'trace' || level === 'debug'
-      ? (value) => require('chalk').default.yellow(`${value}`.split(',', 1)[0])
+      ? (value) => require('chalk').yellow(`${value}`.split(',', 1)[0])
       : undefined;
 
     const event = level === 'trace' || level === 'debug'
-      ? (value) => require('chalk').default.grey(`:${value}`)
+      ? (value) => require('chalk').grey(`:${value}`)
       : undefined;
 
     const identity = x => x;

package/src/utils/Timer.js

@@ -77,6 +77,12 @@ class Timer {
       Promise.resolve().then(action),
     ]);
   }
+
+  static run(timeout, description, action) {
+    const timer = new Timer();
+    timer.schedule(timeout);
+    return timer.run(description, action);
+  }
 }
 
 module.exports = Timer;

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

@@ -1 +0,0 @@
-c051f79d02bcc98757dd1ea06512a63b

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

@@ -1 +0,0 @@
-bb48d0747cb607e73a01d64f5eb758ce00e376cb

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

@@ -1 +0,0 @@
-b31397b81cdca47b2d5dc1aca7821f2691d236114064949ad8553fd81340fe02

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

@@ -1 +0,0 @@
-6cec7c20f0d9643b98e2fa2f4740c9bb7a4b82ae3851069bb183e16ffcace8b0ceb07cf8d19316a960beb2330ea3e0a508df80cda1561242149ce3b16357d954

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

@@ -1 +0,0 @@
-6202d8d0f83dda9ed0c9d6962259350e

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

@@ -1 +0,0 @@
-505b10faaca41e1b5e7f27b8829cd14aff6b5626

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

@@ -1 +0,0 @@
-f4b81a4c2c1665975ac5be02698e288a311e3cd3c728ba9b05e72a1932f7482e

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

@@ -1 +0,0 @@
-e355acd2730e5ca57bb7f2c092942b6dd98997645b43350fd2c80051f3f8a6840f2746cd2e8fbeae862ab4cac0fc6339b7f298e697f3bfb4124598370c4b2a54

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

@@ -1 +0,0 @@
-120956f03efbba5c9cec898b7da52efe

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

@@ -1 +0,0 @@
-b6c2c0740f1de17d7dc5671d096debbe7eb46dd3

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

@@ -1 +0,0 @@
-8fdf9933acc2bcc22588bc3cffb6348ab73f8100c5212f7e607e315bce59a265

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

@@ -1 +0,0 @@
-f3ae74b6397013d7a5af6ed08cbbd739f5e207df9463a6b6cb496bd1b9a87022f193b87207d6424f2b8b85e022836211215cd01eaa88f9adcea6515594f59e76