Skip to content

Commit 9adc1f1

Browse files
committed
Fix fixture executor mode typing
1 parent 8b35751 commit 9adc1f1

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

tests/fixtures/browser-basic-src/cpsat_solver_structure_runner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type CpSatPackageApi = {
3232

3333
type SolverStructureMode = 'auto' | ExecutorFixtureMode;
3434

35-
export type CpSatSolverStructureResult = SharedCaseResult & {
35+
export type CpSatSolverStructureResult = SharedCaseResult<ExecutorFixtureMode> & {
3636
executor?: SolverStructureMode;
3737
publicMethods?: string[];
3838
solverStatus?: unknown;

tests/fixtures/browser-basic-src/shared_case.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,30 @@ export type SharedCaseMetadata = {
8181
tags?: string[];
8282
};
8383

84-
export type SharedCaseContext = {
85-
mode?: ExecutorFixtureMode;
84+
export type SharedCaseContext<Mode extends string = FixtureMode> = {
85+
mode?: Mode;
8686
workerProfile?: string;
8787
params?: Record<string, unknown>;
8888
threads?: number;
8989
};
9090

91-
export type SharedCase<Api, Result extends Record<string, unknown> = Record<string, unknown>> = SharedCaseMetadata & {
92-
run(api: Api, context: SharedCaseContext): Promise<Result>;
91+
export type SharedCase<
92+
Api,
93+
Result extends Record<string, unknown> = Record<string, unknown>,
94+
Mode extends string = FixtureMode,
95+
> = SharedCaseMetadata & {
96+
run(api: Api, context: SharedCaseContext<Mode>): Promise<Result>;
9397
};
9498

95-
export type SharedCaseResult = SharedCaseMetadata & SharedCaseContext & {
99+
export type SharedCaseResult<Mode extends string = FixtureMode> = SharedCaseMetadata & SharedCaseContext<Mode> & {
96100
ok: boolean;
97101
};
98102

99-
export function passedCase<Result extends Record<string, unknown>>(
103+
export function passedCase<Result extends Record<string, unknown>, Mode extends string = FixtureMode>(
100104
testCase: SharedCaseMetadata,
101-
context: SharedCaseContext,
105+
context: SharedCaseContext<Mode>,
102106
result: Result,
103-
): SharedCaseResult & Result {
107+
): SharedCaseResult<Mode> & Result {
104108
return {
105109
...result,
106110
id: testCase.id,

0 commit comments

Comments
 (0)