From c3f95dac0e97d1445f468913c85f810058106d03 Mon Sep 17 00:00:00 2001 From: M4rk9696 Date: Thu, 22 Aug 2019 19:18:19 +0530 Subject: [PATCH] Revert "Add util to create empty test result" This reverts commit b444350ffcbf0b5a69570a208bf8982eb2034832. --- .../transform-testrunner/test-runner.ts | 19 +++++++--- .../jestAdapterInit.ts | 19 ++++++++-- packages/jest-jasmine2/src/reporter.ts | 6 ++-- packages/jest-util/src/emptyTestResult.ts | 35 ------------------- packages/jest-util/src/index.ts | 2 -- 5 files changed, 35 insertions(+), 46 deletions(-) delete mode 100644 packages/jest-util/src/emptyTestResult.ts diff --git a/e2e/transform/transform-testrunner/test-runner.ts b/e2e/transform/transform-testrunner/test-runner.ts index 59a0b864ba8c..cf51aa5454dc 100644 --- a/e2e/transform/transform-testrunner/test-runner.ts +++ b/e2e/transform/transform-testrunner/test-runner.ts @@ -4,11 +4,10 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -import {JestEnvironment} from '@jest/environment'; -import {TestResult} from '@jest/test-result'; import {Config} from '@jest/types'; +import {JestEnvironment} from '@jest/environment'; import Runtime from 'jest-runtime'; -import {emptyTestResult} from 'jest-util'; +import {TestResult} from '@jest/test-result'; export default async function testRunner( globalConfig: Config.GlobalConfig, @@ -18,8 +17,18 @@ export default async function testRunner( testPath: string ): Promise { return { - ...emptyTestResult(), + numFailingTests: 0, numPassingTests: 1, + numPendingTests: 0, + numTodoTests: 0, + snapshot: { + added: 0, + fileDeleted: false, + matched: 0, + unchecked: 0, + unmatched: 0, + updated: 0, + }, testFilePath: testPath, testResults: [ { @@ -31,5 +40,5 @@ export default async function testRunner( title: 'sample test', }, ], - }; + } as TestResult; } diff --git a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts index d56408186d3f..2380e616dd68 100644 --- a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts +++ b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts @@ -16,7 +16,6 @@ import { addSerializer, buildSnapshotResolver, } from 'jest-snapshot'; -import {emptyTestResult} from 'jest-util'; import throat from 'throat'; import { ROOT_DESCRIBE_BLOCK_NAME, @@ -216,14 +215,30 @@ export const runAndTransformResultsToJestFormat = async ({ dispatch({name: 'teardown'}); return { - ...emptyTestResult(), console: undefined, displayName: config.displayName, failureMessage, + leaks: false, // That's legacy code, just adding it so Flow is happy. numFailingTests, numPassingTests, numPendingTests, numTodoTests, + openHandles: [], + perfStats: { + // populated outside + end: 0, + start: 0, + }, + skipped: false, + snapshot: { + added: 0, + fileDeleted: false, + matched: 0, + unchecked: 0, + uncheckedKeys: [], + unmatched: 0, + updated: 0, + }, sourceMaps: {}, testExecError, testFilePath: testPath, diff --git a/packages/jest-jasmine2/src/reporter.ts b/packages/jest-jasmine2/src/reporter.ts index eeee0b71185e..7354a8b42208 100644 --- a/packages/jest-jasmine2/src/reporter.ts +++ b/packages/jest-jasmine2/src/reporter.ts @@ -8,7 +8,6 @@ import {Config} from '@jest/types'; import {AssertionResult, TestResult} from '@jest/test-result'; import {formatResultsErrors} from 'jest-message-util'; -import {emptyTestResult} from 'jest-util'; import {SpecResult} from './jasmine/Spec'; import {SuiteResult} from './jasmine/Suite'; import {Reporter, RunDetails} from './types'; @@ -79,7 +78,6 @@ export default class Jasmine2Reporter implements Reporter { }); const testResult = { - ...emptyTestResult(), console: null, failureMessage: formatResultsErrors( testResults, @@ -91,6 +89,10 @@ export default class Jasmine2Reporter implements Reporter { numPassingTests, numPendingTests, numTodoTests, + perfStats: { + end: 0, + start: 0, + }, snapshot: { added: 0, fileDeleted: false, diff --git a/packages/jest-util/src/emptyTestResult.ts b/packages/jest-util/src/emptyTestResult.ts deleted file mode 100644 index f77a315fc99a..000000000000 --- a/packages/jest-util/src/emptyTestResult.ts +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -import {TestResult} from '@jest/test-result'; - -export default function emptyTestResult(): TestResult { - return { - leaks: false, // That's legacy code, just adding it so Flow is happy. - numFailingTests: 0, - numPassingTests: 0, - numPendingTests: 0, - numTodoTests: 0, - openHandles: [], - perfStats: { - end: 0, - start: 0, - }, - skipped: false, - snapshot: { - added: 0, - fileDeleted: false, - matched: 0, - unchecked: 0, - uncheckedKeys: [], - unmatched: 0, - updated: 0, - }, - testFilePath: '', - testResults: [], - }; -} diff --git a/packages/jest-util/src/index.ts b/packages/jest-util/src/index.ts index b823341fe984..6f1f6cf92d19 100644 --- a/packages/jest-util/src/index.ts +++ b/packages/jest-util/src/index.ts @@ -31,7 +31,6 @@ import replacePathSepForGlob from './replacePathSepForGlob'; import testPathPatternToRegExp from './testPathPatternToRegExp'; import * as preRunMessage from './preRunMessage'; import pluralize from './pluralize'; -import emptyTestResult from './emptyTestResult'; export = { BufferedConsole, @@ -43,7 +42,6 @@ export = { convertDescriptorToString, createDirectory, deepCyclicCopy, - emptyTestResult, formatTestResults, getCallsite, getConsoleOutput,