diff --git a/CHANGELOG.md b/CHANGELOG.md index f7877f54c223..eaee24dc0baa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Fixes - `[expect]` Fix `objectContaining` to work recursively into sub-objects ([#10508](https://github.com/facebook/jest/pull/10508)) +- `[jest-message-util]` Update to work properly with Node 15 ([#10660](https://github.com/facebook/jest/pull/10660)) - `[jest-mock]` Allow to mock methods in getters (TypeScript 3.9 export) ([#10156](https://github.com/facebook/jest/pull/10156)) ### Chore & Maintenance diff --git a/packages/jest-message-util/src/index.ts b/packages/jest-message-util/src/index.ts index ca48e129fd50..417b2904effb 100644 --- a/packages/jest-message-util/src/index.ts +++ b/packages/jest-message-util/src/index.ts @@ -25,7 +25,8 @@ const stackUtils = new StackUtils({cwd: 'something which does not exist'}); let nodeInternals: Array = []; try { - nodeInternals = StackUtils.nodeInternals(); + // https://github.com/tapjs/stack-utils/issues/54 + nodeInternals = StackUtils.nodeInternals().concat(/\s*\(node:/); } catch { // `StackUtils.nodeInternals()` fails in browsers. We don't need to remove // node internals in the browser though, so no issue. diff --git a/packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.js b/packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.js index d76989f98cff..46256731438a 100644 --- a/packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.js +++ b/packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.js @@ -141,11 +141,11 @@ it('provides stdout and stderr from the child processes', async () => { const stdout = worker.getStdout(); const stderr = worker.getStderr(); - forkInterface.stdout.end('Hello ', {encoding: 'utf8'}); - forkInterface.stderr.end('Jest ', {encoding: 'utf8'}); + forkInterface.stdout.end('Hello ', 'utf8'); + forkInterface.stderr.end('Jest ', 'utf8'); forkInterface.emit('exit', 1); - forkInterface.stdout.end('World!', {encoding: 'utf8'}); - forkInterface.stderr.end('Workers!', {encoding: 'utf8'}); + forkInterface.stdout.end('World!', 'utf8'); + forkInterface.stderr.end('Workers!', 'utf8'); forkInterface.emit('exit', 0); await expect(getStream(stdout)).resolves.toEqual('Hello World!'); diff --git a/packages/jest-worker/src/workers/__tests__/NodeThreadsWorker.test.js b/packages/jest-worker/src/workers/__tests__/NodeThreadsWorker.test.js index d8a1a30ca60a..c4de7434096d 100644 --- a/packages/jest-worker/src/workers/__tests__/NodeThreadsWorker.test.js +++ b/packages/jest-worker/src/workers/__tests__/NodeThreadsWorker.test.js @@ -150,11 +150,11 @@ it('provides stdout and stderr from the threads', async () => { const stdout = worker.getStdout(); const stderr = worker.getStderr(); - worker._worker.stdout.end('Hello ', {encoding: 'utf8'}); - worker._worker.stderr.end('Jest ', {encoding: 'utf8'}); + worker._worker.stdout.end('Hello ', 'utf8'); + worker._worker.stderr.end('Jest ', 'utf8'); worker._worker.emit('exit'); - worker._worker.stdout.end('World!', {encoding: 'utf8'}); - worker._worker.stderr.end('Workers!', {encoding: 'utf8'}); + worker._worker.stdout.end('World!', 'utf8'); + worker._worker.stderr.end('Workers!', 'utf8'); worker._worker.emit('exit', 0); await expect(getStream(stdout)).resolves.toEqual('Hello World!');