chore: Move CHANGELOG entry and upgrade e2e dependency and missed items

in rebase
jestjs · Nov 15, 2020 · a71ce84 · a71ce84
1 parent bd228b6
commit a71ce84
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - `[jest-config]` [**BREAKING**] Default to Node testing environment instead of browser (JSDOM) ([#9874](https://github.com/facebook/jest/pull/9874))
 - `[jest-runner]` [**BREAKING**] set exit code to 1 if test logs after teardown ([#10728](https://github.com/facebook/jest/pull/10728))
+- `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823))
 
 ### Fixes
 
@@ -547,7 +548,6 @@
 - `[@jest/test-result]` Create method to create empty `TestResult` ([#8867](https://github.com/facebook/jest/pull/8867))
 - `[jest-worker]` [**BREAKING**] Return a promise from `end()`, resolving with the information whether workers exited gracefully ([#8206](https://github.com/facebook/jest/pull/8206))
 - `[jest-reporters]` Transform file paths into hyperlinks ([#8980](https://github.com/facebook/jest/pull/8980))
-- `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823))
 
 ### Fixes
 

diff --git a/e2e/transform/transform-runner/package.json b/e2e/transform/transform-runner/package.json
@@ -6,6 +6,6 @@
   "dependencies": {
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-typescript": "^7.0.0",
-    "jest-environment-node": "^24.9.0"
+    "jest-environment-node": "^26.6.2"
   }
 }
diff --git a/e2e/transform/transform-runner/runner.ts b/e2e/transform/transform-runner/runner.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import throat from 'throat';
+import {TestResult, createEmptyTestResult} from '@jest/test-result';
 import {Config} from '@jest/types';
 import {
   OnTestFailure,
@@ -14,8 +16,6 @@ import {
   TestRunnerContext,
   TestWatcher,
 } from 'jest-runner';
-import throat from 'throat';
-import {TestResult, createEmptyTestResult} from '@jest/test-result';
 
 export default class BaseTestRunner {
   private _globalConfig: Config.GlobalConfig;
@@ -31,7 +31,7 @@ export default class BaseTestRunner {
     watcher: TestWatcher,
     onStart: OnTestStart,
     onResult: OnTestSuccess,
-    onFailure: OnTestFailure
+    onFailure: OnTestFailure,
   ): Promise<void> {
     const mutex = throat(1);
     return tests.reduce(
@@ -58,12 +58,12 @@ export default class BaseTestRunner {
                     },
                   ],
                 };
-              }
+              },
             )
             .then(result => onResult(test, result))
-            .catch(err => onFailure(test, err))
+            .catch(err => onFailure(test, err)),
         ),
-      Promise.resolve()
+      Promise.resolve(),
     );
   }
 }
diff --git a/packages/jest-core/src/TestScheduler.ts b/packages/jest-core/src/TestScheduler.ts
@@ -196,7 +196,7 @@ export default class TestScheduler {
       if (!testRunners[config.runner]) {
         const transformer = new ScriptTransformer(config);
         const Runner: typeof TestRunner = interopRequireDefault(
-          transformer.requireAndTranspileModule(config.runner)
+          transformer.requireAndTranspileModule(config.runner),
         ).default;
         const runner = new Runner(this._globalConfig, {
           changedFiles: this._context?.changedFiles,

diff --git a/packages/jest-core/src/__tests__/TestScheduler.test.js b/packages/jest-core/src/__tests__/TestScheduler.test.js
@@ -91,7 +91,7 @@ test('schedule tests run in parallel per default', async () => {
         moduleFileExtensions: ['.js'],
         runner: 'jest-runner-parallel',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },
@@ -114,7 +114,7 @@ test('schedule tests run in serial if the runner flags them', async () => {
         moduleFileExtensions: ['.js'],
         runner: 'jest-runner-serial',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },
@@ -138,7 +138,7 @@ test('should bail after `n` failures', async () => {
         rootDir: './',
         runner: 'jest-runner-serial',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },
@@ -170,7 +170,7 @@ test('should not bail if less than `n` failures', async () => {
         rootDir: './',
         runner: 'jest-runner-serial',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },
@@ -201,7 +201,7 @@ test('should set runInBand to run in serial', async () => {
         moduleFileExtensions: ['.js'],
         runner: 'jest-runner-parallel',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },
@@ -227,7 +227,7 @@ test('should set runInBand to not run in serial', async () => {
         moduleFileExtensions: ['.js'],
         runner: 'jest-runner-parallel',
         transform: [],
-      },
+      }),
       hasteFS: {
         matchFiles: jest.fn(() => []),
       },