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

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

@@ -0,0 +1 @@
+91f1e6b3345b09b266fc6b1f4387d693

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

@@ -0,0 +1 @@
+a2d07ea0b1bd401ae5cd41fc9f07bbbfb4fee96f

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

@@ -0,0 +1 @@
+269c444435ef2d7f7267d243b84beefc38508b035df782e1a60eb25b3882a30d

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

@@ -0,0 +1 @@
+f6d54f916e9b35f686f67a63fe072ffc0781ae7da27daf39a0dce5145fa75de5a240402f10d48df88710730fe40d847e87f7194d999359322e97f483f815496e

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

@@ -0,0 +1 @@
+613e288168a5ebe791c1b253a0aac51c

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

@@ -0,0 +1 @@
+112918ac48c1f2763d5f0fddfa8aba44a35a0c57

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

@@ -0,0 +1 @@
+b21e2858bc218ca7402b48d759c6277fce832c73915c874b36d319fe4be2c2d7

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

@@ -0,0 +1 @@
+ccbe51ebb24ad5b665f2d4a9d212701096e77f14d9cf04ac8ff6b2b9a452f8fdcf4b2319060bbdc6512b1cbc11846995af3955ac63bd6ea6b75f64c9dd399c24

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.2-breaking.new-global-lifecycle.0/detox-20.0.2-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.2-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.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom.md5

@@ -0,0 +1 @@
+e68998c30e0c3aefe7cdc34b641fd5e2

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

@@ -0,0 +1 @@
+4afd3a2fcdb10c26d6a56a9b8f5c64a05b0152b5

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

@@ -0,0 +1 @@
+23b6942ae16e58bb84494f4080b72ef018817833f5a3af6971844ca7d35854ba

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

@@ -0,0 +1 @@
+461b3793c3c8fe77b4d7c1494716ae1ce17bf133c99b637f639f176e52c72fdfcf1a2621ce18136f151aa50798007cc68e0eee46a87674a0a22e68534b5f43f6

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.2-breaking.new-global-lifecycle.0</latest>
+    <release>20.0.2-breaking.new-global-lifecycle.0</release>
     <versions>
-      <version>20.0.1-breaking.new-global-lifecycle.0</version>
+      <version>20.0.2-breaking.new-global-lifecycle.0</version>
     </versions>
-    <lastUpdated>20220810074907</lastUpdated>
+    <lastUpdated>20220812072754</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-b2585c88d6aa7316562eefd1276b22b8
+66edf73eb985206d4b25467aaf398b5b

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

@@ -1 +1 @@
-a08cf502a9a0fd7b00c98d8ac7406f638489da61
+f08d44468bdd0e4ae5efdcfe2ce7607e2b89b953

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

@@ -1 +1 @@
-5afa6a8108d9375f9e5ede74faae8dd51d73ae25dab9e7915cfe11503c0f4a36
+d51a7e909a7633013fa58ab30ca34ed484b2b67acbd7f0484c923f04bdeb2ec6

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

@@ -1 +1 @@
-701eeb42080f3cc2cf38ddb06f0a1185633a958dac2325d7225fc5a3aefcd982def05877242c10cec1bd569d8ac2f600f7b8f0d85c4399ccd61fdeb9e0d8f6b2
+04a047b23b9ed5229c4f124c08719bb7e1b468cc5fab450a9403adfd7f7c109ebae29182f6c3763e9b7915c4ff60c5971ea8f8417e8d5b8b7877961310c1f484

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,6 +79,8 @@ declare global {
 
     type SessionState = Readonly<{
       failedTestFiles: string[];
+      testFilesToRetry: string[];
+      testSessionIndex: number;
       workersCount: number;
     }>;
 

package/local-cli/test.test.js

@@ -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.2-breaking.new-global-lifecycle.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -183,5 +183,5 @@
       }
     }
   },
-  "gitHead": "b05792476b6eaedeb998b8625ecc78132aee361f"
+  "gitHead": "cda5a555ec90aaeafe8c557157270e36a2b27688"
 }

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

@@ -16,13 +16,8 @@ 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() {
@@ -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.runnerConfig.jest.retryAfterCircusRetries;
+      await detoxInternals.reportFailedTests([this._env.testPath], handledByJestCircus);
     }
   }
 

package/src/configuration/composeRunnerConfig.js

@@ -31,6 +31,7 @@ function composeRunnerConfig(opts) {
       inspectBrk: inspectBrkHookDefault,
       jest: {
         initTimeout: 300000,
+        retryAfterCircusRetries: false,
         reportSpecs: undefined,
         reportWorkerAssign: true,
       },

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

@@ -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 });
     }
   }
 

package/src/realms/DetoxSecondaryContext.js

@@ -21,9 +21,9 @@ class DetoxSecondaryContext extends DetoxContext {
   }
 
   //#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.');
     }

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