detox 20.0.1-breaking.new-global-lifecycle.0 → 20.0.4-breaking.new-global-lifecycle.0

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.md5

@@ -0,0 +1 @@
+4b124d7ab9e2288b4321b82987147ed7

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+f63f383626ed499ea635330561ee65f67926ade7

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+f73cf8db8e2a2d9f007e8f0e1b10c8a3206425ff5b48eecab8780d32adbb12fb

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+e21d314a45864e21cbea7bf17e9d23814def296e92b3b75ce64ca504f68d3b9aedc17c1beecd90407b9cb6e04803eb2d9ea4e2b9b4791ef34fc6aab597150770

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.md5

@@ -0,0 +1 @@
+4a9616f1535e129e7eeddbcc6d20b383

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha1

@@ -0,0 +1 @@
+ab806e0458f9ffdadb4b758f356e55afd5c47db2

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha256

@@ -0,0 +1 @@
+407c01beb305d15307e9defed1c41b643e01db58a1f15a4fa68b177e0ef7de49

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha512

@@ -0,0 +1 @@
+0f48a23d1840085fd5b5c044f6fd4a9e7b898f5498d4ec22b94b94d42eed3982060aea614347d73ee97e57de200d17d8100aee99c569fb8fc1d3e9c9a5fc7911

