detox 20.0.1 → 20.0.2

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

@@ -0,0 +1 @@
+514cd58d623830ff11b1b7b32035b2f5

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

@@ -0,0 +1 @@
+9cd358d37b6a4abeaf910f3cba214f0e9e0e5550

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

@@ -0,0 +1 @@
+d26c25b365a5848bcab24a07c1dcd5cb4e55e221b641642cca3007889187af5e

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

@@ -0,0 +1 @@
+5759ed953a4d0854ef67219e01102a2ec30da9a685cf997c1e9aaa0e138a3160d7acf68bac3c61ed93169b96122e9631413415ac3ef0a23099b07f4f0ad7e877

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

@@ -0,0 +1 @@
+3d3ff582ffc1e63d8439b6c1c870d072

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

@@ -0,0 +1 @@
+a6b2b9706eefba7a98ee96bfd74c9e6c0953c560

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

@@ -0,0 +1 @@
+f226e31a8f73581be7a622873f1648ad7ff3689fb69c6803b162891d6432a222

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

@@ -0,0 +1 @@
+3f161dca3fbcb2dc70b4994ea2e0889b7c259688188d8831fa05f54b9d1a4ec5ac1cd9e05296e1d6928a3cb95afc3871006855b6081593c0be96469bf46ff9eb

package/Detox-android/com/wix/detox/{20.0.1/detox-20.0.1.pom → 20.0.2/detox-20.0.2.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.0.1</version>
+  <version>20.0.2</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/detox-20.0.2.pom.md5

@@ -0,0 +1 @@
+4f7a1a7399a5af7b35c036d2fc0718cb

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

@@ -0,0 +1 @@
+dac8c057b62ac30f745c079966af8414dcb091f3

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

@@ -0,0 +1 @@
+b5fd933f8d07b16518b57ba0eb8e1b81408705c6a14300c98b2b6db643dc7a07

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

@@ -0,0 +1 @@
+6396385afa4de70131d6db2911f0044aab4f739cb1e8b7b212473ff8ddcd356e928a489dbca9cd978b190f7d5134466afc1a58d2fd6a85664e0979fe13f80b86

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</latest>
-    <release>20.0.1</release>
+    <latest>20.0.2</latest>
+    <release>20.0.2</release>
     <versions>
-      <version>20.0.1</version>
+      <version>20.0.2</version>
     </versions>
-    <lastUpdated>20221111055618</lastUpdated>
+    <lastUpdated>20221116093316</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-b10b964ebde575bc8cd48e900c601087
+05e0bb75beb5d6a3094aebcdba7b4563

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

@@ -1 +1 @@
-29a7266179c86ab0b4da09c52ca781715d1e04f2
+88cff9cd55696025d566b3eb466acd91f27ecd64

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

@@ -1 +1 @@
-a8733cc3277fc22d461b93edd646b02ff17c2117162959aead78483c9eb5ca5b
+1d14b7cac08e76b539d975cb4149bbcf827557ef2359a1cb39ec524fd06fcd2b

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

@@ -1 +1 @@
-f3766e7ecae1daa097dddd3ebf51751098e07208bce6403920f49aad7504fc41f35b87d7c0d84d01bf82a9090cfd6a33d04ec35f7bf0c726d42d7b1d550fedd0
+c42f63528cf78b14e8d23dc1543fd2ed09f67c9f83fd39763c945093780dd63cef41d8ffcaa6da7b758b2e88725d8a45ad8df7e9f92e120ec88e5b0172868f54

package/local-cli/cli.js

@@ -28,9 +28,12 @@ yargs
   .wrap(yargs.terminalWidth() * 0.9)
   .fail(function(msg, err, program) {
     if (err) {
-      logger.error(DetoxError.format(err));
-      // eslint-disable-next-line no-console
-      process.stderr.write('\n');
+      const message = DetoxError.format(err);
+      if (message) {
+        logger.error(message);
+        process.stderr.write('\n');
+      }
+
       // @ts-ignore
       _.attempt(() => fs.unlinkSync(logger.file));
       // eslint-disable-next-line no-process-exit

package/local-cli/testCommand/TestRunnerCommand.js

@@ -6,9 +6,11 @@ const unparse = require('yargs-unparser');
 
 const detox = require('../../internals');
 const log = detox.log.child({ cat: ['lifecycle', 'cli'] });
-const { DetoxRuntimeError } = require('../../src/errors');
 const { printEnvironmentVariables, prependNodeModulesBinToPATH } = require('../../src/utils/envUtils');
-const { escapeSpaces } = require('../../src/utils/shellUtils');
+const { toSimplePath } = require('../../src/utils/pathUtils');
+const { escapeSpaces, useForwardSlashes } = require('../../src/utils/shellUtils');
+
+const TestRunnerError = require('./TestRunnerError');
 
 class TestRunnerCommand {
   /*
@@ -57,8 +59,9 @@ class TestRunnerCommand {
         if (--runsLeft > 0) {
           // @ts-ignore
           detox.session.testSessionIndex++; // it is always the primary context, so we can update it
-          this._argv._ = testFilesToRetry;
-          this._logRelaunchError();
+
+          this._argv._ = testFilesToRetry.map(useForwardSlashes);
+          this._logRelaunchError(testFilesToRetry);
         }
       }
     } while (launchError && runsLeft > 0);
@@ -114,7 +117,7 @@ class TestRunnerCommand {
     const fullCommand = this._buildSpawnArguments().map(escapeSpaces);
     const fullCommandWithHint = printEnvironmentVariables(this._envHint) + fullCommand.join(' ');
 
-    log.info({ env: this._envHint }, fullCommandWithHint);
+    log.info.begin({ env: this._envHint }, fullCommandWithHint);
 
     return new Promise((resolve, reject) => {
       cp.spawn(fullCommand[0], fullCommand.slice(1), {
@@ -128,10 +131,20 @@ class TestRunnerCommand {
           .value()
       })
         .on('error', /* istanbul ignore next */ (err) => reject(err))
-        .on('exit', (code) => code === 0
-          ? resolve()
-          : reject(new DetoxRuntimeError(`Command failed with exit code = ${code}:\n${fullCommandWithHint}`)
-        ));
+        .on('exit', (code, signal) => {
+          if (code === 0) {
+            log.trace.end({ success: true });
+            resolve();
+          } else {
+            const error = new TestRunnerError({
+              command: fullCommandWithHint,
+              code,
+              signal,
+            });
+            log.error.end({ success: false, code, signal }, error.message);
+            reject(error);
+          }
+        });
     });
   }
 
@@ -148,9 +161,9 @@ class TestRunnerCommand {
     ].map(String);
   }
 
