Skip to content

Migrate e2e tests to TypeScript #7990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimenB merged 21 commits into from
Feb 26, 2019
Merged

Migrate e2e tests to TypeScript #7990

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
049de0b
Rename test files from js to ts
Feb 25, 2019
aa2e4d5
Lint test files
Feb 25, 2019
5346d00
Update snapshots
Feb 26, 2019
0aac8b4
Add in snapshot for emptyDescribeWithHooks
Feb 26, 2019
51d1673
Migrate Utils.js
Feb 26, 2019
c96d455
Migrate runJest
Feb 26, 2019
a034827
Better type runJest
Feb 26, 2019
85b6196
Add some comments about watch plugin
Feb 26, 2019
9f566c5
Make code simpler
Feb 26, 2019
6d3ff78
Add a comment regarding why mockwatchplugin isnt migrated over to typ…
Feb 26, 2019
151f7f2
Update jest-config to ignore iterator-to-null-test for now
Feb 26, 2019
1384aef
tweaks
SimenB Feb 26, 2019
38a8529
Merge branch 'master' into migrate/e2e-tests
SimenB Feb 26, 2019
ec02d6a
remove flow annotation
SimenB Feb 26, 2019
644f5d4
move conditional test to a package
SimenB Feb 26, 2019
4bc74f7
moar
SimenB Feb 26, 2019
49623c3
fine
SimenB Feb 26, 2019
fa0893d
hah
SimenB Feb 26, 2019
3d8dc7a
dep
SimenB Feb 26, 2019
c6dce70
multiple return types from runJest
SimenB Feb 26, 2019
2ffbbeb
remove type casts
SimenB Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Migrate Utils.js
  • Loading branch information
Alcedo Nathaniel De Guzman Jr committed Feb 26, 2019
commit 51d16736d04c5931ee50a65ab71128044f170c3d
32 changes: 17 additions & 15 deletions e2e/Utils.js → e2e/Utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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.');
}
Expand Down Expand Up @@ -83,6 +84,7 @@ export const writeFiles = (
createDirectory(path.join.apply(path, [directory].concat(filePath)));
}
fs.writeFileSync(
// @ts-ignore
Copy link
Member

@SimenB SimenB Feb 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the ignore? The code looks really convoluted (I guess it's from a time before rest params), could we do

path.resolve(directory, ...filePath, filename),

?

Same above, just do path.join(directory, ...filePath)

Copy link
Author

@natealcedo natealcedo Feb 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh the issue here was that filename is can possibly undefined from the pop call. It doesnt fit the type expected by path.resolve

Copy link
Author

@natealcedo natealcedo Feb 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've pushed up some changes to make the code simpler regarding your comments. I'll just continue tomorrow. It's midnight where I'm at. Happy coding :)

path.resolve.apply(path, [directory].concat(filePath, [filename])),
files[fileOrPath],
);
Expand Down Expand Up @@ -118,7 +120,7 @@ export const sortLines = (output: string) =>
.join('\n');

export const createEmptyPackage = (
directory: Path,
directory: Config.Path,
packageJson?: {[keys: string]: any},
) => {
const DEFAULT_PACKAGE_JSON = {
Expand Down Expand Up @@ -168,7 +170,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) {
Expand All @@ -194,11 +196,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);
Expand Down