detox 20.0.15-prerelease.0 → 20.1.0

package/src/realms/DetoxPrimaryContext.js

@@ -24,6 +24,7 @@ const _dirty = Symbol('dirty');
 const _emergencyTeardown = Symbol('emergencyTeardown');
 const _lifecycleLogger = Symbol('lifecycleLogger');
 const _sessionFile = Symbol('sessionFile');
+const _logFinalError = Symbol('logFinalError');
 //#endregion
 
 class DetoxPrimaryContext extends DetoxContext {
@@ -90,6 +91,7 @@ class DetoxPrimaryContext extends DetoxContext {
       data: this[$sessionState],
     }, getCurrentCommand());
 
+    // TODO: IPC Server creation ought to be delegated to a generator/factory.
     const IPCServer = require('../ipc/IPCServer');
     this[_ipcServer] = new IPCServer({
       sessionState: this[$sessionState],
@@ -109,6 +111,7 @@ class DetoxPrimaryContext extends DetoxContext {
       await this[_resetLockFile]();
     }
 
+    // TODO: Detox-server creation ought to be delegated to a generator/factory.
     const DetoxServer = require('../server/DetoxServer');
     if (sessionConfig.autoStart) {
       this[_wss] = new DetoxServer({
@@ -121,6 +124,7 @@ class DetoxPrimaryContext extends DetoxContext {
       await this[_wss].open();
     }
 
+    // TODO: double check that this config is indeed propogated onto the client create at the detox-worker side
     if (!sessionConfig.server && this[_wss]) {
       // @ts-ignore
       sessionConfig.server = `ws://localhost:${this[_wss].port}`;
@@ -131,7 +135,7 @@ class DetoxPrimaryContext extends DetoxContext {
     process.env.DETOX_CONFIG_SNAPSHOT_PATH = this[_sessionFile];
     this[_lifecycleLogger].trace(`Serialized the session state at: ${this[_sessionFile]}`);
 
-    if (opts.workerId !== null) {
+    if (opts.workerId != null) {
       await this[symbols.installWorker](opts);
     }
   }
@@ -178,9 +182,10 @@ class DetoxPrimaryContext extends DetoxContext {
       if (this[_dirty]) {
         try {
           this[_lifecycleLogger].trace.end();
+          await this[symbols.logger].close();
           await this[$logFinalizer].finalize();
         } catch (err) {
-          this[_lifecycleLogger].error({ err }, 'Encountered an error while merging the process logs:');
+          this[_logFinalError](err);
         }
       }
     }
@@ -210,12 +215,17 @@ class DetoxPrimaryContext extends DetoxContext {
 
     try {
       this[_lifecycleLogger].trace.end({ abortSignal: signal });
+      this[symbols.logger].close().catch(this[_logFinalError]);
       this[$logFinalizer].finalizeSync();
     } catch (err) {
-      this[symbols.logger].error({ err }, 'Encountered an error while merging the process logs:');
+      this[_logFinalError](err);
     }
   };
 
+  [_logFinalError] = (err) => {
+    this[_lifecycleLogger].error(err, 'Encountered an error while merging the process logs:');
+  };
+
   //#endregion
 
   //#region Protected members

package/src/realms/DetoxSecondaryContext.js

@@ -1,4 +1,4 @@
-const fs = require('fs');
+const fs = require('fs-extra');
 
 const { DetoxInternalError } = require('../errors');
 const SessionState = require('../ipc/SessionState');
@@ -43,7 +43,7 @@ class DetoxSecondaryContext extends DetoxContext {
 
     this[_ipcClient] = new IPCClient({
       id: `secondary-${process.pid}`,
-      state: this[$sessionState],
+      sessionState: this[$sessionState],
       logger: this[symbols.logger],
     });
 

package/src/utils/pathUtils.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+function toSimplePath(filePath, cwd = process.cwd()) {
+  const relativePath = path.relative(cwd, filePath);
+  const isOutsideCwd = relativePath.split(path.sep, 1)[0] === '..';
+  return isOutsideCwd ? filePath : relativePath;
+}
+
+module.exports = {
+  toSimplePath,
+};

package/src/utils/shellUtils.js

@@ -1,5 +1,6 @@
 const SPACE = ' ';
 const BACK_SLASH = '\\';
+const FORWARD_SLASH = '/';
 const SINGLE_QUOTE = "'";
 const DOUBLE_QUOTE = '"';
 
@@ -64,6 +65,14 @@ function autoEscapeCmd(str) {
   return escapeWithDoubleQuotedString(str);
 }
 
+function useForwardSlashesCMD(str) {
+  return str.split(BACK_SLASH).join(FORWARD_SLASH);
+}
+
+function useForwardSlashesShell(str) {
+  return str; // already POSIX, so no-op
+}
+
 const hasUnsafeChars = isRunningInCMDEXE()
   /* istanbul ignore next */ ? hasUnsafeCMDChars
   /* istanbul ignore next */ : hasUnsafeShellChars;
@@ -76,6 +85,10 @@ const escapeSpaces = isRunningInCMDEXE()
   /* istanbul ignore next */ ? escapeSpacesCMD
   /* istanbul ignore next */ : escapeSpacesShell;
 
+const usePosixSlashes = isRunningInCMDEXE()
+  /* istanbul ignore next */ ? useForwardSlashesCMD
+  /* istanbul ignore next */ : useForwardSlashesShell;
+
 module.exports = {
   escapeInDoubleQuotedString,
   escapeInDoubleQuotedRegexp,
@@ -94,4 +107,8 @@ module.exports = {
     cmd: autoEscapeCmd,
     shell: autoEscapeShell,
   }),
+  useForwardSlashes: Object.assign(usePosixSlashes, {
+    cmd: useForwardSlashesCMD,
+    shell: useForwardSlashesShell,
+  }),
 };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/android/detox/src/full/java/com/wix/detox/espresso/registry/IRStatusInquirer.kt

@@ -1,24 +0,0 @@
-package com.wix.detox.espresso.registry
-
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.IdlingResource
-import androidx.test.espresso.base.IdlingResourceRegistry
-import com.wix.detox.common.UIThread
-import org.joor.Reflect
-import java.util.concurrent.Callable
-
-class IRStatusInquirer(private val registry: IdlingResourceRegistry) {
-    fun getAllBusyResources(): List<IdlingResource> {
-        return UIThread.postFirstSync(Callable<List<IdlingResource>> {
-            registry.resources.filter { resource ->
-                !resource.isIdleNow
-            }
-        })
-    }
-
-    companion object {
-        val INSTANCE = IRStatusInquirer(getRegistryDefault())
-    }
-}
-
-private fun getRegistryDefault() = Reflect.on(Espresso::class.java).get<IdlingResourceRegistry>("baseRegistry")

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/DescriptiveIdlingResource.kt

@@ -1,10 +0,0 @@
-package com.wix.detox.reactnative.idlingresources
-
-import androidx.test.espresso.IdlingResource
-
-interface DescriptiveIdlingResource: IdlingResource {
-    /**
-     * Returns a descriptive representation of the resource.
-     */
-    fun getDescription(): IdlingResourceDescription
-}

package/local-cli/build.test.js

@@ -1,104 +0,0 @@
-const tempfile = require('tempfile');
-
-describe('build', () => {
-  let execSync, detox, callCli;
-
-  beforeEach(() => {
-    // @ts-ignore
-    callCli = global.callCli;
-    jest.mock('child_process');
-    execSync = require('child_process').execSync;
-
-    jest.mock('../src/utils/logger');
-    jest.mock('../internals', () => {
-      const DetoxConfigErrorComposer = require('../src/errors/DetoxConfigErrorComposer');
-
-      const config = {
-        apps: {},
-        artifacts: {},
-        behavior: {},
-        errorComposer: new DetoxConfigErrorComposer(),
-        device: {},
-        session: {}
-      };
-
-      return ({
-        config,
-        resolveConfig: jest.fn().mockResolvedValue(config),
-        log: require('../src/utils/logger')
-      });
-    });
-
-    detox = require('../internals');
-  });
-
-  it('passes argv to resolveConfig', async () => {
-    await callCli('./build', 'build -C /etc/.detoxrc.js -c myconf').catch(() => {});
-
-    expect(detox.resolveConfig).toHaveBeenCalledWith({
-      argv: expect.objectContaining({
-        'C': '/etc/.detoxrc.js',
-        'c': 'myconf',
-      }),
-    });
-  });
-
-  it('runs the build script from the composed device config', async () => {
-    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.apps.default = { build: 'yet another command', binaryPath: __filename };
-
-    await callCli('./build', 'build -i');
-    expect(execSync).not.toHaveBeenCalled();
-
-    await callCli('./build', 'build --if-missing');
-    expect(execSync).not.toHaveBeenCalled();
-
-    expect(detox.log.info).toHaveBeenCalledWith('Skipping build for "default" app...');
-  });
-
-  it('fails with an error if a build script has not been found', async () => {
-    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.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.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.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.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'));
-    expect(detox.log.info).toHaveBeenCalledWith(expect.stringContaining('app2'));
-  });
-
-  it('should not print that extra message when the app is single', async () => {
-    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/run-server.test.js

@@ -1,23 +0,0 @@
-// @ts-nocheck
-jest.mock('../src/utils/logger');
-
-describe('run-server', () => {
-  it('starts the server', async () => {
-    jest.mock('../src/server/DetoxServer');
-    const DetoxServer = require('../src/server/DetoxServer');
-    await callCli('./run-server', 'run-server');
-
-    expect(DetoxServer).toHaveBeenCalledWith(expect.objectContaining({ port: 8099 }));
-  });
-
-  it('throws if the port number is out of range', async () => {
-    jest.spyOn(process, 'exit'); // otherwise tests are aborted
-    jest.mock('../src/server/DetoxServer');
-    const DetoxServer = require('../src/server/DetoxServer');
-
-    await expect(callCli('./run-server', 'run-server -p PORT')).rejects.toThrowErrorMatchingSnapshot();
-    await expect(callCli('./run-server', 'run-server -p 0')).rejects.toThrowErrorMatchingSnapshot();
-    await expect(callCli('./run-server', 'run-server -p 100000')).rejects.toThrowErrorMatchingSnapshot();
-    expect(DetoxServer).not.toHaveBeenCalled();
-  });
-});