Skip to content

Commit a71ce84

Browse files
committed
chore: Move CHANGELOG entry and upgrade e2e dependency and missed items
in rebase
1 parent bd228b6 commit a71ce84

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- `[jest-config]` [**BREAKING**] Default to Node testing environment instead of browser (JSDOM) ([#9874](https://github.com/facebook/jest/pull/9874))
66
- `[jest-runner]` [**BREAKING**] set exit code to 1 if test logs after teardown ([#10728](https://github.com/facebook/jest/pull/10728))
7+
- `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823))
78

89
### Fixes
910

@@ -547,7 +548,6 @@
547548
- `[@jest/test-result]` Create method to create empty `TestResult` ([#8867](https://github.com/facebook/jest/pull/8867))
548549
- `[jest-worker]` [**BREAKING**] Return a promise from `end()`, resolving with the information whether workers exited gracefully ([#8206](https://github.com/facebook/jest/pull/8206))
549550
- `[jest-reporters]` Transform file paths into hyperlinks ([#8980](https://github.com/facebook/jest/pull/8980))
550-
- `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823))
551551

552552
### Fixes
553553

e2e/transform/transform-runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"dependencies": {
77
"@babel/preset-env": "^7.0.0",
88
"@babel/preset-typescript": "^7.0.0",
9-
"jest-environment-node": "^24.9.0"
9+
"jest-environment-node": "^26.6.2"
1010
}
1111
}

e2e/transform/transform-runner/runner.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
import throat from 'throat';
9+
import {TestResult, createEmptyTestResult} from '@jest/test-result';
810
import {Config} from '@jest/types';
911
import {
1012
OnTestFailure,
@@ -14,8 +16,6 @@ import {
1416
TestRunnerContext,
1517
TestWatcher,
1618
} from 'jest-runner';
17-
import throat from 'throat';
18-
import {TestResult, createEmptyTestResult} from '@jest/test-result';
1919

2020
export default class BaseTestRunner {
2121
private _globalConfig: Config.GlobalConfig;
@@ -31,7 +31,7 @@ export default class BaseTestRunner {
3131
watcher: TestWatcher,
3232
onStart: OnTestStart,
3333
onResult: OnTestSuccess,
34-
onFailure: OnTestFailure
34+
onFailure: OnTestFailure,
3535
): Promise<void> {
3636
const mutex = throat(1);
3737
return tests.reduce(
@@ -58,12 +58,12 @@ export default class BaseTestRunner {
5858
},
5959
],
6060
};
61-
}
61+
},
6262
)
6363
.then(result => onResult(test, result))
64-
.catch(err => onFailure(test, err))
64+
.catch(err => onFailure(test, err)),
6565
),
66-
Promise.resolve()
66+
Promise.resolve(),
6767
);
6868
}
6969
}

packages/jest-core/src/TestScheduler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export default class TestScheduler {
196196
if (!testRunners[config.runner]) {
197197
const transformer = new ScriptTransformer(config);
198198
const Runner: typeof TestRunner = interopRequireDefault(
199-
transformer.requireAndTranspileModule(config.runner)
199+
transformer.requireAndTranspileModule(config.runner),
200200
).default;
201201
const runner = new Runner(this._globalConfig, {
202202
changedFiles: this._context?.changedFiles,

packages/jest-core/src/__tests__/TestScheduler.test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ test('schedule tests run in parallel per default', async () => {
9191
moduleFileExtensions: ['.js'],
9292
runner: 'jest-runner-parallel',
9393
transform: [],
94-
},
94+
}),
9595
hasteFS: {
9696
matchFiles: jest.fn(() => []),
9797
},
@@ -114,7 +114,7 @@ test('schedule tests run in serial if the runner flags them', async () => {
114114
moduleFileExtensions: ['.js'],
115115
runner: 'jest-runner-serial',
116116
transform: [],
117-
},
117+
}),
118118
hasteFS: {
119119
matchFiles: jest.fn(() => []),
120120
},
@@ -138,7 +138,7 @@ test('should bail after `n` failures', async () => {
138138
rootDir: './',
139139
runner: 'jest-runner-serial',
140140
transform: [],
141-
},
141+
}),
142142
hasteFS: {
143143
matchFiles: jest.fn(() => []),
144144
},
@@ -170,7 +170,7 @@ test('should not bail if less than `n` failures', async () => {
170170
rootDir: './',
171171
runner: 'jest-runner-serial',
172172
transform: [],
173-
},
173+
}),
174174
hasteFS: {
175175
matchFiles: jest.fn(() => []),
176176
},
@@ -201,7 +201,7 @@ test('should set runInBand to run in serial', async () => {
201201
moduleFileExtensions: ['.js'],
202202
runner: 'jest-runner-parallel',
203203
transform: [],
204-
},
204+
}),
205205
hasteFS: {
206206
matchFiles: jest.fn(() => []),
207207
},
@@ -227,7 +227,7 @@ test('should set runInBand to not run in serial', async () => {
227227
moduleFileExtensions: ['.js'],
228228
runner: 'jest-runner-parallel',
229229
transform: [],
230-
},
230+
}),
231231
hasteFS: {
232232
matchFiles: jest.fn(() => []),
233233
},

0 commit comments

Comments
 (0)