detox 20.3.0 → 20.5.0

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

@@ -0,0 +1 @@
+312ca2e6d26a005375c7d31f7a489b60

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

@@ -0,0 +1 @@
+80debe0a3a1ed317173f56f92cbfd1f108f3fb6c

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

@@ -0,0 +1 @@
+ceeb582236c99040fb116be37c6eb97c67ecdf91f8cdd1d5dade614a3180375c

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

@@ -0,0 +1 @@
+08dcd64b4e65c486a7fe0d4a59b23e4b9ffc037b4afad03db9cb820b97867e22693d929b7e896f41c11c8a4e3e0d0dbbc11799a69f438d46aeeb8ebb8b157056

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

@@ -0,0 +1 @@
+643850c6dad298f22d9ce657af17dd5c

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

@@ -0,0 +1 @@
+e483f7ab88c2b2d5882d1c825155856c61ba059f

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

@@ -0,0 +1 @@
+2ee1a851c254668619e44df167d0b1d86bd63edb9414a239f1fcea380c39a077

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

@@ -0,0 +1 @@
+3446a90564f2af11a6b6221f114ccd8786044080e222ed698fef6a92d706faed154fdaa976c0dca162db58976170a60b7bc05d5e931a1b1bbf02ff8292d0c47c

package/Detox-android/com/wix/detox/{20.3.0/detox-20.3.0.pom → 20.5.0/detox-20.5.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.3.0</version>
+  <version>20.5.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -54,6 +54,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>androidx.test</groupId>
       <artifactId>rules</artifactId>

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

@@ -0,0 +1 @@
+e6f8b937b6573484515f78adcc830096

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

@@ -0,0 +1 @@
+59e4b461ba168a526c1c629fb29ded508472e732

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

@@ -0,0 +1 @@
+b455e110295c40221b1620cfe6ffc905fc9623b36a5f38fabf52316def1f9749

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

@@ -0,0 +1 @@
+766004a843b60ee7b385f26324762d8f18d35064324fb7ab5c24e59816869745401dafbfc3517ff55948527fd0411a2b9382b3f29de8aa6756e61df58a3c416c

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.3.0</latest>
-    <release>20.3.0</release>
+    <latest>20.5.0</latest>
+    <release>20.5.0</release>
     <versions>
-      <version>20.3.0</version>
+      <version>20.5.0</version>
     </versions>
-    <lastUpdated>20230226195437</lastUpdated>
+    <lastUpdated>20230304081841</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-4912285f2cf394f3d1d5c67514c907d1
+7ef4d0c49e15b7641923a73bf049cb58

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

@@ -1 +1 @@
-5a1d2fa06aaf1fc06746b27afd3e9f7d0b4fe150
+7612e7860c59949c39e71cd063713aa3a3fc9022

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

@@ -1 +1 @@
-46023c58541873b523a78e4d3027e394d30d54c8831f0132dd2d32b2dd278c84
+1c0015aa8cdb2feaedfea04b080a429eac94a39c39220f67eb46dcd205ff136b

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

@@ -1 +1 @@
-4ca4a9eab20c1130c64ab7678869b866a8a568c2f32785d35f2332897745cd6085f9d1db1ea36e2d161c3a60abd0d8f8868e38266e063108971c937326a1b897
+585e914dd526582d4dc520c65d85c69d5ec7ad6abcac74db26832293e300ecf64241d0d1a4814b2b9627125cc02ffbee8964b23783a016233c6ba5676989952c

package/android/detox/build.gradle

@@ -99,6 +99,9 @@ dependencies {
         because 'Android datepicker support'
         exclude group: "org.checkerframework", module: "checker"
     }
+    api('org.hamcrest:hamcrest:2.2') {
+        because 'See https://github.com/wix/Detox/issues/3920. Need to force hamcrest 2.2 win in battle of 2.2 vs. 1.3 (specified by Espresso).'
+    }
     api('androidx.test:rules:1.4.0') {
         because 'of ActivityTestRule. Needed by users *and* internally used by Detox.'
     }
@@ -145,7 +148,7 @@ dependencies {
 // Spek (https://spekframework.org/setup-android)
 if (rootProject.hasProperty('isOfficialDetoxLib') ||
     rootProject.hasProperty('isOfficialDetoxApp')) {
-    
+
     apply plugin: 'de.mannodermaus.android-junit5'
 
     android {

package/index.d.ts

@@ -331,6 +331,7 @@ declare global {
             binaryPath: string;
             bundleId?: string;
             build?: string;
+            start?: string;
             launchArgs?: Record<string, any>;
         }
 
@@ -339,6 +340,7 @@ declare global {
             binaryPath: string;
             bundleId?: string;
             build?: string;
+            start?: string;
             testBinaryPath?: string;
             launchArgs?: Record<string, any>;
             /**

package/local-cli/cli.js

@@ -12,7 +12,7 @@ const { isErrorAlreadyLogged } = require('./utils/cliErrorHandling');
 yargs
   .scriptName('detox')
   .parserConfiguration({
-    'boolean-negation': false,
+    'boolean-negation': true,
     'camel-case-expansion': false,
     'dot-notation': false,
     'duplicate-arguments-array': false,

package/local-cli/init.js

@@ -93,13 +93,13 @@ function createDefaultConfigurations() {
       'android.debug': {
         type: 'android.apk',
         binaryPath: 'android/app/build/outputs/apk/debug/app-debug.apk',
-        build: 'cd android ; ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug ; cd -',
+        build: 'cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
         reversePorts: [8081],
       },
       'android.release': {
         type: 'android.apk',
         binaryPath: 'android/app/build/outputs/apk/release/app-release.apk',
-        build: 'cd android ; ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd -',
+        build: 'cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
       },
     },
     devices: {

package/local-cli/start.js

@@ -0,0 +1,49 @@
+const _ = require('lodash');
+
+const detox = require('../internals');
+
+const AppStartCommand = require('./startCommand/AppStartCommand');
+
+module.exports.command = 'start';
+module.exports.desc = 'Run app "start" scripts inside the selected configuration';
+module.exports.builder = {
+  C: {
+    alias: 'config-path',
+    describe: 'Specify Detox config file path. If not supplied, Detox searches for .detoxrc[.js] or "detox" section in package.json',
+  },
+  c: {
+    alias: ['configuration'],
+    describe:
+      'Select a local configuration from your defined configurations to extract the app "start" scripts from. If not supplied, and there\'s only one configuration, Detox will default to it',
+  },
+  f: {
+    alias: 'force',
+    describe: 'Ignore errors from the "start" scripts and proceed',
+    boolean: true,
+  }
+};
+
+module.exports.handler = async function start(argv) {
+  const { apps: appsConfig } = await detox.resolveConfig({ argv });
+  const startCommands = _(appsConfig)
+    .values()
+    .map(app => app.start)
+    .filter(Boolean)
+    .map(cmd => new AppStartCommand({
+      cmd,
+      passthrough: argv['--'],
+      forceSpawn: argv.force,
+    }))
+    .value();
+
+  if (startCommands.length) {
+    try {
+      await Promise.all(startCommands.map(c => c.execute()));
+    } catch (e) {
+      await Promise.allSettled(startCommands.map(c => c.stop()));
+      throw e;
+    }
+  } else {
+    detox.log.warn('No "start" commands were found in the app configs.');
+  }
+};

package/local-cli/startCommand/AppStartCommand.js

@@ -0,0 +1,65 @@
+const execa = require('execa');
+
+const detox = require('../../internals');
+const { DetoxRuntimeError } = require('../../src/errors');
+const Deferred = require('../../src/utils/Deferred');
+const log = detox.log.child({ cat: ['lifecycle', 'cli'] });
+
+class AppStartCommand {
+  constructor({ cmd, passthrough = [], forceSpawn = false }) {
+    this._id = Math.random();
+    this._cmd = cmd;
+    this._passthrough = passthrough;
+    this._forceSpawn = forceSpawn;
+
+    this._cpHandle = null;
+    this._cpDeferred = new Deferred();
+  }
+
+  execute() {
+    const cmd = [this._cmd, ...this._passthrough].join(' ');
+
+    log.info.begin({ id: this._id }, cmd);
+
+    const onEnd = (msg, code, signal) => {
+      log.trace.end({ id: this._id, code, signal }, msg);
+      this._cpDeferred.resolve();
+    };
+
+    const onError = (msg, code, signal) => {
+      const logLevel = this._forceSpawn ? 'warn' : 'error';
+      log[logLevel].end({ id: this._id, code, signal }, msg);
+      if (this._forceSpawn) {
+        this._cpDeferred.resolve();
+      } else {
+        this._cpDeferred.reject(new DetoxRuntimeError(msg));
+      }
+    };
+
+    this._cpHandle = execa.command(cmd, { stdio: 'inherit', shell: true });
+    this._cpHandle.on('error', onError);
+    this._cpHandle.on('exit', (code, signal) => {
+      const reason = code == null ? `signal ${signal}` : `code ${code}`;
+      const msg = `Command exited with ${reason}: ${cmd}`;
+      if (signal || code === 0) {
+        onEnd(msg, code, signal);
+      } else {
+        onError(msg, code, signal);
+      }
+
+      this._cpHandle = null;
+    });
+
+    return this._cpDeferred.promise;
+  }
+
+  async stop() {
+    if (this._cpHandle) {
+      this._cpHandle.kill();
+    }
+
+    return this._cpDeferred.promise;
+  }
+}
+
+module.exports = AppStartCommand;

package/local-cli/testCommand/TestRunnerCommand.js

@@ -9,6 +9,8 @@ const log = detox.log.child({ cat: ['lifecycle', 'cli'] });
 const { printEnvironmentVariables, prependNodeModulesBinToPATH } = require('../../src/utils/envUtils');
 const { toSimplePath } = require('../../src/utils/pathUtils');
 const { escapeSpaces, useForwardSlashes } = require('../../src/utils/shellUtils');
+const sleep = require('../../src/utils/sleep');
+const AppStartCommand = require('../startCommand/AppStartCommand');
 const { markErrorAsLogged } = require('../utils/cliErrorHandling');
 
 const TestRunnerError = require('./TestRunnerError');
@@ -23,11 +25,14 @@ class TestRunnerCommand {
     const cliConfig = opts.config.cli;
     const deviceConfig = opts.config.device;
     const runnerConfig = opts.config.testRunner;
+    const appsConfig = opts.config.apps;
 
     this._argv = runnerConfig.args;
     this._retries = runnerConfig.retries;
     this._envHint = this._buildEnvHint(opts.env);
+    this._startCommands = this._prepareStartCommands(appsConfig, cliConfig);
     this._envFwd = {};
+
     if (runnerConfig.forwardEnv) {
       this._envFwd = this._buildEnvOverride(cliConfig, deviceConfig);
       Object.assign(this._envHint, this._envFwd);
@@ -38,6 +43,15 @@ class TestRunnerCommand {
     let runsLeft = 1 + this._retries;
     let launchError = null;
 
+    if (this._startCommands.length > 0) {
+      try {
+        await Promise.race([sleep(1000), ...this._startCommands.map(cmd => cmd.execute())]);
+      } catch (e) {
+        await Promise.allSettled(this._startCommands.map(cmd => cmd.stop()));
+        throw e;
+      }
+    }
+
     do {
       try {
         await this._spawnTestRunner();
@@ -67,6 +81,8 @@ class TestRunnerCommand {
       }
     } while (launchError && runsLeft > 0);
 
+    await Promise.allSettled(this._startCommands.map(cmd => cmd.stop()));
+
     if (launchError) {
       throw launchError;
     }
@@ -80,6 +96,19 @@ class TestRunnerCommand {
       .value();
   }
 
+  _prepareStartCommands(appsConfig, cliConfig) {
+    if (`${cliConfig.start}` === 'false') {
+      return [];
+    }
+
+    return _.values(appsConfig)
+      .filter(app => app.start)
+      .map(app => new AppStartCommand({
+        cmd: app.start,
+        forceSpawn: cliConfig.start === 'force',
+      }));
+  }
+
   /**
    * @param {DetoxInternals.CLIConfig} cliConfig
    * @param {Detox.DetoxDeviceConfig} deviceConfig

package/local-cli/testCommand/builder.js

@@ -28,6 +28,11 @@ module.exports = {
     describe: 'Reuse existing installed app (do not delete + reinstall) for a faster run.',
     boolean: true,
   },
+  start: {
+    group: 'Execution:',
+    describe: 'Run app "start" scripts before running the tests. Use --no-start to disable that, and --start=force to ignore errors.',
+    default: true,
+  },
   u: {
     alias: 'cleanup',
     group: 'Execution:',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.3.0",
+  "version": "20.5.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -63,6 +63,7 @@
     "caf": "^15.0.1",
     "chalk": "^2.4.2",
     "child-process-promise": "^2.2.0",
+    "execa": "^5.1.1",
     "find-up": "^4.1.0",
     "fs-extra": "^4.0.2",
     "funpermaproxy": "^1.1.0",
@@ -199,5 +200,5 @@
       }
     }
   },
-  "gitHead": "c35e064d90789a9f815169b6b665c7626a8f0040"
+  "gitHead": "e7866370faef479abd6ff98aa1607e420d75b9ef"
 }

package/src/configuration/collectCliConfig.js

@@ -55,6 +55,7 @@ function collectCliConfig({ argv }) {
     useCustomLogger: asBoolean(get('use-custom-logger')),
     retries: asNumber(get('retries')),
     inspectBrk: asBoolean(get('inspect-brk')),
+    start: get('start'),
   }, _.isUndefined);
 }
 

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

@@ -1 +0,0 @@
-f45eea837cb2a196fab34ba5cf799b4c

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

@@ -1 +0,0 @@
-5a52dbb1f517893fbf92da231c393b2acb00f064

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

@@ -1 +0,0 @@
-9d4f12b046f1a8f3e62af95c6dd67a07c953640e243a7b8f367f8719465a7524

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

@@ -1 +0,0 @@
-5588b6760c32a4efafdf96c46837f8b4e67ef3bf5aba76b279b014b2f506f33242e75132f752e59586b3a972b63376a517c0425ab140e51bff0b5e22abddd228

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

@@ -1 +0,0 @@
-afa5931e30f34c41812919f453f3f39e

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

@@ -1 +0,0 @@
-1e014f1d37481f610de06225d1bf3b9a5bb1dbb2

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

@@ -1 +0,0 @@
-325107fa6252c35551840f8e7c6bba2860bf81ec9841c0797a852e96e2b09b5a

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

@@ -1 +0,0 @@
-3d1c057abb1fc73be80815e16f084f4594a0591d9e3626e14a4eca40f168aaaa8958b16f144a0978e6908cf4ca09d4c5d14c372d1922a2c9be21deff098ecd70

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

@@ -1 +0,0 @@
-703310d6b13bda87aa9d2150d38e8c97

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

@@ -1 +0,0 @@
-3211a734fbe94c25b45514761fd1618071b0d7d8

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

@@ -1 +0,0 @@
-9bdc1b00ebbc7e37c4691460ae8a71644c7d65398bd6c9945d2e09a40d524ee0

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

@@ -1 +0,0 @@
-172ce985d77f28d635d3e9ad24e93045e150f4748a68e923adaf5c6a623cf1c0ff2bfda1f6f318fd4bbfdeeb6147e346700f2cc6e96af4123c547b57a5803141