detox 21.0.0-rc.6 → 21.0.0-rc.7

package/src/utils/environment.js

@@ -19,9 +19,8 @@ function which(executable, path) {
 const DETOX_LIBRARY_ROOT_PATH = path.join(appdatapath.appDataPath(), 'Detox');
 const MISSING_SDK_ERROR = `$ANDROID_SDK_ROOT is not defined, set the path to the SDK installation directory into $ANDROID_SDK_ROOT,
 Go to https://developer.android.com/studio/command-line/variables.html for more details`;
-const DEVICE_LOCK_FILE_PATH_IOS = path.join(DETOX_LIBRARY_ROOT_PATH, 'device.registry.state.lock');
-const DEVICE_LOCK_FILE_PATH_ANDROID = path.join(DETOX_LIBRARY_ROOT_PATH, 'android-device.registry.state.lock');
-const GENYCLOUD_GLOBAL_CLEANUP_FILE_PATH = path.join(DETOX_LIBRARY_ROOT_PATH, 'genycloud-cleanup.lock');
+const DETOX_LOCK_FILE_PATH = path.join(DETOX_LIBRARY_ROOT_PATH, 'global-context.json');
+const DEVICE_REGISTRY_PATH = path.join(DETOX_LIBRARY_ROOT_PATH, 'device.registry.json');
 const LAST_FAILED_TESTS_PATH = path.join(DETOX_LIBRARY_ROOT_PATH, 'last-failed.txt');
 
 function getAndroidSDKPath() {
@@ -218,17 +217,12 @@ function getDetoxLibraryRootPath() {
   return DETOX_LIBRARY_ROOT_PATH;
 }
 
-function getDeviceLockFilePathIOS() {
-  return DEVICE_LOCK_FILE_PATH_IOS;
+function getDetoxLockFilePath() {
+  return DETOX_LOCK_FILE_PATH;
 }
 
-// TODO This can probably be merged with IOS' by now
-function getDeviceLockFilePathAndroid() {
-  return DEVICE_LOCK_FILE_PATH_ANDROID;
-}
-
-function getGenyCloudGlobalCleanupFilePath() {
-  return GENYCLOUD_GLOBAL_CLEANUP_FILE_PATH;
+function getDeviceRegistryPath() {
+  return DEVICE_REGISTRY_PATH;
 }
 
 function getLastFailedTestsPath() {
@@ -253,9 +247,8 @@ module.exports = {
   getAndroidSDKPath,
   getAndroidEmulatorPath,
   getDetoxLibraryRootPath,
-  getDeviceLockFilePathIOS,
-  getDeviceLockFilePathAndroid,
-  getGenyCloudGlobalCleanupFilePath,
+  getDetoxLockFilePath,
+  getDeviceRegistryPath,
   getLastFailedTestsPath,
   getHomeDir,
 };

package/src/utils/errorUtils.js

@@ -40,15 +40,15 @@ function asError(error) {
   return isError(error) ? error : new Error(error);
 }
 
-function serializeObjectWithError(obj, errorKey) {
-  if (obj[errorKey]) {
+function serializeObjectWithError(obj, errorKey = 'error') {
+  if (obj[errorKey] instanceof Error) {
     return { ...obj, [errorKey]: serializeError(obj[errorKey]) };
   }
 
   return obj;
 }
 
-function deserializeObjectWithError(obj, errorKey) {
+function deserializeObjectWithError(obj, errorKey = 'error') {
   if (typeof obj[errorKey] === 'object' && !(obj[errorKey] instanceof Error)) {
     return { ...obj, [errorKey]: deserializeError(obj[errorKey]) };
   }

package/src/utils/isArrowFunction.js

@@ -0,0 +1,24 @@
+function isArrowFunction(code) {
+  if (!code.includes('=>')) {
+    return false;
+  }
+
+  const syncCode = removeAsync(code.trimStart());
+  return syncCode.startsWith('(') || isSimpleArrowFunction(code);
+}
+
+function removeAsync(code) {
+  return code.startsWith('async') ? code.slice(5).trimStart() : code;
+}
+
+function isSimpleArrowFunction(code) {
+  const [signature] = code.split('=>', 1);
+
+  return isAlphanumericId(removeAsync(signature.trim()));
+}
+
+function isAlphanumericId(code) {
+  return /^[a-zA-Z0-9]+$/.test(code);
+}
+
+module.exports = isArrowFunction;

package/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "lib": ["es2018"],
-    "target": "ES2018",
+    "lib": ["es2022"],
+    "target": "ES2022",
     "allowJs": true,
     "checkJs": true,
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "noEmit": true,
@@ -15,11 +15,16 @@
   },
   "rootDir": ".",
   "include": [
+    "detox.d.ts",
+    "globals.d.ts",
+    "index.d.ts",
     "**/*.js",
     "**/*.ts"
   ],
   "exclude": [
     "android",
+    "allure-report",
+    "allure-results",
     "coverage",
     "ios",
     "test"

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-javadoc.jar.md5

@@ -1 +0,0 @@
-b5dc3fd21bb453975b7a9a671d88fc46

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-javadoc.jar.sha1

@@ -1 +0,0 @@
-87c31479c4c938d2ee09a9893086d469048b7eb9

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-javadoc.jar.sha256

@@ -1 +0,0 @@
-0ff0065b697cf1af31ffede102f23949fd1ffc346aa6ac9776818c4d0f95af7f

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-javadoc.jar.sha512

@@ -1 +0,0 @@
-d083764071e59b65092786bf5ef3241169908186462b6ee929f4a9a3190e73b1191f6f002b8efeb64ebf76193b847437a4bccf9d1a2fdd02af87e223bc6528a5

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-sources.jar.md5

@@ -1 +0,0 @@
-54f14766f943e6aefd34d0097a66e772

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-sources.jar.sha1

@@ -1 +0,0 @@
-809a9efa56e6755be2c3a0cb8c689ed3fc6e6140

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-sources.jar.sha256

@@ -1 +0,0 @@
-605901d010d65f0713a874265c8a7a16c7b3e62e08095ceccce93281d161f00d

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6-sources.jar.sha512

@@ -1 +0,0 @@
-16bcdc742eddcfebcda078033190a7e690a29d5c6a6b67a4b475d9cc517de1d8fc83538ed8015b5ebf9282b3ed54705a04dd6288c71eceff3259f8fec1bc927c

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.aar.md5

@@ -1 +0,0 @@
-e1d6c5353b93ff848864f887b4763050

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.aar.sha1

@@ -1 +0,0 @@
-809426e1ab6811b1e6a727fdcd22bbbf20f89b02

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.aar.sha256

@@ -1 +0,0 @@
-dadebda11f4a94f751e23277fadbbaef518955f72ba353a5ae5f52ef1ba9acde

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.aar.sha512

@@ -1 +0,0 @@
-ba77a84e27f54bc932e73fac36cf2aa3b2a45fc51975088af59632256b214365fb1decbb77c117e5889013b10e4dc110e074100ac439b201e58ffd7333aa370e

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.pom.md5

@@ -1 +0,0 @@
-bde852544728eef8cc1787467f1fea0f

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.pom.sha1

@@ -1 +0,0 @@
-f6f0410c57db363f4305349d39c13eb455cd2674

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.pom.sha256

@@ -1 +0,0 @@
-fc32e0b10df9b581d50334008310f238eaeb1bef0b04dc27b0b05e2d02868684

package/Detox-android/com/wix/detox/21.0.0-rc.6/detox-21.0.0-rc.6.pom.sha512

@@ -1 +0,0 @@
-161ec12df6330a23895bfe241e2790b567ab45166dde07e31d7b31a3e53bcf4791d75922da1f3eaf881be4a33a882b6fe51e535a0f33e726635d92fe8f086edc

package/runners/jest/reporters/DetoxReporter.js

@@ -1,36 +0,0 @@
-const resolveFrom = require('resolve-from');
-/** @type {typeof import('@jest/reporters').VerboseReporter} */
-const JestVerboseReporter = require(resolveFrom(process.cwd(), '@jest/reporters')).VerboseReporter;
-
-const { config, reportTestResults } = require('../../../internals');
-
-class DetoxReporter extends JestVerboseReporter {
-  /**
-   * @param {import('@jest/test-result').AggregatedResult} results
-   */
-  // @ts-ignore
-  async onRunComplete(_contexts, results) {
-    // @ts-ignore
-    await super.onRunComplete(_contexts, results);
-
-    await reportTestResults(results.testResults.map(r => ({
-      success: !r.failureMessage,
-      testFilePath: r.testFilePath,
-      testExecError: r.testExecError,
-      isPermanentFailure: this._isPermanentFailure(r),
-    })));
-  }
-
-  /**
-   * @param {import('@jest/test-result').TestResult} testResult
-   */
-  _isPermanentFailure(testResult) {
-    if (config.testRunner.jest.retryAfterCircusRetries) {
-      return false;
-    }
-
-    return testResult.testResults.some(r => r.status === 'failed' && r.invocations > 1);
-  }
-}
-
-module.exports = DetoxReporter;

package/src/devices/DeviceRegistry.js

@@ -1,176 +0,0 @@
-// @ts-nocheck
-const fs = require('fs-extra');
-const _ = require('lodash');
-
-const ExclusiveLockfile = require('../utils/ExclusiveLockfile');
-const environment = require('../utils/environment');
-const safeAsync = require('../utils/safeAsync');
-
-const readOptions = {
-  encoding: 'utf8',
-};
-
-const FIELD_NAME_ID = 'id';
-const FIELD_NAME_DATA = 'data';
-
-class DevicesList {
-  constructor(devices) {
-    this._devices = Object.freeze(devices);
-  }
-
-  /**
-   * @returns {{id: string, data: *?}[]}
-   */
-  get rawDevices() {
-    return this._devices;
-  }
-
-  /**
-   * @param {string} deviceId
-   * @returns {boolean}
-   */
-  includes(deviceId) {
-    return DevicesList._includes(deviceId, this._devices);
-  }
-
-  static _includes(deviceId, devices) {
-    return _.some(devices, [FIELD_NAME_ID, deviceId]);
-  }
-}
-
-class DeviceRegistry {
-  constructor({ lockfilePath }) {
-    /***
-     * @private
-     * @type {string}
-     */
-    this._lockfilePath = lockfilePath;
-
-    /***
-     * @protected
-     * @type {ExclusiveLockfile}
-     */
-    this._lockfile = new ExclusiveLockfile(lockfilePath, {
-      getInitialState: this._getInitialLockFileState.bind(this),
-      readOptions,
-    });
-  }
-
-  async reset() {
-    await this._lockfile.exclusively(() => {
-      const empty = this._getInitialLockFileState();
-      this._lockfile.write(empty);
-    });
-  }
-
-  /***
-   * @param {string|Function} getDeviceId
-   * @param {*?} data
-   * @returns {Promise<string>}
-   */
-  async allocateDevice(getDeviceId, data) {
-    return this._lockfile.exclusively(async () => {
-      const deviceId = await safeAsync(getDeviceId);
-      this._registerDevice(deviceId, data);
-      return deviceId;
-    });
-  }
-
-  /***
-   * @param {string|Function} getDeviceId
-   * @returns {Promise<void>}
-   */
-  async disposeDevice(getDeviceId) {
-    await this._lockfile.exclusively(async () => {
-      const deviceId = await safeAsync(getDeviceId);
-      if (deviceId) {
-        this._unregisterDevice(deviceId);
-      }
-    });
-  }
-
-  /***
-   * @param {string} deviceId
-   * @returns {boolean}
-   */
-  includes(deviceId) {
-    const devices = this._lockfile.read();
-    return DevicesList._includes(deviceId, devices);
-  }
-
-  /***
-   * @returns {DevicesList}
-   */
-  getRegisteredDevices() {
-    const devices = this._lockfile.read();
-    return new DevicesList(devices);
-  }
-
-  /***
-   * @returns {DevicesList}
-   */
-  async readRegisteredDevices() {
-    let result = null;
-    await this._lockfile.exclusively(() => {
-      result = this.getRegisteredDevices();
-    });
-    return result;
-  }
-
-  /***
-   * @returns {DevicesList}
-   */
-  readRegisteredDevicesUNSAFE() {
-    const contents = fs.readFileSync(this._lockfilePath, readOptions);
-    const devices = JSON.parse(contents);
-    return new DevicesList(devices);
-  }
-
-  /***
-   * @private
-   */
-  _getInitialLockFileState() {
-    return [];
-  }
-
-  /**
-   * @private
-   */
-  _registerDevice(deviceId, data) {
-    const state = this._lockfile.read();
-    let newState = _.reject(state, [FIELD_NAME_ID, deviceId]);
-
-    const device = {};
-    device[FIELD_NAME_ID] = deviceId;
-
-    if (data) {
-      device[FIELD_NAME_DATA] = data;
-    }
-
-    newState = _.concat(newState, device);
-    this._lockfile.write(newState);
-  }
-
-  /**
-   * @private
-   */
-  _unregisterDevice(deviceId) {
-    const state = this._lockfile.read();
-    const newState = _.reject(state, [FIELD_NAME_ID, deviceId]);
-    this._lockfile.write(newState);
-  }
-
-  static forIOS() {
-    return new DeviceRegistry({
-      lockfilePath: environment.getDeviceLockFilePathIOS(),
-    });
-  }
-
-  static forAndroid() {
-    return new DeviceRegistry({
-      lockfilePath: environment.getDeviceLockFilePathAndroid(),
-    });
-  }
-}
-
-module.exports = DeviceRegistry;

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

@@ -1,30 +0,0 @@
-/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
-// @ts-nocheck
-
-/**
- * @typedef DeallocOptions
- * @property shutdown { Boolean }
- */
-
-class AllocationDriverBase {
-  /**
-   * @param deviceConfig { Object }
-   * @return {Promise<DeviceCookie>}
-   */
-  async allocate(deviceConfig) {}
-
-  /**
-   * @param {DeviceCookie} deviceCookie
-   * @return {Promise<void>}
-   */
-  async postAllocate(deviceCookie) {}
-
-  /**
-   * @param cookie { DeviceCookie }
-   * @param options { DeallocOptions }
-   * @return {Promise<void>}
-   */
-  async free(cookie, options) {}
-}
-
-module.exports = AllocationDriverBase;

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

@@ -1,13 +0,0 @@
-const DeviceLauncher = require('../../../../common/drivers/DeviceLauncher');
-
-class AttachedAndroidLauncher extends DeviceLauncher {
-  constructor(eventEmitter) {
-    super(eventEmitter);
-  }
-
-  notifyLaunchCompleted(adbName) {
-    return super._notifyBootEvent(adbName, 'device', false);
-  }
-}
-
-module.exports = AttachedAndroidLauncher;

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

@@ -1,72 +0,0 @@
-const logger = require('../../../../../utils/logger').child({ cat: 'device' });
-const DeviceAllocationHelper  = require('../../../../common/drivers/DeviceAllocationHelper');
-
-const DetoxEmulatorsPortRange = {
-  min: 10000,
-  max: 20000
-};
-
-class AllocationResult {
-  constructor(adbName, placeholderPort) {
-    this.adbName = adbName;
-    this.placeholderPort = placeholderPort;
-  }
-
-  get isRunning() {
-    return !this.placeholderPort;
-  }
-}
-
-class EmulatorAllocationHelper extends DeviceAllocationHelper {
-  constructor(deviceRegistry, freeDeviceFinder, rand = Math.random) {
-    super(deviceRegistry, logger);
-    this._freeDeviceFinder = freeDeviceFinder;
-    this._rand = rand;
-  }
-
-  /**
-   * @param avdName
-   * @returns {Promise<AllocationResult>}
-   */
-  async allocateDevice(avdName) {
-    this._logAllocationAttempt(avdName);
-
-    const result = await this._doSynchronizedAllocation(avdName);
-    this._logAllocationResult(avdName, result.adbName);
-
-    return result;
-  }
-
-  async deallocateDevice(adbName) {
-    await this._deviceRegistry.disposeDevice(adbName);
-  }
-
-  /**
-   * @returns {Promise<AllocationResult>}
-   * @private
-   */
-  async _doSynchronizedAllocation(avdName) {
-    let placeholderPort = null;
-    let adbName = null;
-
-    await this._deviceRegistry.allocateDevice(async () => {
-      adbName = await this._freeDeviceFinder.findFreeDevice(avdName);
-      if (!adbName) {
-        placeholderPort = this._allocateEmulatorPlaceholderPort();
-        adbName = `emulator-${placeholderPort}`;
-      }
-      return adbName;
-    });
-
-    return new AllocationResult(adbName, placeholderPort);
-  }
-
-  _allocateEmulatorPlaceholderPort() {
-    const { min, max } = DetoxEmulatorsPortRange;
-    let port = this._rand() * (max - min) + min;
-    port = port & 0xFFFFFFFE; // Should always be even
-    return port;
-  }
-}
-
-module.exports = EmulatorAllocationHelper;

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

@@ -1,16 +0,0 @@
-const environment = require('../../../../../utils/environment');
-const DeviceRegistry = require('../../../../DeviceRegistry');
-
-class GenyDeviceRegistryFactory {
-  forRuntime() {
-    return DeviceRegistry.forAndroid();
-  }
-
-  forGlobalShutdown() {
-    return new DeviceRegistry({
-      lockfilePath: environment.getGenyCloudGlobalCleanupFilePath(),
-    });
-  }
-}
-
-module.exports = new GenyDeviceRegistryFactory();

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

@@ -1,65 +0,0 @@
-// @ts-nocheck
-const logger = require('../../../../../utils/logger').child({ cat: 'device' });
-const DeviceAllocationHelper = require('../../../../common/drivers/DeviceAllocationHelper');
-
-const { ALLOCATE_DEVICE_LOG_EVT } = DeviceAllocationHelper;
-
-class AllocationResult {
-  constructor(instance, isNew) {
-    this.instance = instance;
-    this.isNew = isNew;
-  }
-}
-
-class GenyInstanceAllocationHelper extends DeviceAllocationHelper {
-  constructor({ deviceRegistry, instanceLookupService, instanceLifecycleService }) {
-    super(deviceRegistry, logger);
-
-    this._instanceLookupService = instanceLookupService;
-    this._instanceLifecycleService = instanceLifecycleService;
-  }
-
-  /**
-   * @param recipe { GenyRecipe }
-   * @return { Promise<AllocationResult> }
-   */
-  async allocateDevice(recipe) {
-    this._logAllocationAttempt(recipe);
-
-    const allocationResult = await this._doSynchronizedAllocation(recipe);
-    this._logAllocationResult(recipe, allocationResult.instance);
-
-    return allocationResult;
-  }
-
-  async deallocateDevice(instanceUUID) {
-    await this._deviceRegistry.disposeDevice(instanceUUID);
-  }
-
-  /**
-   * @param recipe { GenyRecipe }
-   * @return {Promise<{AllocationResult}>}
-   * @private
-   */
-  async _doSynchronizedAllocation(recipe) {
-    let instance = null;
-    let isNew = false;
-
-    await this._deviceRegistry.allocateDevice(async () => {
-      instance = await this._instanceLookupService.findFreeInstance();
-      if (!instance) {
-        instance = await this._instanceLifecycleService.createInstance(recipe.uuid);
-        isNew = true;
-      }
-      return instance.uuid;
-    });
-
-    return new AllocationResult(instance, isNew);
-  }
-
-  _logAllocationResult(deviceQuery, deviceHandle) {
-    logger.info({ event: ALLOCATE_DEVICE_LOG_EVT }, `Allocating Genymotion-Cloud instance ${deviceHandle.name} for testing. To access it via a browser, go to: https://cloud.geny.io/instance/${deviceHandle.uuid}`);
-  }
-}
-
-module.exports = GenyInstanceAllocationHelper;

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

@@ -1,21 +0,0 @@
-const DeviceLauncher = require('../../../common/drivers/DeviceLauncher');
-
-class SimulatorLauncher extends DeviceLauncher {
-  constructor({ applesimutils, eventEmitter }) {
-    super(eventEmitter);
-    this._applesimutils = applesimutils;
-  }
-
-  async launch(udid, type, bootArgs, headless) {
-    const coldBoot = await this._applesimutils.boot(udid, bootArgs, headless);
-    await this._notifyBootEvent(udid, type, coldBoot, headless);
-  }
-
-  async shutdown(udid) {
-    await this._notifyPreShutdown(udid);
-    await this._applesimutils.shutdown(udid);
-    await this._notifyShutdownCompleted(udid);
-  }
-}
-
-module.exports = SimulatorLauncher;

package/src/devices/common/drivers/DeviceAllocationHelper.js

@@ -1,20 +0,0 @@
-const ALLOCATE_DEVICE_LOG_EVT = 'ALLOCATE_DEVICE';
-
-class DeviceAllocationHelper {
-  constructor(deviceRegistry, logger) {
-    this._deviceRegistry = deviceRegistry;
-    this._logger = logger;
-  }
-
-  _logAllocationAttempt(deviceQuery) {
-    this._logger.debug({ event: ALLOCATE_DEVICE_LOG_EVT }, `Trying to allocate a device based on "${deviceQuery}"`);
-  }
-
-  _logAllocationResult(deviceQuery, deviceHandle) {
-    this._logger.debug({ event: ALLOCATE_DEVICE_LOG_EVT }, `Settled on ${deviceHandle}`);
-  }
-}
-
-DeviceAllocationHelper.ALLOCATE_DEVICE_LOG_EVT = ALLOCATE_DEVICE_LOG_EVT;
-
-module.exports = DeviceAllocationHelper;

package/src/devices/common/drivers/DeviceLauncher.js

@@ -1,19 +0,0 @@
-class DeviceLauncher {
-  constructor(eventEmitter) {
-    this._eventEmitter = eventEmitter;
-  }
-
-  async _notifyPreShutdown(deviceId) {
-    return this._eventEmitter.emit('beforeShutdownDevice', { deviceId });
-  }
-
-  async _notifyShutdownCompleted(deviceId) {
-    return this._eventEmitter.emit('shutdownDevice', { deviceId });
-  }
-
-  async _notifyBootEvent(deviceId, type, coldBoot, headless) {
-    return this._eventEmitter.emit('bootDevice', { deviceId, type, coldBoot, headless });
-  }
-}
-
-module.exports = DeviceLauncher;