-  _logRelaunchError() {
-    const list = this._argv._.map((file, index) => {
-      return `  ${index + 1}. ${file}`;
+  _logRelaunchError(filePaths) {
+    const list = filePaths.map((file, index) => {
+      return `  ${index + 1}. ${toSimplePath(file)}`;
     }).join('\n');
 
     log.error(

package/local-cli/testCommand/TestRunnerError.js

@@ -0,0 +1,17 @@
+const { DetoxError } = require('../../src/errors');
+
+class TestRunnerError extends DetoxError {
+  constructor({ command, code, signal }) {
+    super(`Command failed with exit code = ${code}:\n${command}`);
+
+    this.code = code;
+    this.signal = signal;
+    this.name = 'TestRunnerError';
+  }
+
+  format() {
+    return '';
+  }
+}
+
+module.exports = TestRunnerError;

package/local-cli/testCommand/TestRunnerError.test.js

@@ -0,0 +1,25 @@
+const { DetoxError } = require('../../src/errors');
+
+const TestRunnerError = require('./TestRunnerError');
+
+describe('TestRunnerError', () => {
+  let error;
+
+  beforeAll(() => {
+    error = new TestRunnerError({ command: 'foo', code: 1, signal: null });
+  });
+
+  it('should format an error message', () => {
+    expect(`${error}`).toMatch(/Command failed with exit code = 1:\nfoo/);
+  });
+
+  it('should assign properties (code, signal)', () => {
+    expect(error.code).toBe(1);
+    expect(error.signal).toBe(null);
+  });
+
+  it('should be formatted to an empty string', () => {
+    // So that the try-catch block in cli.js will not print it for the second time
+    expect(DetoxError.format(error)).toBe('');
+  });
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.0.1",
+  "version": "20.0.2",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -61,7 +61,6 @@
     "caf": "^15.0.1",
     "chalk": "^2.4.2",
     "child-process-promise": "^2.2.0",
-    "duplexify": "^4.1.2",
     "find-up": "^4.1.0",
     "fs-extra": "^4.0.2",
     "funpermaproxy": "^1.1.0",
@@ -190,5 +189,5 @@
       }
     }
   },
-  "gitHead": "c790d107c8da0082aa2730453012e1078b22db10"
+  "gitHead": "caef3fd2ce6fe7ad2a8267102ee521153abbcbb2"
 }

package/src/artifacts/utils/temporaryPath.js

@@ -1,14 +1,42 @@
 const path = require('path');
+const { promisify } = require('util');
 
+const glob = require('glob');
 const tempfile = require('tempfile');
 
+const { useForwardSlashes } = require('../../utils/shellUtils');
+
+const globSync = glob.sync;
+const globAsync = promisify(glob);
+
+function getRoot() {
+  return path.dirname(tempfile());
+}
+
+function createGlobber(ext) {
+  const fullExt = `.detox.${ext}`;
+
+  return {
+    sync: (pattern) => {
+      const cwd = getRoot();
+      const files = globSync(useForwardSlashes(pattern + fullExt), { cwd });
+      return files.map(f => path.join(cwd, f));
+    },
+    async: async (pattern) => {
+      const cwd = getRoot();
+      const files = await globAsync(useForwardSlashes(pattern + fullExt), { cwd });
+      return files.map(f => path.join(cwd, f));
+    },
+  };
+}
+
 function createTempFileBuilderFn(fileExtension) {
   /**
    * @param {string} [basename]
    */
   return (basename) => {
     return basename
-      ? path.join(path.dirname(tempfile()), `${basename}.detox.${fileExtension}`)
+      ? path.join(getRoot(), `${basename}.detox.${fileExtension}`)
       : tempfile(`.detox.${fileExtension}`);
   };
 }
@@ -23,5 +51,7 @@ module.exports = {
     dtxrec: createTempFileBuilderFn('dtxrec'),
     viewhierarchy: createTempFileBuilderFn('viewhierarchy'),
   },
-  mask: () => path.join(tempfile(), '..') + path.sep + '*.detox.*',
+  find: {
+    jsonl: createGlobber('jsonl'),
+  },
 };

package/src/errors/DetoxError.js

@@ -8,6 +8,10 @@ class DetoxError extends Error {
     this.name = 'DetoxError';
   }
 
+  format() {
+    return this.message;
+  }
+
   static get reportIssue() {
     return 'Please report this issue on our GitHub tracker:\nhttps://github.com/wix/Detox/issues';
   }
@@ -32,7 +36,7 @@ class DetoxError extends Error {
    */
   static format(err, inspectOptions = { depth: 1 }) {
     if (err instanceof DetoxError) {
-      return err.message;
+      return err.format();
     }
 
     if (_.isError(err) && /^Command failed:/.test(err.message)) {

package/src/logger/DetoxLogger.js

@@ -19,11 +19,12 @@ const sanitizeBunyanContext = require('./utils/sanitizeBunyanContext');
  * @property {CategoryThreadDispatcher} [dispatcher]
  * @property {BunyanLogger} [bunyan]
  * @property {MessageStack} [messageStack]
+ * @property {boolean} [unsafeMode] Disables sanitization of user input, used for integration tests.
  */
 
 class DetoxLogger {
   /**
-   * @param {Pick<SharedLoggerConfig, 'file' | 'userConfig'>} sharedConfig
+   * @param {SharedLoggerConfig} sharedConfig
    * @param {object} [context]
    */
   constructor(sharedConfig, context) {
@@ -91,7 +92,7 @@ class DetoxLogger {
    * @returns {DetoxLogger}
    */
   child(overrides) {
-    const merged = this._mergeContexts(this._context, sanitizeBunyanContext(overrides));
+    const merged = this._mergeContexts(this._context, this._sanitizeContext(overrides));
     return new DetoxLogger(this._sharedConfig, merged);
   }
 
@@ -119,6 +120,25 @@ class DetoxLogger {
     this.overrideConsole();
   }
 
+  /**
+   * Closes the file descriptors to make sure that the temporary
+   * JSONL files are flushed and contain the last error messages.
+   * This safety measure is especially important for Windows OS.
+   *
+   * @async
+   * @internal
+   */
+  async close() {
+    if (this._context) {
+      throw new DetoxInternalError(
+        'Trying to close file streams from a non-root logger.\n' +
+        'If you are not fiddling with Detox internals on purpose, yet you see this error, then...'
+      );
+    }
+
+    await this._sharedConfig.bunyan.closeFileStreams();
+  }
+
   /**
    * @internal
    */
@@ -192,7 +212,7 @@ class DetoxLogger {
 
   /** @private */
   _beginInternal(level, context, msg) {
-    this._sharedConfig.messageStack.push(context.tid, msg);
+    this._sharedConfig.messageStack.push(context, msg);
     this._sharedConfig.bunyan.logger[level](context, ...msg);
   }
 
@@ -204,7 +224,7 @@ class DetoxLogger {
 
   /** @private */
   _endInternal(level, context, msg) {
-    const beginMsg = this._sharedConfig.messageStack.pop(context.tid);
+    const beginMsg = this._sharedConfig.messageStack.pop(context);
     if (msg.length === 0) {
       msg = beginMsg;
     }
@@ -272,12 +292,21 @@ class DetoxLogger {
     const context = this._mergeContexts(
       this._context,
       boundContext,
-      sanitizeBunyanContext(userContext),
+      this._sanitizeContext(userContext),
     );
 
     return { context, msg };
   }
 
+  /** @private */
+  _sanitizeContext(context) {
+    if (this._sharedConfig.unsafeMode) {
+      return context;
+    }
+
+    return sanitizeBunyanContext(context);
+  }
+
   /** @internal */
   static defaultOptions({ level }) {
     const ph = level === 'trace' || level === 'debug'

package/src/logger/utils/BunyanLogger.js

@@ -71,6 +71,45 @@ class BunyanLogger {
 
     return this;
   }
+
+  async closeFileStreams() {
+    const { _closeStream } = BunyanLogger;
+    const internalBunyanStreams = this._bunyan['streams'];
+    const openFileStreams = _.filter(internalBunyanStreams, this._isOpenFileStream);
+    _.remove(internalBunyanStreams, openFileStreams);
+
+    await Promise.all(openFileStreams.map(_closeStream));
+  }
+
+  /** @private */
+  _isOpenFileStream = (bunyanStream) => {
+    switch (bunyanStream.type) {
+      case 'file':
+        return bunyanStream.path && !bunyanStream.stream.destroyed;
+      case 'raw':
+        /* istanbul ignore next */
+        const stream = bunyanStream.stream === this._debugStream.stream
+          ? bunyanStream.stream._out
+          : bunyanStream.stream;
+
+        /* istanbul ignore next */
+        return stream.fd !== undefined && !stream.closed;
+    }
+  };
+
+  /** @private */
+  static _closeStream(bunyanStream) {
+    return new Promise((resolve, reject) => {
+      bunyanStream.stream.end((err) => {
+        /* istanbul ignore next */
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    });
+  }
 }
 
 module.exports = BunyanLogger;

package/src/logger/utils/CategoryThreadDispatcher.js

@@ -1,4 +1,5 @@
 const ThreadDispatcher = require('./ThreadDispatcher');
+const getMainCategory = require('./getMainCategory');
 
 class CategoryThreadDispatcher {
   constructor() {
@@ -24,7 +25,7 @@ class CategoryThreadDispatcher {
 
   /** @returns {ThreadDispatcher} */
   _resolveDispatcher(cat) {
-    const mainCategory = cat ? cat.split(',', 1)[0] : 'undefined';
+    const mainCategory = getMainCategory(cat);
     if (!this._dispatchers[mainCategory]) {
       this._dispatchers[mainCategory] = new ThreadDispatcher(mainCategory);
     }