Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

webServer type in the reporter

Browse source
This commit is contained in:
Yury Semikhatsky 2024-04-02 12:37:27 -07:00
parent 5e547e389e
commit 51c3dafa8f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/playwright/src/common/config.ts
View file

@ -17,13 +17,13 @@
import fs from 'fs';
import path from 'path';
import os from 'os';
import type { Config, Fixtures, Project, ReporterDescription } from '../../types/test';
import type { Config, ConfigInWorker, Fixtures, Project, ReporterDescription } from '../../types/test';
import type { Location } from '../../types/testReporter';
import type { TestRunnerPluginRegistration } from '../plugins';
import { getPackageJsonPath, mergeObjects } from '../util';
import type { Matcher } from '../util';
import type { ConfigCLIOverrides } from './ipc';
import type { ConfigInWorker, ProjectInWorker } from '../../types/test';
import type { FullConfig, FullProject } from '../../types/testReporter';
import { setTransformConfig } from '../transform/transform';
export type ConfigLocation = {
@ -40,13 +40,13 @@ export type Annotation = { type: string, description?: string };
export const defaultTimeout = 30000;
export class FullConfigInternal {
readonly config: ConfigInWorker;
readonly config: FullConfig;
readonly globalOutputDir: string;
readonly configDir: string;
readonly configCLIOverrides: ConfigCLIOverrides;
readonly ignoreSnapshots: boolean;
readonly preserveOutputDir: boolean;
readonly webServers: Exclude<ConfigInWorker['webServer'], null>[];
readonly webServers: NonNullable<ConfigInWorker['webServer']>[];
readonly plugins: TestRunnerPluginRegistration[];
readonly projects: FullProjectInternal[] = [];
cliArgs: string[] = [];
@ -123,7 +123,7 @@ export class FullConfigInternal {
this.config.webServer = null;
this.webServers = webServers;
} else if (webServers) { // legacy singleton mode
this.config.webServer = webServers;
this.config.webServer = webServers as NonNullable<ConfigInWorker['webServer']>;
this.webServers = [webServers];
} else {
this.webServers = [];
@ -158,7 +158,7 @@ export class FullConfigInternal {
}
export class FullProjectInternal {
readonly project: ProjectInWorker;
readonly project: FullProject;
readonly fullConfig: FullConfigInternal;
readonly fullyParallel: boolean;
readonly expect: Project['expect'];
@ -286,6 +286,6 @@ export const defaultReporter = process.env.CI ? 'dot' : 'list';
const configInternalSymbol = Symbol('configInternalSymbol');
export function getProjectId(project: ProjectInWorker): string {
export function getProjectId(project: FullProject): string {
return (project as any).__projectId!;
}

4
packages/playwright/types/testReporter.d.ts vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription } from './test';
import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, ConfigInWorker } from './test';
export type { TestStatus } from './test';
type UseOptions<TestArgs, WorkerArgs> = Partial<WorkerArgs> & Partial<TestArgs>;
@ -101,7 +101,7 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
/**
* See [testConfig.webServer](https://playwright.dev/docs/api/class-testconfig#test-config-web-server).
*/
webServer: TestConfigWebServer | null;
webServer: NonNullable<ConfigInWorker['webServer']>|null;
/**
* Path to the configuration file (if any) used to run the tests.
*/

4
utils/generate_types/overrides-testReporter.d.ts vendored
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription } from './test';
import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, ConfigInWorker } from './test';
export type { TestStatus } from './test';
type UseOptions<TestArgs, WorkerArgs> = Partial<WorkerArgs> & Partial<TestArgs>;
@ -42,7 +42,7 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
shard: { total: number, current: number } | null;
updateSnapshots: 'all' | 'none' | 'missing';
workers: number;
webServer: TestConfigWebServer | null;
webServer: NonNullable<ConfigInWorker['webServer']>|null;
configFile?: string;
}
// [internal] !!! DO NOT ADD TO THIS !!! See prior note.