package/Detox-android/com/wix/detox/{20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom → 20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.0.1-breaking.new-global-lifecycle.0</version>
+  <version>20.0.4-breaking.new-global-lifecycle.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.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.md5

@@ -0,0 +1 @@
+7a767580cccb826b804646d27377aed1

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha1

@@ -0,0 +1 @@
+157c429db5c60554c8098801c65193871427d41d

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha256

@@ -0,0 +1 @@
+e5c436ef487d630e7685b412f6160f33be799f64b99b928cdfbaa2c41aa0561e

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha512

@@ -0,0 +1 @@
+6894a1d7a895abc41593948227786e0a41428bcaee4f4246cb9b8b3d40dc50f6b1404d622a07adbd992397ff7687ba97f8020528666ee77cf66db9377eb4b206

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.0.1-breaking.new-global-lifecycle.0</latest>
-    <release>20.0.1-breaking.new-global-lifecycle.0</release>
+    <latest>20.0.4-breaking.new-global-lifecycle.0</latest>
+    <release>20.0.4-breaking.new-global-lifecycle.0</release>
     <versions>
-      <version>20.0.1-breaking.new-global-lifecycle.0</version>
+      <version>20.0.4-breaking.new-global-lifecycle.0</version>
     </versions>
-    <lastUpdated>20220810074907</lastUpdated>
+    <lastUpdated>20220815150714</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-b2585c88d6aa7316562eefd1276b22b8
+9d4e72b06ca1b5fefd299e136c22ade7

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

@@ -1 +1 @@
-a08cf502a9a0fd7b00c98d8ac7406f638489da61
+2b6e30446d53ced376695d11cd1eb93b03c03741

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

@@ -1 +1 @@
-5afa6a8108d9375f9e5ede74faae8dd51d73ae25dab9e7915cfe11503c0f4a36
+666b18918d13dcf788c142e10b4b14d4e3715836d3e3bcf637b07b6fe3ccf45d

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

@@ -1 +1 @@
-701eeb42080f3cc2cf38ddb06f0a1185633a958dac2325d7225fc5a3aefcd982def05877242c10cec1bd569d8ac2f600f7b8f0d85c4399ccd61fdeb9e0d8f6b2
+2e8d99941b4da68f7a3740b3b4f3361e1d8c47f3abd49ba841d5523d722bdd13ebbfb09ecfc987f24d6add13b50fc318e3c172e67afda2c467fb24f337e7c62b

package/index.d.ts

@@ -141,6 +141,11 @@ declare global {
                  * Device init timeout
                  */
                 initTimeout?: number | undefined;
+                /**
+                 * Insist on CLI-based retry mechanism even when the failed tests have been handled
+                 * by jest.retryTimes(n) mechanism from Jest Circus.
+                 */
+                retryAfterCircusRetries?: boolean;
                 reportSpecs?: boolean | undefined;
                 reportWorkerAssign?: boolean | undefined;
             };

package/internals.d.ts

@@ -47,9 +47,14 @@ declare global {
       onRunFinish(event: unknown): Promise<void>;
 
       /**
-       * Powers the "--retries <N>" of Detox CLI under the hood.
+       * Reports to Detox CLI about failed tests that could have been re-run if
+       * {@link Detox.DetoxTestRunnerConfig#retries} is set to a non-zero.
+       *
+       * @param testFilePaths array of failed test files' paths
+       * @param permanent whether the failure is permanent, and the tests
+       * should not be re-run.
        */
-      reportFailedTests(testFilePaths: string[]): Promise<void>;
+      reportFailedTests(testFilePaths: string[], permanent?: boolean): Promise<void>;
       // endregion
 
       readonly config: RuntimeConfig;
@@ -74,20 +79,27 @@ declare global {
 
     type SessionState = Readonly<{
       failedTestFiles: string[];
+      testFilesToRetry: string[];
+      testSessionIndex: number;
       workersCount: number;
     }>;
 
     type RuntimeConfig = Readonly<{
       configurationName: string;
 
-      appsConfig: Record<string, Readonly<Detox.DetoxAppConfig>>;
-      artifactsConfig: Detox.DetoxArtifactsConfig;
-      behaviorConfig: Detox.DetoxBehaviorConfig;
-      cliConfig: DetoxCLIConfig;
-      deviceConfig: Detox.DetoxDeviceConfig;
-      loggerConfig: Detox.DetoxLoggerConfig;
-      runnerConfig: Detox.DetoxTestRunnerConfig;
-      sessionConfig: Detox.DetoxSessionConfig;
+      /**
+       * Dictionary of app configurations,
+       * where the keys are defined by {@link Detox.DetoxAppConfig#name}
+       * or equal to "default" if the name is not configured.
+       */
+      apps: Record<string, Readonly<Detox.DetoxAppConfig>>;
+      artifacts: Readonly<Detox.DetoxArtifactsConfig>;
+      behavior: Readonly<Detox.DetoxBehaviorConfig>;
+      cli: Readonly<DetoxCLIConfig>;
+      device: Readonly<Detox.DetoxDeviceConfig>;
+      logger: Readonly<Detox.DetoxLoggerConfig>;
+      testRunner: Readonly<Detox.DetoxTestRunnerConfig>;
+      session: Readonly<Detox.DetoxSessionConfig>;
     }>;
 
     type DetoxCLIConfig = Readonly<Partial<{

package/local-cli/build.js

@@ -37,7 +37,7 @@ module.exports.builder = {
 };
 
 module.exports.handler = async function build(argv) {
-  const { appsConfig, errorComposer } = await detox.resolveConfig({ argv });
+  const { apps: appsConfig, errorComposer } = await detox.resolveConfig({ argv });
   const apps = _.entries(appsConfig);
 
   for (const [appName, app] of apps) {

package/local-cli/build.test.js

@@ -14,12 +14,12 @@ describe('build', () => {
       const DetoxConfigErrorComposer = require('../src/errors/DetoxConfigErrorComposer');
 
       const config = {
-        appsConfig: {},
-        artifactsConfig: {},
-        behaviorConfig: {},
+        apps: {},
+        artifacts: {},
+        behavior: {},
         errorComposer: new DetoxConfigErrorComposer(),
-        deviceConfig: {},
-        sessionConfig: {}
+        device: {},
+        session: {}
       };
 
       return ({
@@ -44,14 +44,14 @@ describe('build', () => {
   });
 
   it('runs the build script from the composed device config', async () => {
-    detox.config.appsConfig.default = { build: 'yet another command' };
+    detox.config.apps.default = { build: 'yet another command' };
 
     await callCli('./build', 'build');
     expect(execSync).toHaveBeenCalledWith('yet another command', expect.anything());
   });
 
   it('skips building the app if the binary exists and --if-missing flag is set', async () => {
-    detox.config.appsConfig.default = { build: 'yet another command', binaryPath: __filename };
+    detox.config.apps.default = { build: 'yet another command', binaryPath: __filename };
 
     await callCli('./build', 'build -i');
     expect(execSync).not.toHaveBeenCalled();
@@ -63,32 +63,32 @@ describe('build', () => {
   });
 
   it('fails with an error if a build script has not been found', async () => {
-    detox.config.appsConfig.default = {};
+    detox.config.apps.default = {};
     await expect(callCli('./build', 'build')).rejects.toThrowError(/Failed to build/);
   });
 
   it('should ignore missing build command with -s, --silent flag', async () => {
-    detox.config.appsConfig.default = {};
+    detox.config.apps.default = {};
     await expect(callCli('./build', 'build -s')).resolves.not.toThrowError();
     expect(detox.log.warn).not.toHaveBeenCalled();
   });
 
   it('should print a warning upon user build script failure', async () => {
-    detox.config.appsConfig.default = { build: 'a command' };
+    detox.config.apps.default = { build: 'a command' };
     execSync.mockImplementation(() => { throw new Error('Build failure'); });
     await expect(callCli('./build', 'build')).rejects.toThrowError(/Build failure/);
     expect(detox.log.warn).toHaveBeenCalledWith(expect.stringContaining('You are responsible'));
   });
 
   it('should print a warning if app is not found at binary path', async () => {
-    detox.config.appsConfig.default = { binaryPath: tempfile() };
+    detox.config.apps.default = { binaryPath: tempfile() };
     await expect(callCli('./build', 'build -s')).resolves.not.toThrowError();
     expect(detox.log.warn).toHaveBeenCalledWith(expect.stringContaining('could not find your app at the given binary path'));
   });
 
   it('should print extra message with the app name before building (in a multi-app configuration)', async () => {
-    detox.config.appsConfig.app1 = { binaryPath: tempfile(), build: ':' };
-    detox.config.appsConfig.app2 = { binaryPath: tempfile(), build: ':' };
+    detox.config.apps.app1 = { binaryPath: tempfile(), build: ':' };
+    detox.config.apps.app2 = { binaryPath: tempfile(), build: ':' };
 
     await expect(callCli('./build', 'build -s')).resolves.not.toThrowError();
     expect(detox.log.info).toHaveBeenCalledWith(expect.stringContaining('app1'));
@@ -96,7 +96,7 @@ describe('build', () => {
   });
 
   it('should not print that extra message when the app is single', async () => {
-    detox.config.appsConfig.default = { binaryPath: tempfile(), build: ':' };
+    detox.config.apps.default = { binaryPath: tempfile(), build: ':' };
 
     await expect(callCli('./build', 'build -s')).resolves.not.toThrowError();
     expect(detox.log.info).not.toHaveBeenCalledWith(expect.stringContaining('default'));

package/local-cli/test.js

@@ -15,9 +15,9 @@ module.exports.handler = async function test({ detoxArgs, runnerArgs }) {
     });
 
     const runnerCommand = new TestRunnerCommand()
-      .setRunnerConfig(detox.config.runnerConfig)
-      .setDeviceConfig(detox.config.deviceConfig)
-      .replicateCLIConfig(detox.config.cliConfig);
+      .setRunnerConfig(detox.config.testRunner)
+      .setDeviceConfig(detox.config.device)
+      .replicateCLIConfig(detox.config.cli);
 
     await runnerCommand.execute();
   } finally {

package/local-cli/test.test.js

@@ -116,7 +116,7 @@ describe('CLI', () => {
     });
   });
 
-  test('should use runnerConfig.specs as default specs', async () => {
+  test('should use testRunner.args._ as default specs', async () => {
     detoxConfig.testRunner.args._ = ['e2e/sanity'];
     await run();
     expect(_.last(cliCall().argv)).toEqual('e2e/sanity');
@@ -140,26 +140,32 @@ describe('CLI', () => {
 
   test.each([['-R'], ['--retries']])('%s <value> should execute unsuccessful run N extra times', async (__retries) => {
     const context = require('../internals');
-    context.session.failedTestFiles = ['e2e/failing1.test.js', 'e2e/failing2.test.js'];
-    context.session.failedTestFiles.splice = jest.fn(() => {
-      context.session.failedTestFiles = ['e2e/failing2.test.js'];
-    });
+    context.session.testFilesToRetry = ['e2e/failing1.test.js', 'e2e/failing2.test.js'];
+    context.session.testFilesToRetry.splice = jest.fn()
+      .mockImplementationOnce(() => ['e2e/failing1.test.js', 'e2e/failing2.test.js'])
+      .mockImplementationOnce(() => ['e2e/failing2.test.js']);
 
     mockExitCode(1);
 
     await run(__retries, 2).catch(_.noop);
 
-    expect(cliCall(0).env).not.toHaveProperty('DETOX_RERUN_INDEX');
     expect(cliCall(0).argv).toEqual([expect.stringMatching(/executable$/), '--config', 'e2e/config.json']);
-    expect(cliCall(0).fullCommand).not.toMatch(/DETOX_RERUN_INDEX/);
-
-    expect(cliCall(1).env.DETOX_RERUN_INDEX).toBe('1');
     expect(cliCall(1).argv).toEqual([expect.stringMatching(/executable$/), '--config', 'e2e/config.json', 'e2e/failing1.test.js', 'e2e/failing2.test.js']);
-    expect(cliCall(1).fullCommand).not.toMatch(/DETOX_RERUN_INDEX/);
-
     expect(cliCall(2).argv).toEqual([expect.stringMatching(/executable$/), '--config', 'e2e/config.json', 'e2e/failing2.test.js']);
-    expect(cliCall(2).env.DETOX_RERUN_INDEX).toBe('2');
-    expect(cliCall(2).fullCommand).not.toMatch(/DETOX_RERUN_INDEX/);
+  });
+
+  test.each([['-R'], ['--retries']])('%s <value> should bail if has permanently failed tests', async (__retries) => {
+    const context = require('../internals');
+    context.session.failedTestFiles = ['e2e/failing1.test.js'];
+    context.session.testFilesToRetry = ['e2e/failing2.test.js'];
+
+    mockExitCode(1);
+
+    await run(__retries, 2).catch(_.noop);
+
+    expect(cliCall(0).env).not.toHaveProperty('DETOX_RERUN_INDEX');
+    expect(cliCall(0).argv).toEqual([expect.stringMatching(/executable$/), '--config', 'e2e/config.json']);
+    expect(cliCall(1)).toBe(null);
   });
 
   test.each([['-R'], ['--retries']])('%s <value> should not restart test runner if there are no failing tests paths', async (__retries) => {
@@ -172,7 +178,7 @@ describe('CLI', () => {
 
   test.each([['-R'], ['--retries']])('%s <value> should retain -- <...explicitPassthroughArgs>', async (__retries) => {
     const context = require('../internals');
-    context.session.failedTestFiles = ['tests/failing.test.js'];
+    context.session.testFilesToRetry = ['tests/failing.test.js'];
 
     mockExitCode(1);
 

package/local-cli/testCommand/TestRunnerCommand.js

@@ -88,7 +88,7 @@ class TestRunnerCommand {
       try {
         if (launchError) {
           const list = this._argv._.map((file, index) => `  ${index + 1}. ${file}`).join('\n');
-          detox.log.error(
+          detox.log.error({ event: 'RETRY_RUN' },
             `There were failing tests in the following files:\n${list}\n\n` +
             'Detox CLI is going to restart the test runner with those files...\n'
           );
@@ -99,15 +99,14 @@ class TestRunnerCommand {
       } catch (e) {
         launchError = e;
 
-        // @ts-ignore
-        const { failedTestFiles } = detox.session;
-        if (_.isEmpty(failedTestFiles)) {
+        const { failedTestFiles, testFilesToRetry } = detox.session;
+        if (!_.isEmpty(failedTestFiles) || _.isEmpty(testFilesToRetry)) {
           throw e;
         }
 
-        this._argv._ = failedTestFiles.slice();
-        this._env.DETOX_RERUN_INDEX = 1 + (this._env.DETOX_RERUN_INDEX || 0);
-        failedTestFiles.splice(0, Infinity);
+        this._argv._ = testFilesToRetry.splice(0, Infinity);
+        // @ts-ignore
+        detox.session.testSessionIndex++; // it is always a primary context, so we can update it
       }
     } while (launchError && --runsLeft > 0);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.0.1-breaking.new-global-lifecycle.0",
+  "version": "20.0.4-breaking.new-global-lifecycle.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -183,5 +183,5 @@
       }
     }
   },
-  "gitHead": "b05792476b6eaedeb998b8625ecc78132aee361f"
+  "gitHead": "5a4d2fa00b359b139d9bda7f5128b9d75cfa838b"
 }

package/runners/jest/testEnvironment/index.js

@@ -46,7 +46,7 @@ class DetoxCircusEnvironment extends NodeEnvironment {
     /** @protected */
     this.testEventListeners = [];
     /** @protected */
-    this.initTimeout = detox.config.runnerConfig.jest.initTimeout;
+    this.initTimeout = detox.config.testRunner.jest.initTimeout;
   }
 
   /** @override */

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

@@ -16,18 +16,13 @@ class DetoxCoreListener {
   }
 
   _getTestInvocations(test) {
-    const { DETOX_RERUN_INDEX } = process.env;
-
-    if (!isNaN(DETOX_RERUN_INDEX)) {
-      return Number(DETOX_RERUN_INDEX) * this._testRunTimes + test.invocations;
-    } else {
-      return test.invocations;
-    }
+    const { testSessionIndex } = detoxInternals.session;
+    return testSessionIndex * this._testRunTimes + test.invocations;
   }
 
   async setup() {
     // Workaround to override Jest's expect
-    if (detoxInternals.config.behaviorConfig.init.exposeGlobals) {
+    if (detoxInternals.config.behavior.init.exposeGlobals) {
       this._env.global.expect = detox.expect;
     }
   }
@@ -103,7 +98,8 @@ class DetoxCoreListener {
 
   async run_finish(_event, state) {
     if (this._hasFailedTests(state.rootDescribeBlock)) {
-      await detoxInternals.reportFailedTests([this._env.testPath]);
+      const handledByJestCircus = this._testRunTimes > 1 && !detoxInternals.config.testRunner.jest.retryAfterCircusRetries;
+      await detoxInternals.reportFailedTests([this._env.testPath], handledByJestCircus);
     }
   }
 

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

@@ -16,7 +16,7 @@ class SpecReporter {
   }
 
   get enabled() {
-    const jestSection = config.runnerConfig.jest;
+    const jestSection = config.testRunner.jest;
     const reportSpecs = jestSection && jestSection.reportSpecs;
 
     return reportSpecs !== undefined ? reportSpecs : session.workersCount === 1;

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

@@ -12,7 +12,7 @@ class WorkerAssignReporter {
   }
 
   run_start() {
-    if (config.runnerConfig.jest.reportWorkerAssign) {
+    if (config.testRunner.jest.reportWorkerAssign) {
       log.info({ event: 'WORKER_ASSIGN' }, `${this._formatTestName()} is assigned to ${this._formatDeviceName()}`);
     }
   }

package/src/DetoxWorker.js

@@ -56,7 +56,13 @@ class DetoxWorker {
   async init() {
     if (this._isCleaningUp) return;
 
-    const { appsConfig, artifactsConfig, behaviorConfig, deviceConfig, sessionConfig } = this._config;
+    const {
+      apps: appsConfig,
+      artifacts: artifactsConfig,
+      behavior: behaviorConfig,
+      device: deviceConfig,
+      session: sessionConfig
+    } = this._config;
     this._appsConfig = appsConfig;
     this._artifactsConfig = artifactsConfig;
     this._behaviorConfig = behaviorConfig;

package/src/configuration/composeRunnerConfig.js

@@ -2,6 +2,8 @@ const os = require('os');
 
 const _ = require('lodash');
 
+const log = require('../utils/logger');
+
 /**
  * @param {object} opts
  * @param {Detox.DetoxConfig} opts.globalConfig
@@ -12,7 +14,7 @@ const _ = require('lodash');
  * @returns {Detox.DetoxTestRunnerConfig} opts.testRunnerArgv
  */
 function composeRunnerConfig(opts) {
-  const globalConfig = opts.globalConfig.testRunner;
+  const globalConfig = adaptLegacyRunnerConfig(opts.globalConfig);
   if (globalConfig != null && typeof globalConfig !== 'object') {
     throw opts.errorComposer.invalidTestRunnerProperty(true);
   }
@@ -31,6 +33,7 @@ function composeRunnerConfig(opts) {
       inspectBrk: inspectBrkHookDefault,
       jest: {
         initTimeout: 300000,
+        retryAfterCircusRetries: false,
         reportSpecs: undefined,
         reportWorkerAssign: true,
       },
@@ -60,6 +63,51 @@ function composeRunnerConfig(opts) {
   return merged;
 }
 
+function adaptLegacyRunnerConfig(globalConfig) {
+  let isLegacy = false;
+
+  const runnerConfigKey = 'runnerConfig' in globalConfig ? 'runnerConfig' : 'runner-config';
+  if (_.isString(globalConfig[runnerConfigKey])) {
+    isLegacy = true;
+    log.warn(`Detected a deprecated "${runnerConfigKey}" property (string).`);
+  }
+
+  const testRunnerKey = 'testRunner' in globalConfig ? 'testRunner' : 'test-runner';
+  if (_.isString(globalConfig[testRunnerKey])) {
+    isLegacy = true;
+    log.warn(`Detected a deprecated "${testRunnerKey}" property (string).`);
+  }
+
+  if (globalConfig.specs != null) {
+    isLegacy = true;
+    log.warn(`Detected a deprecated "specs" property.`);
+  }
+
+  if (!isLegacy) {
+    return globalConfig.testRunner;
+  }
+
+  log.warn(`Please migrate your Detox config according to the guide: [TODO: insert the migration guilde link]`);
+  const testRunner = globalConfig[testRunnerKey];
+  const runnerConfig = globalConfig[runnerConfigKey];
+  const specs = globalConfig.specs != null ? String(globalConfig.specs) : undefined;
+
+  const args = {};
+  if (_.isString(testRunner)) {
+    args.$0 = testRunner;
+  }
+
+  if (_.isString(runnerConfig)) {
+    args.config = runnerConfig;
+  }
+
+  if (specs) {
+    args._ = [specs];
+  }
+
+  return { args };
+}
+
 function hasEmptyPositionalArgs(value, key) {
   return key === '_' ? _.isEmpty(value) : false;
 }

package/src/configuration/index.js

@@ -105,16 +105,17 @@ async function composeDetoxConfig({
   });
 
   const result = {
-    appsConfig,
-    artifactsConfig,
-    behaviorConfig,
-    cliConfig,
     configurationName,
-    deviceConfig,
     errorComposer,
-    loggerConfig,
-    runnerConfig,
-    sessionConfig,
+
+    apps: appsConfig,
+    artifacts: artifactsConfig,
+    behavior: behaviorConfig,
+    cli: cliConfig,
+    device: deviceConfig,
+    logger: loggerConfig,
+    testRunner: runnerConfig,
+    session: sessionConfig,
   };
 
   return result;

package/src/errors/DetoxConfigErrorComposer.js

@@ -656,12 +656,14 @@ Examine your Detox config${this._atPath()}`,
   }
 
   invalidTestRunnerProperty(isGlobal) {
+    const testRunner = _.get(this.contents, ['testRunner']);
+
     return new DetoxConfigError({
-      message: `testRunner should be an object, not a string`,
+      message: `testRunner should be an object, not a ${typeof testRunner}`,
       hint: `Check that in your Detox config${this._atPath()}`,
       inspectOptions: { depth: isGlobal ? 0 : 3 },
       debugInfo: isGlobal ? {
-        testRunner: _.get(this.contents, ['testRunner']),
+        testRunner,
         ...this.contents,
       } : {
         ...this._focusOnConfiguration(c => _.pick(c, ['testRunner'])),

package/src/ipc/IPCClient.js

@@ -53,9 +53,10 @@ class IPCClient {
 
   /**
    * @param {string[]} testFilePaths
+   * @param {Boolean} permanent
    */
-  async reportFailedTests(testFilePaths) {
-    await this._emit('failedTests', { testFilePaths });
+  async reportFailedTests(testFilePaths, permanent) {
+    await this._emit('failedTests', { testFilePaths, permanent });
   }
 
   async _connectToServer() {

package/src/ipc/IPCServer.js

@@ -57,6 +57,8 @@ class IPCServer {
 
     this._ipc.server.emit(socket, 'registerContextDone', {
       failedTestFiles: this._sessionState.failedTestFiles,
+      testFilesToRetry: this._sessionState.testFilesToRetry,
+      testSessionIndex: this._sessionState.testSessionIndex,
     });
   }
 
@@ -71,8 +73,12 @@ class IPCServer {
     }
   }
 
-  onFailedTests({ testFilePaths }, socket) {
-    this._sessionState.failedTestFiles.push(...testFilePaths);
+  onFailedTests({ testFilePaths, permanent }, socket = null) {
+    if (permanent) {
+      this._sessionState.failedTestFiles.push(...testFilePaths);
+    } else {
+      this._sessionState.testFilesToRetry.push(...testFilePaths);
+    }
 
     if (socket) {
       this._ipc.server.emit(socket, 'failedTestsDone', {});
@@ -80,6 +86,7 @@ class IPCServer {
 
     this._ipc.server.broadcast('sessionStateUpdate', {
       failedTestFiles: this._sessionState.failedTestFiles,
+      testFilesToRetry: this._sessionState.testFilesToRetry,
     });
   }
 }

package/src/ipc/state.js

@@ -44,6 +44,8 @@ class SecondarySessionState extends SessionState {
     detoxConfig = null,
     detoxIPCServer = '',
     failedTestFiles = [],
+    testFilesToRetry = [],
+    testSessionIndex = 0,
     workerId = undefined,
     workersCount = 0
   }) {
@@ -54,18 +56,29 @@ class SecondarySessionState extends SessionState {
     this.detoxConfig = detoxConfig;
     this.detoxIPCServer = detoxIPCServer;
     this.failedTestFiles = failedTestFiles;
+    this.testFilesToRetry = testFilesToRetry;
+    this.testSessionIndex = testSessionIndex;
     this.workerId = workerId;
     this.workersCount = workersCount;
   }
 }
 
 class PrimarySessionState extends SecondarySessionState {
-  constructor({ contexts = [], failedTestFiles = [], logFiles = [], ...baseOpts }) {
+  constructor({
+    contexts = [],
+    logFiles = [],
+    failedTestFiles = [],
+    testFilesToRetry = [],
+    testSessionIndex = 0,
+    ...baseOpts
+  }) {
     super(baseOpts);
 
     this.contexts = contexts;
     this.failedTestFiles = failedTestFiles;
     this.logFiles = logFiles;
+    this.testSessionIndex = testSessionIndex;
+    this.testFilesToRetry = testFilesToRetry;
   }
 }
 

package/src/realms/DetoxContext.js

@@ -27,7 +27,7 @@ class DetoxContext {
     this[$sessionState] = this[$restoreSessionState]();
 
     const loggerConfig = this[$sessionState].detoxConfig
-      ? this[$sessionState].detoxConfig.loggerConfig
+      ? this[$sessionState].detoxConfig.logger
       : undefined;
 
     /**
@@ -93,7 +93,7 @@ class DetoxContext {
   [symbols.config] = funpermaproxy(() => this[symbols.session].detoxConfig);
   [symbols.session] = funpermaproxy(() => this[$sessionState]);
   /** @abstract */
-  [symbols.reportFailedTests](_testFilePaths) {}
+  [symbols.reportFailedTests](_testFilePaths, _permanent) {}
   /**
    * @abstract
    * @param {Partial<DetoxInternals.DetoxGlobalSetupOptions>} _opts

package/src/realms/DetoxPrimaryContext.js

@@ -34,9 +34,9 @@ class DetoxPrimaryContext extends DetoxContext {
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths) {
+  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
     if (this[_ipcServer]) {
-      this[_ipcServer].onFailedTests({ testFilePaths });
+      this[_ipcServer].onFailedTests({ testFilePaths, permanent });
     }
   }
 
@@ -65,7 +65,12 @@ class DetoxPrimaryContext extends DetoxContext {
     this[_dirty] = true;
     const detoxConfig = await this[symbols.resolveConfig](opts);
 
-    const { behaviorConfig, deviceConfig, loggerConfig, sessionConfig } = detoxConfig;
+    const {
+      behavior: behaviorConfig,
+      device: deviceConfig,
+      logger: loggerConfig,
+      session: sessionConfig
+    } = detoxConfig;
     await this[$logger].setConfig(loggerConfig);
 
     this.trace.begin({
@@ -119,7 +124,7 @@ class DetoxPrimaryContext extends DetoxContext {
    * @override
    * @param {Partial<DetoxInternals.DetoxConfigurationSetupOptions>} [opts]
    */
-  async [symbols.setup](opts) {
+  async [symbols.setup](opts = {}) {
     const workerId = opts.workerId || 1;
     this[$sessionState].workerId = workerId;
     this[_ipcServer].onRegisterWorker({ workerId });
@@ -177,7 +182,7 @@ class DetoxPrimaryContext extends DetoxContext {
     }
 
     const streamUtils = require('../utils/streamUtils');
-    const { rootDir, plugins } = this[symbols.config].artifactsConfig || {};
+    const { rootDir, plugins } = this[symbols.config].artifacts || {};
     const logConfig = plugins && plugins.log || 'none';
     const enabled = rootDir && (typeof logConfig === 'string' ? logConfig !== 'none' : logConfig.enabled);
 
@@ -204,7 +209,7 @@ class DetoxPrimaryContext extends DetoxContext {
   async[_resetLockFile]() {
     const DeviceRegistry = require('../devices/DeviceRegistry');
 
-    const deviceType = this[symbols.config].deviceConfig.type;
+    const deviceType = this[symbols.config].device.type;
 
     switch (deviceType) {
       case 'ios.none':

package/src/realms/DetoxSecondaryContext.js

@@ -8,22 +8,28 @@ const DetoxContext = require('./DetoxContext');
 
 const { $logger, $restoreSessionState, $sessionState } = DetoxContext.protected;
 const _ipcClient = Symbol('ipcClient');
+const _shortLifecycle = Symbol('shortLifecycle');
 
 class DetoxSecondaryContext extends DetoxContext {
   constructor() {
     super();
 
     /**
-     * @protected
-     * @type {*}
+     * @private
+     * @type {import('../ipc/IPCClient')}
      */
     this[_ipcClient] = null;
+    /**
+     * @private
+     * @type {undefined | boolean}
+     */
+    this[_shortLifecycle] = false;
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths) {
+  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
     if (this[_ipcClient]) {
-      await this[_ipcClient].reportFailedTests(testFilePaths);
+      await this[_ipcClient].reportFailedTests(testFilePaths, permanent);
     } else {
       throw new DetoxInternalError('Detected an attempt to report failed tests using a non-initialized context.');
     }
@@ -34,23 +40,7 @@ class DetoxSecondaryContext extends DetoxContext {
   }
 
   /** @override */
-  async [symbols.globalSetup](_opts = {}) {
-    // This is a no-op function.
-    // It is forbidden to add any logic to `globalSetup` of the secondary context.
-    // Violating this principle will almost definitely break some flows, where it is
-    // not guaranteed that `globalSetup` will ever get called. See UML diagrams.
-  }
-
-  /** @override */
-  async [symbols.globalTeardown]() {
-    // This is a no-op function.
-    // It is forbidden to add any logic to `globalTeardown` of the secondary context.
-    // Violating this principle will almost definitely break some flows, where it is
-    // not guaranteed that `globalTeardown` will ever get called. See UML diagrams.
-  }
-
-  /** @override */
-  async [symbols.setup](opts) {
+  async [symbols.globalSetup]() {
     const IPCClient = require('../ipc/IPCClient');
 
     this[_ipcClient] = new IPCClient({
@@ -59,8 +49,25 @@ class DetoxSecondaryContext extends DetoxContext {
       logger: this[$logger],
     });
 
-    const workerId = opts.workerId || 1;
     await this[_ipcClient].init();
+  }
+
+  /** @override */
+  async [symbols.globalTeardown]() {
+    if (this[_ipcClient]) {
+      await this[_ipcClient].dispose();
+      this[_ipcClient] = null;
+    }
+  }
+
+  /** @override */
+  async [symbols.setup](opts = {}) {
+    if (!this[_ipcClient]) {
+      this[_shortLifecycle] = true;
+      await this[symbols.globalSetup]();
+    }
+
+    const workerId = opts.workerId || 1;
     await this[_ipcClient].registerWorker(workerId);
     await super[symbols.setup](opts);
   }
@@ -70,9 +77,8 @@ class DetoxSecondaryContext extends DetoxContext {
     try {
       await super[symbols.teardown]();
     } finally {
-      if (this[_ipcClient]) {
-        await this[_ipcClient].dispose();
-        this[_ipcClient] = null;
+      if (this[_shortLifecycle]) {
+        await this[symbols.globalTeardown]();
       }
     }
   }

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.md5

@@ -1 +0,0 @@
-937f993292c31bbc63081e5948da3f98

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-1241bd41fd22394ae5188a93cbfc937e3d7e1a7f

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-cea1094d1b55bc0da25e7d50cb0ab6c46054e43bd7466923c9ec3306675d5bba

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-76e5f493a41f718bff430572aa2215675e5767827dc44f6f44dda78d64768e124c9b2078d4b1669537fa00e3f34b045eadc22168fb210cab2fbc976470431913

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.md5

@@ -1 +0,0 @@
-b9a7e18eb5db9c29387800d177dc855e

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha1

@@ -1 +0,0 @@
-e315ec89f403a1b0c2261c72bb6a614752aea946

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha256

@@ -1 +0,0 @@
-081bddb05b360d8ff578b2dafa006f38bf2e52dd7e0cd7b942764a4ecf391e86

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha512

@@ -1 +0,0 @@
-616c8bf9cecb7f03331a785c32f1449672e8179c849e997e5ef9ab210d25a95e16efc618c1660757dc0da90b1e09fc90df6cf1e68a0f92a6c33f331f02d74ba2

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.md5

@@ -1 +0,0 @@
-409fa95566cf0ec6633fce554ae87b8b

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha1

@@ -1 +0,0 @@
-8086a11b6780db7eb68ab43d29e7680b01e72479

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha256

@@ -1 +0,0 @@
-4a844b7f2bf2ff0c50a742633c34e8e477e45bae50a2a0126ca2ebdbfd6ee213

package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha512

@@ -1 +0,0 @@
-22ccfbb1ddd925f4892bed13b9bbb5061f20a022155d0c8d79bc78c993e1d3f326c67560d92f25223d9de30d7e0432af4f09ed35db9f36282bf2b790c6d215fb