Migrate e2e tests to TypeScript

.eslintrc.js

@@ -71,7 +71,7 @@ module.exports = {
     },
     {
       files: [
-        'e2e/__tests__/**/*',
+        'e2e/__tests__/**/*.js',
         'packages/babel-jest/**/*.test.js',
         'packages/babel-plugin-jest-hoist/**/*.test.js',
         'packages/babel-preset-jest/**/*.test.js',

e2e/MockStdinWatchPlugin.js

@@ -24,4 +24,9 @@ class MockStdinWatchPlugin {
     });
   }
 }
+
+/**
+ * Watch plugins are not transpiled hence why we're leaving
+ * this file out of typescript migration
+ */
 module.exports = MockStdinWatchPlugin;

e2e/Utils.js → e2e/Utils.ts

@@ -4,23 +4,24 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
  */
 
-'use strict';
-
-import type {Path} from 'types/Config';
-
-import {sync as spawnSync} from 'execa';
 import fs from 'fs';
 import path from 'path';
+import {Config} from '@jest/types';
+
+import {sync as spawnSync, ExecaReturns} from 'execa';
 import {createDirectory} from 'jest-util';
 import rimraf from 'rimraf';
 
-export const run = (cmd: string, cwd?: Path) => {
+export type RunResult = ExecaReturns & {
+  status: number;
+  error: Error;
+};
+export const run = (cmd: string, cwd?: Config.Path): RunResult => {
   const args = cmd.split(/\s/).slice(1);
   const spawnOptions = {cwd, reject: false};
-  const result = spawnSync(cmd.split(/\s/)[0], args, spawnOptions);
+  const result = spawnSync(cmd.split(/\s/)[0], args, spawnOptions) as RunResult;
 
   // For compat with cross-spawn
   result.status = result.code;
@@ -39,7 +40,7 @@ export const run = (cmd: string, cwd?: Path) => {
   return result;
 };
 
-export const linkJestPackage = (packageName: string, cwd: Path) => {
+export const linkJestPackage = (packageName: string, cwd: Config.Path) => {
   const packagesDir = path.resolve(__dirname, '../packages');
   const packagePath = path.resolve(packagesDir, packageName);
   const destination = path.resolve(cwd, 'node_modules/', packageName);
@@ -50,8 +51,8 @@ export const linkJestPackage = (packageName: string, cwd: Path) => {
 
 export const makeTemplate = (
   str: string,
-): ((values?: Array<any>) => string) => (values: ?Array<any>) =>
-  str.replace(/\$(\d+)/g, (match, number) => {
+): ((values?: Array<any>) => string) => (values?: Array<any>) =>
+  str.replace(/\$(\d+)/g, (_match, number) => {
     if (!Array.isArray(values)) {
       throw new Error('Array of values must be passed to the template.');
     }
@@ -76,14 +77,13 @@ export const writeFiles = (
 ) => {
   createDirectory(directory);
   Object.keys(files).forEach(fileOrPath => {
-    const filePath = fileOrPath.split('/'); // ['tmp', 'a.js']
-    const filename = filePath.pop(); // filepath becomes dirPath (no filename)
+    const dirname = path.dirname(fileOrPath);
 
-    if (filePath.length) {
-      createDirectory(path.join.apply(path, [directory].concat(filePath)));
+    if (dirname !== '/') {
+      createDirectory(path.join(directory, dirname));
     }
     fs.writeFileSync(
-      path.resolve.apply(path, [directory].concat(filePath, [filename])),
+      path.resolve(directory, ...fileOrPath.split('/')),
       files[fileOrPath],
     );
   });
@@ -118,7 +118,7 @@ export const sortLines = (output: string) =>
     .join('\n');
 
 export const createEmptyPackage = (
-  directory: Path,
+  directory: Config.Path,
   packageJson?: {[keys: string]: any},
 ) => {
   const DEFAULT_PACKAGE_JSON = {
@@ -168,7 +168,7 @@ export const extractSummary = (stdout: string) => {
 const sortTests = (stdout: string) =>
   stdout
     .split('\n')
-    .reduce((tests, line, i) => {
+    .reduce((tests: Array<Array<string>>, line) => {
       if (['RUNS', 'PASS', 'FAIL'].includes(line.slice(0, 4))) {
         tests.push([line.trimRight()]);
       } else if (line) {
@@ -194,11 +194,11 @@ export const extractSortedSummary = (stdout: string) => {
 
 export const extractSummaries = (
   stdout: string,
-): Array<{rest: string, summary: string}> => {
+): Array<{rest: string; summary: string}> => {
   const regex = /Test Suites:.*\nTests.*\nSnapshots.*\nTime.*(\nRan all test suites)*.*\n*$/gm;
 
   let match = regex.exec(stdout);
-  const matches = [];
+  const matches: Array<RegExpExecArray> = [];
 
   while (match) {
     matches.push(match);

e2e/__tests__/asyncRegenerator.test.js → e2e/__tests__/asyncRegenerator.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import path from 'path';

e2e/__tests__/autoClearMocks.test.js → e2e/__tests__/autoClearMocks.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/autoResetMocks.test.js → e2e/__tests__/autoResetMocks.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/autoRestoreMocks.test.js → e2e/__tests__/autoRestoreMocks.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/babelPluginJestHoist.test.js → e2e/__tests__/babelPluginJestHoist.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import path from 'path';

e2e/__tests__/badSourceMap.test.js → e2e/__tests__/badSourceMap.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/beforeAllFiltered.js → e2e/__tests__/beforeAllFiltered.ts

@@ -3,12 +3,10 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
-import runJest from '../runJest';
 import {wrap} from 'jest-snapshot-serializer-raw';
+import runJest from '../runJest';
 
 describe('Correct BeforeAll run', () => {
   it('ensures the BeforeAll of ignored suite is not run', () => {

e2e/__tests__/beforeEachQueue.js → e2e/__tests__/beforeEachQueue.ts

@@ -3,12 +3,10 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
-import runJest from '../runJest';
 import {wrap} from 'jest-snapshot-serializer-raw';
+import runJest from '../runJest';
 
 describe('Correct beforeEach order', () => {
   it('ensures the correct order for beforeEach', () => {

e2e/__tests__/clearCache.test.js → e2e/__tests__/clearCache.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import fs from 'fs';

e2e/__tests__/cliHandlesExactFilenames.test.js → e2e/__tests__/cliHandlesExactFilenames.test.ts

@@ -3,15 +3,13 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import path from 'path';
-import {skipSuiteOnWindows} from '../../scripts/ConditionalTest';
+import {wrap} from 'jest-snapshot-serializer-raw';
+import {skipSuiteOnWindows} from '@jest/test-utils';
 import {cleanup, extractSummary, writeFiles} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 const DIR = path.resolve(__dirname, '../cli_accepts_exact_filenames');
 

e2e/__tests__/compareDomNodes.test.js → e2e/__tests__/compareDomNodes.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/config.test.js → e2e/__tests__/config.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/console.test.js → e2e/__tests__/console.test.ts

@@ -3,13 +3,11 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
+import {wrap} from 'jest-snapshot-serializer-raw';
 import {extractSummary} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 test('console printing', () => {
   const {stderr, status} = runJest('console');

e2e/__tests__/consoleAfterTeardown.test.js → e2e/__tests__/consoleAfterTeardown.test.ts

@@ -3,13 +3,11 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
+import {wrap} from 'jest-snapshot-serializer-raw';
 import {extractSummary} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 test('console printing', () => {
   const {stderr, status} = runJest('console-after-teardown');

e2e/__tests__/consoleLogOutputWhenRunInBand.test.js → e2e/__tests__/consoleLogOutputWhenRunInBand.test.ts

@@ -3,14 +3,12 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import path from 'path';
+import {wrap} from 'jest-snapshot-serializer-raw';
 import {cleanup, extractSummary, writeFiles} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 const DIR = path.resolve(__dirname, '../console-log-output-when-run-in-band');
 

e2e/__tests__/coverageRemapping.test.js → e2e/__tests__/coverageRemapping.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import {readFileSync} from 'fs';

e2e/__tests__/coverageReport.test.js → e2e/__tests__/coverageReport.test.ts

@@ -3,15 +3,13 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import fs from 'fs';
 import path from 'path';
+import {wrap} from 'jest-snapshot-serializer-raw';
 import {extractSummary} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 const DIR = path.resolve(__dirname, '../coverage-report');
 

e2e/__tests__/coverageThreshold.test.js → e2e/__tests__/coverageThreshold.test.ts

@@ -3,14 +3,12 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import path from 'path';
+import {wrap} from 'jest-snapshot-serializer-raw';
 import {cleanup, extractSummary, writeFiles} from '../Utils';
 import runJest from '../runJest';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 const DIR = path.resolve(__dirname, '../coverage-threshold');
 

e2e/__tests__/coverageTransformInstrumented.test.js → e2e/__tests__/coverageTransformInstrumented.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import {readFileSync} from 'fs';

e2e/__tests__/customMatcherStackTrace.test.js → e2e/__tests__/customMatcherStackTrace.test.ts

@@ -3,13 +3,11 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
+import {wrap} from 'jest-snapshot-serializer-raw';
 import runJest from '../runJest';
 import {extractSummary} from '../Utils';
-import {wrap} from 'jest-snapshot-serializer-raw';
 
 test('works with custom matchers', () => {
   const {stderr} = runJest('custom-matcher-stack-trace', ['sync.test.js']);

e2e/__tests__/customReporters.test.js → e2e/__tests__/customReporters.test.ts

@@ -3,15 +3,13 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
-import {cleanup, extractSummary, writeFiles} from '../Utils';
-import runJest from '../runJest';
 import os from 'os';
 import path from 'path';
 import {wrap} from 'jest-snapshot-serializer-raw';
+import runJest from '../runJest';
+import {cleanup, extractSummary, writeFiles} from '../Utils';
 
 const DIR = path.resolve(os.tmpdir(), 'custom-reporters-test-dir');
 

e2e/__tests__/customResolver.test.js → e2e/__tests__/customResolver.test.ts

@@ -3,8 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @flow
  */
 
 import runJest from '../runJest';

e2e/__tests__/debug.test.js → e2e/__tests__/debug.test.ts

@@ -3,7 +3,6 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- * @flow
  */
 
 import path from 'path';