detox 20.0.14-prerelease.0 → 20.0.15-prerelease.0

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

@@ -0,0 +1 @@
+ef866445bee1b7191de4336c76dd93f9

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

@@ -0,0 +1 @@
+3d69a7ece65dfc290ba7c7a71d7e76227353d86f

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

@@ -0,0 +1 @@
+d34810beb66a73776549bfa5f5c2eefc40250584f69bf471612403f18ea8b518

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

@@ -0,0 +1 @@
+c59585aa86f4995c6873ae6fc086b882076b6c3a655388515abcacbadb3dbddd46712869703619e903dff89c466ed080634e113b3a480465fa27ec3edde08d7a

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

@@ -0,0 +1 @@
+ff0f0578be190c91b57c6024df4b5fb6

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

@@ -0,0 +1 @@
+8cc49ca4de60598d65767133544f0bd6ad97b494

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

@@ -0,0 +1 @@
+5ad08ad6fb9c09f1391a326d24d96b939ca8cde038f78dbc7ff0a4604e27f3b0

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

@@ -0,0 +1 @@
+403e4e5b90acce7b564bb73213361df77e3e226a36465c7308875a7511e6c8794ab22c8cbd3580eb439798b0245d4a54be94e818a08ffa5125bc85913e802f94

package/Detox-android/com/wix/detox/20.0.15-prerelease.0/detox-20.0.15-prerelease.0.aar.md5

@@ -0,0 +1 @@
+3bdd1b42fa0f182255a47fcdda8f544c

package/Detox-android/com/wix/detox/20.0.15-prerelease.0/detox-20.0.15-prerelease.0.aar.sha1

@@ -0,0 +1 @@
+457ae10d202b196ea92bade4a33ce2dbc2f8bb3f

package/Detox-android/com/wix/detox/20.0.15-prerelease.0/detox-20.0.15-prerelease.0.aar.sha256

@@ -0,0 +1 @@
+52342d1b0d1fae681b2ea1e6f9ac6f6278299ed70d7867fd60b95d63eb7a9ec3

package/Detox-android/com/wix/detox/20.0.15-prerelease.0/detox-20.0.15-prerelease.0.aar.sha512

@@ -0,0 +1 @@
+5dfa73d84d647fd870a2e915d9943c9502c967abfd89a834ef7dee50a2a77d5a8b0be7b13407a34a6b97cbc10e9ed6f5e608fe7366d5a3041e462e3322d5b10d

