detox 20.0.11-prerelease.0 → 20.1.0-next-is-hittable-check.0

package/src/realms/DetoxPrimaryContext.js

@@ -46,9 +46,9 @@ class DetoxPrimaryContext extends DetoxContext {
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
+  async [symbols.reportTestResults](testResults) {
     if (this[_ipcServer]) {
-      this[_ipcServer].onFailedTests({ testFilePaths, permanent });
+      this[_ipcServer].onReportTestResults({ testResults });
     }
   }
 
@@ -236,15 +236,14 @@ class DetoxPrimaryContext extends DetoxContext {
       const { rootDir } = this[symbols.config].artifacts;
 
       await fs.mkdirp(rootDir);
-      const [out1Stream, out2Stream, out3Stream] = ['detox.log.jsonl', 'detox.log', 'detox.trace.json']
+      const [out1Stream, out2Stream] = ['detox.log', 'detox.trace.json']
         .map((filename) => fs.createWriteStream(path.join(rootDir, filename)));
 
       const mergedStream = streamUtils.uniteSessionLogs(sessionId);
 
       await Promise.all([
-        pipe(mergedStream, streamUtils.writeJSONL(), out1Stream),
-        pipe(mergedStream, streamUtils.debugStream(this[symbols.logger].config.options), out2Stream),
-        pipe(mergedStream, streamUtils.chromeTraceStream(), streamUtils.writeJSON(), out3Stream),
+        pipe(mergedStream, streamUtils.debugStream(this[symbols.logger].config.options), out1Stream),
+        pipe(mergedStream, streamUtils.chromeTraceStream(), streamUtils.writeJSON(), out2Stream),
       ]);
     }
 
@@ -286,8 +285,7 @@ class DetoxPrimaryContext extends DetoxContext {
       return true;
     }
 
-    const { failedTestFiles, testFilesToRetry } = this[$sessionState];
-    return failedTestFiles.length + testFilesToRetry.length > 0;
+    return this[$sessionState].testResults.some(r => !r.success);
   }
 
   async[_resetLockFile]() {

package/src/realms/DetoxSecondaryContext.js

@@ -29,9 +29,9 @@ class DetoxSecondaryContext extends DetoxContext {
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
+  async [symbols.reportTestResults](testResults) {
     if (this[_ipcClient]) {
-      await this[_ipcClient].reportFailedTests(testFilePaths, permanent);
+      await this[_ipcClient].reportTestResults(testResults);
     } else {
       throw new DetoxInternalError('Detected an attempt to report failed tests using a non-initialized context.');
     }

package/src/symbols.js

@@ -7,18 +7,12 @@
  *   readonly installWorker: unique symbol;
  *   readonly logger: unique symbol;
  *   readonly onHookFailure: unique symbol;
- *   readonly onHookStart: unique symbol;
- *   readonly onHookSuccess: unique symbol;
  *   readonly onRunDescribeFinish: unique symbol;
  *   readonly onRunDescribeStart: unique symbol;
- *   readonly onRunFinish: unique symbol;
- *   readonly onRunStart: unique symbol;
  *   readonly onTestDone: unique symbol;
  *   readonly onTestFnFailure: unique symbol;
- *   readonly onTestFnStart: unique symbol;
- *   readonly onTestFnSuccess: unique symbol;
  *   readonly onTestStart: unique symbol;
- *   readonly reportFailedTests: unique symbol;
+ *   readonly reportTestResults: unique symbol;
  *   readonly resolveConfig: unique symbol;
  *   readonly session: unique symbol;
  *   readonly tracing: unique symbol;
@@ -28,22 +22,16 @@
  */
 module.exports = {
   //#region Lifecycle
-  onRunStart: Symbol('run_start'),
   onRunDescribeStart: Symbol('run_describe_start'),
   onTestStart: Symbol('test_start'),
-  onHookStart: Symbol('hook_start'),
   onHookFailure: Symbol('hook_failure'),
-  onHookSuccess: Symbol('hook_success'),
-  onTestFnStart: Symbol('test_fn_start'),
   onTestFnFailure: Symbol('test_fn_failure'),
-  onTestFnSuccess: Symbol('test_fn_success'),
   onTestDone: Symbol('test_done'),
   onRunDescribeFinish: Symbol('run_describe_finish'),
-  onRunFinish: Symbol('run_finish'),
   //#endregion
 
   //#region IPC
-  reportFailedTests: Symbol('reportFailedTests'),
+  reportTestResults: Symbol('reportTestResults'),
   //#endregion
 
   //#region Main

package/src/utils/Timer.js

@@ -1,65 +1,82 @@
-// @ts-nocheck
-const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
+const { DetoxRuntimeError, DetoxInternalError } = require('../errors');
 
 const Deferred = require('./Deferred');
 
 class Timer {
+  constructor() {
+    /** @private */
+    this._eta = NaN;
+    /** @private */
+    this._timeout = NaN;
+    /** @type {NodeJS.Timer | null} */
+    this._timeoutHandle = null;
+    /** @type {Deferred | null} */
+    this._timeoutDeferred = null;
+  }
+
+  clear() {
+    if (this._timeoutHandle) {
+      clearTimeout(this._timeoutHandle);
+      this._timeoutHandle = null;
+    }
+
+    this._eta = NaN;
+    this._timeout = NaN;
+    this._timeoutDeferred = null;
+  }
+
+  get expired() {
+    return this._timeoutDeferred ? this._timeoutDeferred.isResolved() : false;
+  }
+
   /**
-   * @param {string} description - gives more context for thrown errors
    * @param {number} timeout - maximal allowed duration in milliseconds
    */
-  constructor({ description, timeout }) {
-    /** @private */
+  schedule(timeout) {
+    this.clear();
+
+    this._eta = Date.now() + timeout;
     this._timeout = timeout;
-    /** @public */
-    this.description = description;
+    this._timeoutDeferred = new Deferred();
+    this._timeoutHandle = setTimeout(() => {
+      this._timeoutDeferred.resolve();
+    }, this._timeout);
 
-    this._schedule();
+    return this;
   }
 
-  _schedule() {
-    this._createdAt = Date.now();
-    this._timeoutDeferred = new Deferred();
+  extend(ms) {
+    if (this.expired) {
+      return this.schedule(ms);
+    }
+
+    clearTimeout(this._timeoutHandle);
+    this._eta += ms;
+    this._timeout += ms;
     this._timeoutHandle = setTimeout(() => {
       this._timeoutDeferred.resolve();
-    }, this._timeout);
+    }, this._eta - Date.now());
   }
 
-  async run(action) {
+  async run(description, action) {
+    if (!this._timeoutDeferred) {
+      throw new DetoxInternalError('Cannot run a timer action from an uninitialized timer');
+    }
+
     const error = new DetoxRuntimeError({
-      message: `Exceeded timeout of ${this._timeout}ms while ${this.description}`,
+      message: `Exceeded timeout of ${this._timeout}ms while ${description}`,
       noStack: true,
     });
 
+    if (this.expired) {
+      throw error;
+    }
+
     return Promise.race([
       this._timeoutDeferred.promise.then(() => { throw error; }),
       Promise.resolve().then(action),
     ]);
   }
-
-  dispose() {
-    clearTimeout(this._timeoutHandle);
-  }
-
-  reset(extraDelayMs) {
-    this._timeout = extraDelayMs;
-
-    if (this._timeoutDeferred.status !== Deferred.PENDING) {
-      this._schedule();
-    } else {
-      clearTimeout(this._timeoutHandle);
-      this._timeoutHandle = setTimeout(() => this._timeoutDeferred.resolve(), extraDelayMs);
-    }
-  }
-
-  static async run({ description, timeout, fn }) {
-    const timer = new Timer({ description, timeout });
-    try {
-      await timer.run(fn);
-    } finally {
-      timer.dispose();
-    }
-  }
 }
 
 module.exports = Timer;

package/src/utils/errorUtils.js

@@ -1,4 +1,6 @@
 const { isError } = require('lodash');
+const { deserializeError, serializeError } = require('serialize-error');
+
 const CLEAN_AT = /\n\s*at [\s\S]*/m;
 
 function filterErrorStack(error, predicate) {
@@ -38,9 +40,27 @@ function asError(error) {
   return isError(error) ? error : new Error(error);
 }
 
+function serializeObjectWithError(obj, errorKey) {
+  if (obj[errorKey]) {
+    return { ...obj, [errorKey]: serializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
+function deserializeObjectWithError(obj, errorKey) {
+  if (typeof obj[errorKey] === 'object' && !(obj[errorKey] instanceof Error)) {
+    return { ...obj, [errorKey]: deserializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
 module.exports = {
   asError,
   replaceErrorStack,
   filterErrorStack,
   createErrorWithUserStack,
+  serializeObjectWithError,
+  deserializeObjectWithError,
 };

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-47812b0a46970666a8ed5133588f83b9

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-3ac292deb3e60c7f80bb4e138e61decdacb32673

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-5d4183bf7d91e2375e527f7886a374bcdc227328e09fbe8c5705c82750cb5a80

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-b149751c26413a63ea98c69ff3a4cb19a4d449b4b626e277ecdd1508b725ef5179dbcbb68aca4c4427651de00ebdf30efb517ea981302eb50ec4aed6e26c432f

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-123907367c42d213beeb25fac892c1c8

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-35e4d7a489d2b9ce8bc3298d4e05ace381938968

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-ba003c4e1afb9667e62a7d1e73db455775e1c082d6f3780d4ed172844e1dcec3

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-a8254a5574422d06bbe1b256abf87d111b2fb56d82a1e82dd9a827407e95321a81279eaeaa79cc68e985d313f547e70b60251c374d784195d05d90c042f6e93a

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0.pom.md5

@@ -1 +0,0 @@
-e1de6a89002fc682019853172c69830c

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-489bc3e987d66596a3d04353e50a9b7528a2ca8f

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-40f07b6d97cc2f6143e7bf5456fc0070af5ee9316a8585c4abdca7d796409d71

package/Detox-android/com/wix/detox/20.0.11-prerelease.0/detox-20.0.11-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-9eae7ac091f209b9ddd0282e6e8eb2dcef416c06d2906857f7d065276787c56cd7a14e19883c710f934005f5831890c33a66218dabb5dbfe6a9143089b6a3462