Skip to content
Open
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
2 changes: 1 addition & 1 deletion packages/angular/build/src/builders/unit-test/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export async function normalizeOptions(
watch,
debug: options.debug ?? false,
ui: process.env['CI'] ? false : ui,
isolate: isolate ?? false,
isolate,
quiet: options.quiet ?? (process.env['CI'] ? false : true),
providersFile: options.providersFile && path.join(workspaceRoot, options.providersFile),
setupFiles: options.setupFiles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ interface VitestConfigPluginOptions {
include: string[];
optimizeDepsInclude: string[];
watch: boolean;
isolate: boolean;
isolate: boolean | undefined;
}

async function findTestEnvironment(
Expand Down Expand Up @@ -268,8 +268,8 @@ export async function createVitestConfigPlugin(
include,
// CLI provider browser options override, if present
...(browser ? { browser } : {}),
// Only override if the user explicitly enabled it via CLI
...(options.isolate ? { isolate: true } : {}),
// Only override if the user explicitly set it via CLI
...(options.isolate !== undefined ? { isolate: options.isolate } : {}),
// If the user has not specified an environment, use a smart default.
...(!testConfig?.environment
? { environment: await findTestEnvironment(projectResolver) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,59 @@ describeBuilder(execute, UNIT_TEST_BUILDER_INFO, (harness) => {
const { result } = await harness.executeOnce();
expect(result?.success).toBeTrue();
});

it('should override isolate from the Vitest config file when set to false', async () => {
harness.writeFile(
'vitest-base.config.ts',
`
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
fileParallelism: false,
isolate: true,
setupFiles: ['./src/setup.ts'],
},
});
`,
);

harness.writeFile(
'src/setup.ts',
`
const global = globalThis as typeof globalThis & { setupCount?: number };
global.setupCount = (global.setupCount ?? 0) + 1;
`,
);

harness.writeFile(
'src/app/first.spec.ts',
`
it('runs first', () => {
expect(true).toBe(true);
});
`,
);

harness.writeFile(
'src/app/second.spec.ts',
`
it('shares the test environment with the first spec file', () => {
const global = globalThis as typeof globalThis & { setupCount?: number };
expect(global.setupCount).toBeGreaterThan(1);
});
`,
);

harness.useTarget('test', {
...BASE_OPTIONS,
runner: 'vitest' as any,
runnerConfig: true,
isolate: false,
});

const { result } = await harness.executeOnce();
expect(result?.success).toBeTrue();
});
});
});
Loading