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

refactor

Browse source
This commit is contained in:
Simon Knott 2024-08-12 14:20:20 +02:00
parent 46432f35e8
commit 5638e95650
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/playwright/src/runner/loadUtils.ts
View file

@ -123,7 +123,6 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
const config = testRun.config; const config = testRun.config;
// Create root suite, where each child will be a project suite with cloned file suites inside it. // Create root suite, where each child will be a project suite with cloned file suites inside it.
const rootSuite = new Suite('', 'root'); const rootSuite = new Suite('', 'root');
const unfilteredProjectSuites = new Map<FullProjectInternal, Suite>();
const projectSuites = new Map<FullProjectInternal, Suite>(); const projectSuites = new Map<FullProjectInternal, Suite>();
const filteredProjectSuites = new Map<FullProjectInternal, Suite>(); const filteredProjectSuites = new Map<FullProjectInternal, Suite>();
@ -137,11 +136,10 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
// Filter file suites for all projects. // Filter file suites for all projects.
for (const [project, fileSuites] of testRun.projectSuites) { for (const [project, fileSuites] of testRun.projectSuites) {
unfilteredProjectSuites.set(project, createProjectSuite(project, fileSuites)); projectSuites.set(project, createProjectSuite(project, fileSuites));
const filteredFileSuites = additionalFileMatcher ? fileSuites.filter(fileSuite => additionalFileMatcher(fileSuite.location!.file)) : fileSuites; const filteredFileSuites = additionalFileMatcher ? fileSuites.filter(fileSuite => additionalFileMatcher(fileSuite.location!.file)) : fileSuites;
const projectSuite = createProjectSuite(project, filteredFileSuites); const filteredProjectSuite = filterProjectSuite(createProjectSuite(project, filteredFileSuites), { cliFileFilters, cliTitleMatcher, testIdMatcher: config.testIdMatcher });
projectSuites.set(project, projectSuite);
const filteredProjectSuite = filterProjectSuite(projectSuite, { cliFileFilters, cliTitleMatcher, testIdMatcher: config.testIdMatcher });
filteredProjectSuites.set(project, filteredProjectSuite); filteredProjectSuites.set(project, filteredProjectSuite);
} }
} }
@ -204,7 +202,7 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
// Clone file suites for dependency projects. // Clone file suites for dependency projects.
for (const [project, level] of projectClosure.entries()) { for (const [project, level] of projectClosure.entries()) {
if (level === 'dependency') if (level === 'dependency')
rootSuite._prependSuite(buildProjectSuite(project, unfilteredProjectSuites.get(project)!)); rootSuite._prependSuite(buildProjectSuite(project, projectSuites.get(project)!));
} }
} }