Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 15 additions & 16 deletions packages/angular/build/src/builders/unit-test/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,21 @@ export async function normalizeOptions(
exclude: options.exclude,
filter,
runnerName: runner ?? 'vitest',
coverage: options.coverage
? {
exclude: options.coverageExclude,
include: options.coverageInclude,
reporters: normalizeReporterOption(options.coverageReporters),
thresholds: options.coverageThresholds,
// The schema generation tool doesn't support tuple types for items, but the schema validation
// does ensure that the array has exactly two numbers.
watermarks: options.coverageWatermarks as {
statements?: [number, number];
branches?: [number, number];
functions?: [number, number];
lines?: [number, number];
},
}
: undefined,
coverage: {
enabled: options.coverage,
exclude: options.coverageExclude,
include: options.coverageInclude,
reporters: normalizeReporterOption(options.coverageReporters),
thresholds: options.coverageThresholds,
// The schema generation tool doesn't support tuple types for items, but the schema validation
// does ensure that the array has exactly two numbers.
watermarks: options.coverageWatermarks as {
statements?: [number, number];
branches?: [number, number];
functions?: [number, number];
lines?: [number, number];
},
},
tsConfig,
buildProgress: progress,
reporters: normalizeReporterOption(options.reporters),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ export class KarmaExecutor implements TestExecutor {
poll: buildTargetOptions.poll,
preserveSymlinks: buildTargetOptions.preserveSymlinks,
browsers: unitTestOptions.browsers?.join(','),
codeCoverage: !!unitTestOptions.coverage,
codeCoverageExclude: unitTestOptions.coverage?.exclude,
codeCoverage: unitTestOptions.coverage.enabled,
codeCoverageExclude: unitTestOptions.coverage.exclude,
fileReplacements: buildTargetOptions.fileReplacements,
reporters: unitTestOptions.reporters?.map((reporter) => {
// Karma only supports string reporters.
Expand Down Expand Up @@ -123,7 +123,7 @@ export class KarmaExecutor implements TestExecutor {
}

// Add coverage options
if (unitTestOptions.coverage) {
if (unitTestOptions.coverage.enabled) {
const { thresholds, watermarks } = unitTestOptions.coverage;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const coverageReporter = ((options as any).coverageReporter ??= {});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,6 @@ async function generateCoverageOption(
coverage: NormalizedUnitTestBuilderOptions['coverage'],
projectName: string,
): Promise<VitestCoverageOption> {
if (!coverage) {
return {
enabled: false,
};
}

let defaultExcludes: string[] = [];
if (coverage.exclude) {
try {
Expand All @@ -257,7 +251,7 @@ async function generateCoverageOption(
}

return {
enabled: true,
enabled: coverage.enabled,
excludeAfterRemap: true,
include: coverage.include,
reportsDirectory: toPosixPath(path.join('coverage', projectName)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const VitestTestRunner: TestRunner = {
checker.check('jsdom');
}

if (options.coverage) {
if (options.coverage.enabled) {
checker.check('@vitest/coverage-v8');
}

Expand Down