Skip to content

Commit f4d6a18

Browse files
authored
chore: update code to pass tests on Node 15 (#10660)
1 parent 9488714 commit f4d6a18

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
### Fixes
88

99
- `[expect]` Fix `objectContaining` to work recursively into sub-objects ([#10508](https://github.com/facebook/jest/pull/10508))
10+
- `[jest-message-util]` Update to work properly with Node 15 ([#10660](https://github.com/facebook/jest/pull/10660))
1011
- `[jest-mock]` Allow to mock methods in getters (TypeScript 3.9 export) ([#10156](https://github.com/facebook/jest/pull/10156))
1112

1213
### Chore & Maintenance

packages/jest-message-util/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ const stackUtils = new StackUtils({cwd: 'something which does not exist'});
2525
let nodeInternals: Array<RegExp> = [];
2626

2727
try {
28-
nodeInternals = StackUtils.nodeInternals();
28+
// https://github.com/tapjs/stack-utils/issues/54
29+
nodeInternals = StackUtils.nodeInternals().concat(/\s*\(node:/);
2930
} catch {
3031
// `StackUtils.nodeInternals()` fails in browsers. We don't need to remove
3132
// node internals in the browser though, so no issue.

packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ it('provides stdout and stderr from the child processes', async () => {
141141
const stdout = worker.getStdout();
142142
const stderr = worker.getStderr();
143143

144-
forkInterface.stdout.end('Hello ', {encoding: 'utf8'});
145-
forkInterface.stderr.end('Jest ', {encoding: 'utf8'});
144+
forkInterface.stdout.end('Hello ', 'utf8');
145+
forkInterface.stderr.end('Jest ', 'utf8');
146146
forkInterface.emit('exit', 1);
147-
forkInterface.stdout.end('World!', {encoding: 'utf8'});
148-
forkInterface.stderr.end('Workers!', {encoding: 'utf8'});
147+
forkInterface.stdout.end('World!', 'utf8');
148+
forkInterface.stderr.end('Workers!', 'utf8');
149149
forkInterface.emit('exit', 0);
150150

151151
await expect(getStream(stdout)).resolves.toEqual('Hello World!');

packages/jest-worker/src/workers/__tests__/NodeThreadsWorker.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ it('provides stdout and stderr from the threads', async () => {
150150
const stdout = worker.getStdout();
151151
const stderr = worker.getStderr();
152152

153-
worker._worker.stdout.end('Hello ', {encoding: 'utf8'});
154-
worker._worker.stderr.end('Jest ', {encoding: 'utf8'});
153+
worker._worker.stdout.end('Hello ', 'utf8');
154+
worker._worker.stderr.end('Jest ', 'utf8');
155155
worker._worker.emit('exit');
156-
worker._worker.stdout.end('World!', {encoding: 'utf8'});
157-
worker._worker.stderr.end('Workers!', {encoding: 'utf8'});
156+
worker._worker.stdout.end('World!', 'utf8');
157+
worker._worker.stderr.end('Workers!', 'utf8');
158158
worker._worker.emit('exit', 0);
159159

160160
await expect(getStream(stdout)).resolves.toEqual('Hello World!');

0 commit comments

Comments
 (0)