Skip to content
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

Jump to bottom

Refactor CLI #3862

Merged
merged 1 commit into from
Jun 20, 2017
Merged

Refactor CLI #3862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions integration_tests/__tests__/__snapshots__/showConfig-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ exports[`jest --showConfig outputs config info and exits 1`] = `
"mapCoverage": false,
"noStackTrace": false,
"notify": false,
"projects": [
"/mocked/root/path/jest/integration_tests/verbose_reporter"
],
Copy link
Member

Choose a reason for hiding this comment

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

Why are we removing this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was an intermediate process.cwd() value that was attached to a config in the process of parsing other configs. I change the code to pass it directly

"rootDir": "/mocked/root/path/jest/integration_tests/verbose_reporter",
"testPathPattern": "",
"testResultsProcessor": null,
Expand Down
27 changes: 19 additions & 8 deletions packages/jest-cli/src/SearchSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type Options = {|
withAncestor?: boolean,
|};

export type PathPattern = {|
export type TestSelectionConfig = {|
input?: string,
findRelatedTests?: boolean,
lastCommit?: boolean,
Expand Down Expand Up @@ -216,13 +216,24 @@ class SearchSource {
});
}

getTestPaths(pattern: PathPattern): Promise<SearchResult> {
if (pattern.onlyChanged) {
return this.findChangedTests({lastCommit: pattern.lastCommit});
} else if (pattern.findRelatedTests && pattern.paths) {
return Promise.resolve(this.findRelatedTestsFromPattern(pattern.paths));
} else if (pattern.testPathPattern != null) {
return Promise.resolve(this.findMatchingTests(pattern.testPathPattern));
getTestPaths(
testSelectionConfig: TestSelectionConfig,
): Promise<SearchResult> {
if (testSelectionConfig.onlyChanged) {
return this.findChangedTests({
lastCommit: testSelectionConfig.lastCommit,
});
} else if (
testSelectionConfig.findRelatedTests &&
testSelectionConfig.paths
) {
return Promise.resolve(
this.findRelatedTestsFromPattern(testSelectionConfig.paths),
);
} else if (testSelectionConfig.testPathPattern != null) {
return Promise.resolve(
this.findMatchingTests(testSelectionConfig.testPathPattern),
);
} else {
return Promise.resolve({tests: []});
}
Expand Down
125 changes: 12 additions & 113 deletions packages/jest-cli/src/TestRunner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ import type {
import type {GlobalConfig, ReporterConfig} from 'types/Config';
import type {Context} from 'types/Context';
import type {Reporter, Test} from 'types/TestRunner';
import type {PathPattern} from './SearchSource';
import type {TestSelectionConfig} from './SearchSource';

import {formatExecError} from 'jest-message-util';
import {
addResult,
buildFailureTestResult,
makeEmptyAggregatedTestResult,
} from './testResultHelpers';
import snapshot from 'jest-snapshot';
import pify from 'pify';
import throat from 'throat';
Expand All @@ -43,7 +48,7 @@ class CancelRun extends Error {

export type TestRunnerOptions = {|
maxWorkers: number,
pattern: PathPattern,
pattern: TestSelectionConfig,
startRun: () => *,
testNamePattern: string,
testPathPattern: string,
Expand Down Expand Up @@ -378,117 +383,11 @@ class TestRunner {
}

const createAggregatedResults = (numTotalTestSuites: number) => {
return {
numFailedTestSuites: 0,
numFailedTests: 0,
numPassedTestSuites: 0,
numPassedTests: 0,
numPendingTestSuites: 0,
numPendingTests: 0,
numRuntimeErrorTestSuites: 0,
numTotalTestSuites,
numTotalTests: 0,
snapshot: {
added: 0,
didUpdate: false, // is set only after the full run
failure: false,
filesAdded: 0,
// combines individual test results + results after full run
filesRemoved: 0,
filesUnmatched: 0,
filesUpdated: 0,
matched: 0,
total: 0,
unchecked: 0,
unmatched: 0,
updated: 0,
},
startTime: Date.now(),
success: false,
testResults: [],
wasInterrupted: false,
};
};

const addResult = (
aggregatedResults: AggregatedResult,
testResult: TestResult,
): void => {
aggregatedResults.testResults.push(testResult);
aggregatedResults.numTotalTests +=
testResult.numPassingTests +
testResult.numFailingTests +
testResult.numPendingTests;
aggregatedResults.numFailedTests += testResult.numFailingTests;
aggregatedResults.numPassedTests += testResult.numPassingTests;
aggregatedResults.numPendingTests += testResult.numPendingTests;

if (testResult.testExecError) {
aggregatedResults.numRuntimeErrorTestSuites++;
}

if (testResult.skipped) {
aggregatedResults.numPendingTestSuites++;
} else if (testResult.numFailingTests > 0 || testResult.testExecError) {
aggregatedResults.numFailedTestSuites++;
} else {
aggregatedResults.numPassedTestSuites++;
}

// Snapshot data
if (testResult.snapshot.added) {
aggregatedResults.snapshot.filesAdded++;
}
if (testResult.snapshot.fileDeleted) {
aggregatedResults.snapshot.filesRemoved++;
}
if (testResult.snapshot.unmatched) {
aggregatedResults.snapshot.filesUnmatched++;
}
if (testResult.snapshot.updated) {
aggregatedResults.snapshot.filesUpdated++;
}

aggregatedResults.snapshot.added += testResult.snapshot.added;
aggregatedResults.snapshot.matched += testResult.snapshot.matched;
aggregatedResults.snapshot.unchecked += testResult.snapshot.unchecked;
aggregatedResults.snapshot.unmatched += testResult.snapshot.unmatched;
aggregatedResults.snapshot.updated += testResult.snapshot.updated;
aggregatedResults.snapshot.total +=
testResult.snapshot.added +
testResult.snapshot.matched +
testResult.snapshot.unmatched +
testResult.snapshot.updated;
};

const buildFailureTestResult = (
testPath: string,
err: TestError,
): TestResult => {
return {
console: null,
failureMessage: null,
numFailingTests: 0,
numPassingTests: 0,
numPendingTests: 0,
perfStats: {
end: 0,
start: 0,
},
skipped: false,
snapshot: {
added: 0,
fileDeleted: false,
matched: 0,
unchecked: 0,
unmatched: 0,
updated: 0,
},
sourceMaps: {},
testExecError: err,
testFilePath: testPath,
testResults: [],
};
const result = makeEmptyAggregatedTestResult();
result.numTotalTestSuites = numTotalTestSuites;
result.startTime = Date.now();
result.success = false;
return result;
};

const getEstimatedTime = (timings, workers) => {
Expand Down
Loading