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
6 changes: 2 additions & 4 deletions packages/angular/build/src/builders/unit-test/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { OutputHashing } from '../application/schema';
import { writeTestFiles } from '../karma/application_builder';
import { findTests, getTestEntrypoints } from '../karma/find-tests';
import { useKarmaBuilder } from './karma-bridge';
import { NormalizedUnitTestOptions, normalizeOptions } from './options';
import { NormalizedUnitTestOptions, injectTestingPolyfills, normalizeOptions } from './options';
import type { Schema as UnitTestOptions } from './schema';

export type { UnitTestOptions };
Expand Down Expand Up @@ -111,9 +111,7 @@ export async function* execute(
await context.getBuilderNameForTarget(normalizedOptions.buildTarget),
)) as unknown as ApplicationBuilderInternalOptions;

if (buildTargetOptions.polyfills?.includes('zone.js')) {
buildTargetOptions.polyfills.push('zone.js/testing');
}
buildTargetOptions.polyfills = injectTestingPolyfills(buildTargetOptions.polyfills);

const outputPath = path.join(context.workspaceRoot, generateOutputPath());
const buildOptions: ApplicationBuilderInternalOptions = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
import type { ApplicationBuilderInternalOptions } from '../application/options';
import type { KarmaBuilderOptions } from '../karma';
import type { NormalizedUnitTestOptions } from './options';
import { type NormalizedUnitTestOptions, injectTestingPolyfills } from './options';

export async function useKarmaBuilder(
context: BuilderContext,
Expand All @@ -26,6 +26,8 @@ export async function useKarmaBuilder(
await context.getBuilderNameForTarget(unitTestOptions.buildTarget),
)) as unknown as ApplicationBuilderInternalOptions;

buildTargetOptions.polyfills = injectTestingPolyfills(buildTargetOptions.polyfills);

const options: KarmaBuilderOptions = {
tsConfig: unitTestOptions.tsConfig,
polyfills: buildTargetOptions.polyfills,
Expand Down
4 changes: 4 additions & 0 deletions packages/angular/build/src/builders/unit-test/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,7 @@ export async function normalizeOptions(
providersFile: options.providersFile && path.join(workspaceRoot, options.providersFile),
};
}

export function injectTestingPolyfills(polyfills: string[] = []): string[] {
return polyfills.includes('zone.js') ? [...polyfills, 'zone.js/testing'] : polyfills;
}
Loading