package/Detox-android/com/wix/detox/{20.0.14-prerelease.0/detox-20.0.14-prerelease.0.pom → 20.0.15-prerelease.0/detox-20.0.15-prerelease.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.0.14-prerelease.0</version>
+  <version>20.0.15-prerelease.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.15-prerelease.0/detox-20.0.15-prerelease.0.pom.md5

@@ -0,0 +1 @@
+8c1df15d68775116019b04b9496a6ff6

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

@@ -0,0 +1 @@
+dbe3d335c31886336e6c969b38e222d6f92004da

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

@@ -0,0 +1 @@
+4ec36429edce121f9a29981a67b9ea84bce00e7c4991bd6d1636c8edb0d3b322

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

@@ -0,0 +1 @@
+c4b645ab10c009733624a5aebb04c701a0b73e22dc419b3ba5a396d6937bad9d26e1ae7d9c4057bfc5d915b4af91250af6c5b991535b8554ba1d80abb3990b10

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.0.14-prerelease.0</latest>
-    <release>20.0.14-prerelease.0</release>
+    <latest>20.0.15-prerelease.0</latest>
+    <release>20.0.15-prerelease.0</release>
     <versions>
-      <version>20.0.14-prerelease.0</version>
+      <version>20.0.15-prerelease.0</version>
     </versions>
-    <lastUpdated>20221108145605</lastUpdated>
+    <lastUpdated>20221110171141</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-ba7d8cb5496d1d9366a8234bc4e64055
+0a8740dfdf732622e512707d164837bc

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

@@ -1 +1 @@
-77f004770bdd78a7442584a10dd84ef431783841
+f892f8ff0cda46b0e16a893224d340c1e3d2c803

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

@@ -1 +1 @@
-dd9c1791bb2c603c4806ebca0b071f52229edadedc9e487d52a434c1c24638b7
+9ed56153c167d071db724c68d6e141358916df50340cf29bb3ff23ea8db43091

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

@@ -1 +1 @@
-a2914ac9dc6c4bd7a1f84a46a8f84e467d314b71f96d6603c4303bc54344d354fdc2903e1934c275ee785cd4a544c7a7f575c512ad6b623b76f943b672be718c
+13e2b660cbe1403226c025fe83ebb5f8c9f28de41fd432bcc355a9b42562e9158e68c161b6cf801f45c9878565d46beb7884b5b62d6ace714e36d06d17a1d1e3

package/index.d.ts

@@ -472,8 +472,6 @@ declare global {
                 readonly startSection: (name: string) => void;
                 /** @deprecated */
                 readonly endSection: (name: string) => void;
-                /** @private */
-                readonly invocationCall: (...args: unknown[]) => unknown;
             };
 
             /**

package/local-cli/test.test.js

@@ -108,22 +108,49 @@ describe('CLI', () => {
   ])('given no extra args (%s)', (_platform, deviceType) => {
     beforeEach(async () => {
       singleConfig().device.type = deviceType;
-      await run();
     });
 
-    test('should produce a default command', () => {
-      expect(cliCall().argv).toEqual([expect.stringContaining('executable'), '--config', 'e2e/config.json']);
-    });
+    describe('when testRunner.forwardEnv is true', () => {
+      beforeEach(async () => {
+        singleConfig().testRunner = { forwardEnv: true };
+        await run();
+      });
+
+      test('should produce a default command', () => {
+        expect(cliCall().argv).toEqual([expect.stringContaining('executable'), '--config', 'e2e/config.json']);
+      });
+
+      test('should override environment variables', () => {
+        expect(cliCall().env).toEqual({
+          DETOX_CONFIG_PATH: expect.any(String),
+          DETOX_CONFIG_SNAPSHOT_PATH: expect.any(String)
+        });
+      });
 
-    test('should not override environment variables', () => {
-      expect(cliCall().env).toEqual({
-        DETOX_CONFIG_PATH: expect.any(String),
-        DETOX_CONFIG_SNAPSHOT_PATH: expect.any(String)
+      test('should hint essential environment variables', () => {
+        expect(cliCall().fullCommand).toMatch(/\bDETOX_CONFIG_PATH=.*\bexecutable\b/);
       });
     });
 
-    test('should hint essential environment variables', () => {
-      expect(cliCall().fullCommand).toMatch(/\bDETOX_CONFIG_PATH=.*\bexecutable\b/);
+    describe('when testRunner.forwardEnv is false', () => {
+      beforeEach(async () => {
+        singleConfig().testRunner = { forwardEnv: false };
+        await run();
+      });
+
+      test('should produce a default command', () => {
+        expect(cliCall().argv).toEqual([expect.stringContaining('executable'), '--config', 'e2e/config.json']);
+      });
+
+      test('should not override environment variables', () => {
+        expect(cliCall().env).toEqual({
+          DETOX_CONFIG_SNAPSHOT_PATH: expect.any(String)
+        });
+      });
+
+      test('should not hint essential environment variables', () => {
+        expect(cliCall().fullCommand).not.toMatch(/\bDETOX_CONFIG_PATH=.*\bexecutable\b/);
+      });
     });
   });
 
@@ -468,6 +495,16 @@ describe('CLI', () => {
     expect(logger().warn).toHaveBeenCalledWith(expect.stringContaining('$DETOX_ARGV_OVERRIDE is detected'));
   });
 
+  test('should append $DETOX_ARGV_OVERRIDE "--" part to test runner command', async () => {
+    process.env.PLATFORM = 'ios';
+    process.env.DETOX_ARGV_OVERRIDE = '-- --help';
+
+    await run();
+
+    expect(cliCall().argv.slice(-1)).toEqual(['--help']);
+    expect(logger().warn).toHaveBeenCalledWith(expect.stringContaining('$DETOX_ARGV_OVERRIDE is detected'));
+  });
+
   // Helpers
 
   function tempfile(extension, content) {

package/local-cli/testCommand/TestRunnerCommand.js

@@ -14,7 +14,7 @@ class TestRunnerCommand {
   /*
     @param {object} opts
     @param {DetoxInternals.RuntimeConfig} opts.config
-    @param {ProcessEnv} [opts.env]
+    @param {ProcessEnv} opts.env
   */
   constructor(opts) {
     const cliConfig = opts.config.cli;
@@ -68,7 +68,7 @@ class TestRunnerCommand {
     }
   }
 
-  _buildEnvHint(env = process.env) {
+  _buildEnvHint(env) {
     return _(env)
       .mapKeys((_value, key) => key.toUpperCase())
       .pickBy((_value, key) => key.startsWith('DETOX_'))
@@ -127,7 +127,7 @@ class TestRunnerCommand {
           .tap(prependNodeModulesBinToPATH)
           .value()
       })
-        .on('error', (err) => reject(err))
+        .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}`)
@@ -136,6 +136,7 @@ class TestRunnerCommand {
   }
 
   _buildSpawnArguments() {
+    /* istanbul ignore next */
     const { _: specs = [], '--': passthrough = [], $0, ...argv } = this._argv;
     const { _: $0_, ...$0argv } = parser($0);
 

package/local-cli/testCommand/middlewares.js

@@ -13,12 +13,13 @@ function applyEnvironmentVariableAddendum(argv, yargs) {
 
     const { _: positional, '--': passthrough, ...named } = yargs.parse(process.env.DETOX_ARGV_OVERRIDE);
 
-    if (positional) {
+    if (!_.isEmpty(positional)) {
+      /* istanbul ignore next */
       argv._ = argv._ || [];
       argv._.push(...positional.map(simpleUnquote));
     }
 
-    if (passthrough) {
+    if (!_.isEmpty(passthrough)) {
       argv['--'] = argv['--'] || [];
       argv['--'].push(...passthrough.map(simpleUnquote));
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.0.14-prerelease.0",
+  "version": "20.0.15-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -160,20 +160,12 @@
       "src/utils/pipeCommands.js",
       "src/utils/pressAnyKey.js",
       "src/utils/shellUtils.js",
-      "local-cli/testCommand/TestRunnerCommand.js",
-      "local-cli/testCommand/middlewares.js",
+      "runners/jest/reporters",
+      "runners/jest/testEnvironment",
       "src/DetoxWorker.js",
-      "src/artifacts/ArtifactsManager.js",
-      "src/devices/lifecycle/GenyGlobalLifecycleHandler.js",
-      "src/errors/DetoxError.js",
+      "src/logger/utils/streamUtils.js",
       "src/ipc",
-      "src/logger",
-      "src/realms",
-      "src/utils/Timer.js",
-      "src/utils/envUtils.js",
-      "runners/jest/index.js",
-      "runners/jest/reporters",
-      "runners/jest/testEnvironment"
+      "src/realms"
     ],
     "resetMocks": true,
     "resetModules": true,
@@ -198,5 +190,5 @@
       }
     }
   },
-  "gitHead": "40d0a32720bb36575136f3c2769407bb2cef0cdf"
+  "gitHead": "5bfd04ef867767c3eb9690c418bf80588d367d3e"
 }

package/runners/jest/index.test.js

@@ -0,0 +1,13 @@
+describe('detox/runners/jest', () => {
+  it('should lazily require the exported modules', () => {
+    const index = require('./index');
+
+    jest.mock('./testEnvironment', () => 0);
+    jest.mock('./globalSetup', () => 1);
+    jest.mock('./globalTeardown', () => 2);
+
+    expect(index.DetoxCircusEnvironment).toBe(0);
+    expect(index.globalSetup).toBe(1);
+    expect(index.globalTeardown).toBe(2);
+  });
+});

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

@@ -41,10 +41,22 @@ class DetoxCoreListener {
   }
 
   async test_start({ test }) {
-    if (!_.isEmpty(test.errors)) {
+    const metadata = this._getTestMetadata(test);
+    if (metadata.status === 'failed') {
       this._testsFailedBeforeStart.add(test);
     }
 
+    const logTrace = this._isTestSkipped(test)
+      ? log.trace
+      : log.trace.begin;
+
+    logTrace({
+      context: 'test',
+      status: metadata.status,
+      fullName: metadata.fullName,
+      invocations: metadata.invocations,
+    }, metadata.title);
+
     const circusRetryTimes = +this._env.global[RETRY_TIMES];
     this._circusRetryTimes = isNaN(circusRetryTimes) ? 1 : 1 + circusRetryTimes;
   }
@@ -69,7 +81,11 @@ class DetoxCoreListener {
 
   async test_fn_start({ test }) {
     await this._onBeforeActualTestStart(test);
-    log.trace.begin({ functionCode: test.fn.toString() }, 'test_fn');
+
+    if (!this._testsFailedBeforeStart.has(test)) {
+      // Jest bug workaround: beforeAll hook errors result into an unterminated test_fn_start event.
+      log.trace.begin({ functionCode: test.fn.toString() }, 'test_fn');
+    }
   }
 
   async test_fn_success() {
@@ -82,61 +98,68 @@ class DetoxCoreListener {
   }
 
   async test_done({ test }) {
-    if (this._startedTests.has(test)) {
-      const failed = test.errors.length > 0;
-      const metadata = {
-        ...this._getTestMetadata(test),
-        status: failed ? 'failed' : 'passed',
-        timedOut: failed ? hasTimedOut(test) : undefined,
-      };
+    const metadata = this._getTestMetadata(test);
 
+    if (this._startedTests.has(test)) {
       await detoxInternals.onTestDone(metadata);
       this._startedTests.delete(test);
-      log.trace.end({
-        status: metadata.status,
-        timedOut: metadata.timedOut,
-      });
     }
+
+    log.trace.end(_.pick(metadata, ['status', 'timedOut']));
   }
 
   async _onBeforeActualTestStart(test) {
     if (!this._isTestActuallyStarting(test)) {
-      return false;
+      return;
     }
 
-    const metadata = {
-      ...this._getTestMetadata(test),
-      status: 'running',
-    };
-
     this._startedTests.add(test);
-
-    log.trace.begin({
-      context: 'test',
-      status: metadata.status,
-      fullName: metadata.fullName,
-      invocations: metadata.invocations,
-    }, metadata.title);
-
-    await detoxInternals.onTestStart(metadata);
-    return true;
+    await detoxInternals.onTestStart(this._getTestMetadata(test));
   }
 
   _isTestActuallyStarting(test) {
-    return test && test.status !== 'skip' && !this._startedTests.has(test) && !this._testsFailedBeforeStart.has(test);
+    return test && !this._isTestSkipped(test) && !this._startedTests.has(test) && !this._testsFailedBeforeStart.has(test);
   }
 
-  _getTestInvocations(test) {
-    const { testSessionIndex } = detoxInternals.session;
-    return testSessionIndex * this._circusRetryTimes + test.invocations;
+  _isTestSkipped(test) {
+    return test && (test.mode === 'skip' || test.mode === 'todo');
   }
 
   _getTestMetadata(test) {
-    return {
+    const result = {
       title: test.name,
       fullName: getFullTestName(test),
+      status: this._getTestStatus(test),
       invocations: this._getTestInvocations(test),
     };
+
+    if (result.status === 'failed') {
+      result.timedOut = hasTimedOut(test);
+    }
+
+    return result;
+  }
+
+  /** @returns { 'failed' | 'passed' | 'running' | 'skip' | 'todo' } */
+  _getTestStatus(test) {
+    if (!_.isEmpty(test.errors)) {
+      return 'failed';
+    }
+
+    if (this._isTestSkipped(test)) {
+      return test.mode;
+    }
+
+    if (test.status === 'done') {
+      return 'passed';
+    } else {
+      return test.status || 'running';
+    }
+  }
+
+  _getTestInvocations(test) {
+    const { testSessionIndex } = detoxInternals.session;
+    return testSessionIndex * this._circusRetryTimes + test.invocations;
   }
 }
 

package/src/android/interactions/native.js

@@ -1,6 +1,7 @@
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 const { expectDescription, actionDescription } = require('../../utils/invocationTraceDescriptions');
-const { trace } = require('../../utils/trace');
+const log = require('../../utils/logger').child({ cat: 'ws-client, ws' });
+const traceInvocationCall = require('../../utils/traceInvocationCall').bind(null, log);
 const { ScrollAmountStopAtEdgeAction } = require('../actions/native');
 const { NativeMatcher } = require('../core/NativeMatcher');
 const DetoxAssertionApi = require('../espressoapi/DetoxAssertion');
@@ -18,7 +19,7 @@ class Interaction {
   }
 
   async execute() {
-    return trace.invocationCall(this._traceDescription, this._call,
+    return traceInvocationCall(this._traceDescription, this._call,
       this._invocationManager.execute(this._call).then((resultObj) => resultObj ? resultObj.result : undefined));
   }
 }

package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js

@@ -10,6 +10,8 @@ class GenyGlobalLifecycleHandler {
     this._instanceLifecycleService = instanceLifecycleService;
   }
 
+  // TODO: remove this ignore as soon as DetoxPrimaryContext is covered with tests
+  /* istanbul ignore next */
   async globalInit() {}
 
   emergencyCleanup() {

package/src/devices/runtime/RuntimeDevice.js

@@ -1,7 +1,6 @@
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 const debug = require('../../utils/debug'); // debug utils, leave here even if unused
 const log = require('../../utils/logger').child({ cat: 'device' });
-const { traceCall } = require('../../utils/trace');
 const traceMethods = require('../../utils/traceMethods');
 const wrapWithStackTraceCutter = require('../../utils/wrapWithStackTraceCutter');
 
@@ -22,6 +21,7 @@ class RuntimeDevice {
       'disableSynchronization',
       'enableSynchronization',
       'installApp',
+      'installUtilBinaries',
       'launchApp',
       'matchFace',
       'matchFinger',
@@ -258,12 +258,12 @@ class RuntimeDevice {
   async installUtilBinaries() {
     const paths = this._deviceConfig.utilBinaryPaths;
     if (paths) {
-      await traceCall('installUtilBinaries', this.deviceDriver.installUtilBinaries(paths));
+      await this.deviceDriver.installUtilBinaries(paths);
     }
   }
 
   async reloadReactNative() {
-    await traceCall('reload React Native', this.deviceDriver.reloadReactNative());
+    await this.deviceDriver.reloadReactNative();
   }
 
   async openURL(params) {

package/src/ios/expectTwo.js

@@ -8,7 +8,8 @@ const tempfile = require('tempfile');
 
 const { assertEnum, assertNormalized } = require('../utils/assertArgument');
 const { actionDescription, expectDescription } = require('../utils/invocationTraceDescriptions');
-const { trace } = require('../utils/trace');
+const log = require('../utils/logger').child({ cat: 'ws-client, ws' });
+const traceInvocationCall = require('../utils/traceInvocationCall').bind(null, log);
 
 const assertDirection = assertEnum(['left', 'right', 'up', 'down']);
 const assertSpeed = assertEnum(['fast', 'slow']);
@@ -747,7 +748,7 @@ function throwElementError(param) {
 }
 
 function _executeInvocation(invocationManager, invocation, traceDescription) {
-  return trace.invocationCall(traceDescription, invocation, invocationManager.execute(invocation));
+  return traceInvocationCall(traceDescription, invocation, invocationManager.execute(invocation));
 }
 
 module.exports = IosExpect;

package/src/logger/DetoxLogger.js

@@ -2,7 +2,6 @@ const path = require('path');
 
 const _ = require('lodash');
 
-const temporaryPath = require('../artifacts/utils/temporaryPath');
 const { DetoxInternalError, DetoxError } = require('../errors');
 const { shortFormat } = require('../utils/dateUtils');
 const isPromise = require('../utils/isPromise');
@@ -16,7 +15,7 @@ const sanitizeBunyanContext = require('./utils/sanitizeBunyanContext');
 /**
  * @typedef SharedLoggerConfig
  * @property {string} file
- * @property {Detox.DetoxLoggerConfig} userConfig
+ * @property {Detox.DetoxLoggerConfig} [userConfig]
  * @property {CategoryThreadDispatcher} [dispatcher]
  * @property {BunyanLogger} [bunyan]
  * @property {MessageStack} [messageStack]
@@ -92,7 +91,7 @@ class DetoxLogger {
    * @returns {DetoxLogger}
    */
   child(overrides) {
-    const merged = this._mergeContexts(this._context, overrides);
+    const merged = this._mergeContexts(this._context, sanitizeBunyanContext(overrides));
     return new DetoxLogger(this._sharedConfig, merged);
   }
 
@@ -116,7 +115,6 @@ class DetoxLogger {
     }
 
     _.merge(this.config, config);
-    this._sharedConfig.file = temporaryPath.for.jsonl();
     this._sharedConfig.bunyan.installDebugStream(this.config);
     this.overrideConsole();
   }
@@ -138,14 +136,23 @@ class DetoxLogger {
    */
   _mergeContexts(...contexts) {
     const context = Object.assign({}, ...contexts);
+    const categories = _(contexts).flatMap((c) => {
+      if (c && c.cat) {
+        return _.isArray(c.cat) ? c.cat : c.cat.split(',');
+      }
+
+      return [];
+    }).uniq().join(',');
 
     if (context.error || context.err) {
       context.error = DetoxError.format(context.error || context.err);
       delete context.err;
     }
 
-    if (Array.isArray(context.cat)) {
-      context.cat = context.cat.join(',');
+    if (categories) {
+      context.cat = categories;
+    } else {
+      delete context.cat;
     }
 
     if (context.__filename) {
@@ -153,15 +160,13 @@ class DetoxLogger {
     }
 
     context.ph = context.ph || 'i';
-    context.cat = context.cat || '';
-
     context.tid = this._sharedConfig.dispatcher.resolve(
       context.ph,
       context.cat,
       context.id || 0
     );
 
-    return sanitizeBunyanContext(context);
+    return context;
   }
 
   /**
@@ -182,6 +187,11 @@ class DetoxLogger {
   /** @private */
   _begin(level, ...args) {
     const { context, msg } = this._parseArgs({ ph: 'B' }, args);
+    this._beginInternal(level, context, msg);
+  }
+
+  /** @private */
+  _beginInternal(level, context, msg) {
     this._sharedConfig.messageStack.push(context.tid, msg);
     this._sharedConfig.bunyan.logger[level](context, ...msg);
   }
@@ -189,8 +199,14 @@ class DetoxLogger {
   /** @private */
   _end(level, ...args) {
     let { context, msg } = this._parseArgs({ ph: 'E' }, args);
+    this._endInternal(level, context, msg);
+  }
+
+  /** @private */
+  _endInternal(level, context, msg) {
+    const beginMsg = this._sharedConfig.messageStack.pop(context.tid);
     if (msg.length === 0) {
-      msg = this._sharedConfig.messageStack.pop(context.tid);
+      msg = beginMsg;
     }
 
     this._sharedConfig.bunyan.logger[level](context, ...msg);
@@ -221,14 +237,14 @@ class DetoxLogger {
     });
 
     let result;
-    this[level].begin(context, ...msg);
+    this._beginInternal(level, { ...context, ph: 'B' }, msg);
     try {
       result = typeof action === 'function'
         ? action()
         : action;
 
       if (!isPromise(result)) {
-        end(context);
+        end({ success: true });
       } else {
         result.then(
           () => end({ success: true }),
@@ -250,20 +266,13 @@ class DetoxLogger {
       : _.isObject(args[0])
         ? args[0]
         : undefined;
-    const msg = userContext !== undefined ? args.slice(1) : args;
 
-    if (userContext) {
-      delete userContext.pid;
-      delete userContext.tid;
-      delete userContext.ts;
-      delete userContext.time;
-      delete userContext.ph;
-    }
+    const msg = userContext !== undefined ? args.slice(1) : args;
 
     const context = this._mergeContexts(
       this._context,
       boundContext,
-      userContext,
+      sanitizeBunyanContext(userContext),
     );
 
     return { context, msg };
@@ -280,7 +289,7 @@ class DetoxLogger {
       : undefined;
 
     const cat = level === 'trace' || level === 'debug'
-      ? (value) => require('chalk').yellow((value || '').split(',', 1)[0])
+      ? (value) => require('chalk').yellow(`${value}`.split(',', 1)[0])
       : undefined;
 
     const event = level === 'trace' || level === 'debug'

package/src/logger/utils/BunyanLogger.js

@@ -27,8 +27,6 @@ class BunyanLogger {
    * @returns {this}
    */
   installDebugStream(config) {
-    const level = config.level || 'info';
-
     if (this._debugStream) {
       _.remove(this._bunyan['streams'], this._debugStream);
       // @ts-ignore
@@ -36,13 +34,17 @@ class BunyanLogger {
       this._debugStream = null;
     }
 
+    const streamOptions = { out: null, ...config.options };
+    /* istanbul ignore next */
+    if (!streamOptions.out) {
+      // This is a default if-else branch, used everywhere except for the unit tests.
+      streamOptions.out = new PassThrough().pipe(process.stderr);
+    }
+
     this._debugStream = {
       type: 'raw',
-      level,
-      stream: bds.default({
-        ...config.options,
-        out: new PassThrough().pipe(process.stderr),
-      }),
+      level: config.level,
+      stream: bds.default(streamOptions),
     };
 
     this._bunyan.addStream(this._debugStream);
@@ -54,7 +56,9 @@ class BunyanLogger {
    * @returns {this}
    */
   installFileStream(file) {
+    /* istanbul ignore next */
     if (this._fileStream) {
+      // This is an impossible condition, but we keep it here for the sake of completeness.
       throw new DetoxInternalError('Trying to install a second file stream inside already initialized Bunyan logger');
     }
 

package/src/logger/utils/CategoryThreadDispatcher.js

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

package/src/logger/utils/DetoxLogFinalizer.js

@@ -59,15 +59,17 @@ class DetoxLogFinalizer {
 
   finalizeSync() {
     const sessionId = this._session.id;
-    const rootDir = this._config.artifacts.rootDir;
-    const logsEnabled = this._areLogsEnabled();
+    const logs = globSync(temporary.for.jsonl(`${sessionId}.*`));
+    if (logs.length === 0) {
+      return;
+    }
 
+    const logsEnabled = this._areLogsEnabled();
+    const rootDir = logsEnabled ? this._config.artifacts.rootDir : '';
     if (logsEnabled) {
       fs.mkdirpSync(rootDir);
     }
 
-    const logs = globSync(temporary.for.jsonl(`${sessionId}.*`));
-
     for (const log of logs) {
       if (logsEnabled) {
         fs.moveSync(log, path.join(rootDir, path.basename(log)));
@@ -85,6 +87,10 @@ class DetoxLogFinalizer {
 
   /** @private */
   _areLogsEnabled() {
+    if (!this._config) {
+      return false;
+    }
+
     const { rootDir, plugins } = this._config.artifacts;
     if (!rootDir || !plugins) {
       return false;
@@ -107,7 +113,7 @@ class DetoxLogFinalizer {
       const result = {};
       streamUtils().uniteSessionLogs(logs)
         .on('end', () => resolve(result))
-        .on('error', (err) => reject(err))
+        .on('error', /* istanbul ignore next */ (err) => reject(err))
         .on('data', (event) => {
           const { ph, pid, tid, cat } = event;
           if (ph === 'B' || ph === 'i') {

package/src/logger/utils/sanitizeBunyanContext.js

@@ -6,6 +6,8 @@ const RESERVED_PROPERTIES = [
   'msg',
   'name',
   'pid',
+  'tid',
+  'ph',
   'time',
 ];
 
@@ -22,7 +24,7 @@ function escapeCallback(value, key) {
 }
 
 function sanitizeBunyanContext(context) {
-  return hasReservedProperties(context) ? _.mapKeys(context, escapeCallback) : context;
+  return context && hasReservedProperties(context) ? _.mapKeys(context, escapeCallback) : context;
 }
 
 module.exports = sanitizeBunyanContext;

package/src/logger/utils/tracerLegacy.js

@@ -1,45 +1,34 @@
 const methods = {
   startSection(logger) {
-    return (msg, args) => logger.trace.begin(args, msg);
+    return (msg, args) => {
+      if (args !== undefined) {
+        return logger.trace.begin(args, msg);
+      } else {
+        return logger.trace.begin(msg);
+      }
+    };
   },
 
   endSection(logger) {
-    return (msg, args) => logger.trace.end(args);
+    return (_msg, args) => {
+      if (args !== undefined) {
+        return logger.trace.end(args);
+      } else {
+        return logger.trace.end();
+      }
+    };
   },
 
   traceCall(logger) {
     return (name, action, args = {}) => logger.trace.complete(args, name, action);
   },
-
-  invocationCall(logger) {
-    return (sectionName, invocation, action) => {
-      return logger.trace.complete({
-        cat: 'ws-client,ws-client-invocation',
-        data: invocation,
-        stack: _getCallStackTrace(),
-      }, sectionName, action);
-    };
-  },
 };
 
-function _getCallStackTrace() {
-  return new Error().stack
-    .split('\n')
-    .slice(1) // Ignore Error message
-    .map(line => line
-      .replace(/^\s*at\s+/, '')
-      .replace(process.cwd(), '')
-    )
-    .filter(line => !line.includes('/detox/src')) // Ignore detox internal calls
-    .join('\n');
-}
-
 function installLegacyTracerInterface(logger, target) {
   target.traceCall = methods.traceCall(logger);
   target.trace = Object.freeze({
     startSection: methods.startSection(logger),
     endSection: methods.endSection(logger),
-    invocationCall: methods.invocationCall(logger),
   });
 
   return this;

package/src/utils/logger.js

@@ -1,4 +1,4 @@
 /**
  * @type {Detox.Logger}
  */
-module.exports = require('../..').log;
+module.exports = require('../../internals').log;

package/src/utils/traceInvocationCall.js

@@ -0,0 +1,21 @@
+function _getCallStackTrace() {
+  return new Error().stack
+    .split('\n')
+    .slice(1) // Ignore Error message
+    .map(line => line
+      .replace(/^\s*at\s+/, '')
+      .replace(process.cwd(), '')
+    )
+    .filter(line => !line.includes('/detox/src')) // Ignore detox internal calls
+    .join('\n');
+}
+
+function invocationCall(logger, sectionName, invocation, action) {
+  return logger.trace.complete({
+    cat: 'ws-client,ws-client-invocation',
+    data: invocation,
+    stack: _getCallStackTrace(),
+  }, sectionName, action);
+}
+
+module.exports = invocationCall;

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

@@ -1 +0,0 @@
-8c0da6d59d09fe12e65641c05b23baa3

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

@@ -1 +0,0 @@
-31332781d3002ae93a1eaec77474e9f55bc7e5c7

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

@@ -1 +0,0 @@
-dcdfc5160bc82d542532fabc0b278164e550b9df0fc3f7a5afe6beaff60701f5

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

@@ -1 +0,0 @@
-71f4200bf6199efed9fb74fb1cd92570ed90abbe4bdf7c37816571c49af0d0559fcb943eafac23fd3a4e4004b822bb2248e062185df77ea13110acc9b0a4c26d

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

@@ -1 +0,0 @@
-7335013c99da31006342449417fedf5a

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

@@ -1 +0,0 @@
-04ee086f0aed13fd42de03340cc5c1d8d8749f6d

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

@@ -1 +0,0 @@
-904c995d85c623ebe69096dba272c0e855d99b96c9997dfb2f4a2321b603356e

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

@@ -1 +0,0 @@
-fc2b80324b5b497e17a4e9adf5d7b06d003fca036559e7e61b39b8777e9238377e182f0959e54ee452053538fa1b17d65537158ed952b8b99e995d2fde590b0f

package/Detox-android/com/wix/detox/20.0.14-prerelease.0/detox-20.0.14-prerelease.0.aar.md5

@@ -1 +0,0 @@
-c58bcf2c4a81d085044d69b52af78a5a

package/Detox-android/com/wix/detox/20.0.14-prerelease.0/detox-20.0.14-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-d04a40498c30936d34cb2e8a41fea10936344a2f

package/Detox-android/com/wix/detox/20.0.14-prerelease.0/detox-20.0.14-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-4bd349ffd3768c46cd1bc7ce021607e38c08e8e7187a21d27b08aaf53dd52873

package/Detox-android/com/wix/detox/20.0.14-prerelease.0/detox-20.0.14-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-c5c0556c23c72736ecd14d2227fdb65ddd100c1f47f460a6d1c02ae0a23a1a2774deb598ac56e2b7e6624aa028a3db00c312666233ea730b6bc7ed4863b6ebbf

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

@@ -1 +0,0 @@
-8bd920eb4542d031002c33d93308f426

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

@@ -1 +0,0 @@
-914ef3c1658d24794b7b94393578d899b16c0ed0

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

@@ -1 +0,0 @@
-a9b0b7bda22739644dee243f227c20d956ea3294378f75dea8d0f3d0d861d559

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

@@ -1 +0,0 @@
-523b294c136c5be73335a2c75f3ebb8bce7aa79579810a7cd96cb28a69e000043dbf188b44e30b06ee5762fead96255c3efd272ab4d9a8691428510e055160d5

package/src/utils/trace.js

@@ -1,3 +0,0 @@
-const { trace, traceCall } = require('../..');
-
-module.exports = { trace, traceCall };