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

chore(test-runner): make outputDir based on cwd instead of testDir (#9360)

Browse source
This commit is contained in:
Max Schmitt 2021-10-11 22:24:46 +02:00 committed by GitHub
parent 0450b20712
commit b1160ec239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/playwright-test/src/loader.ts
View file

@ -104,7 +104,7 @@ export class Loader {
this._fullConfig.webServer = takeFirst(this._configOverrides.webServer, this._config.webServer, baseFullConfig.webServer); this._fullConfig.webServer = takeFirst(this._configOverrides.webServer, this._config.webServer, baseFullConfig.webServer);
for (const project of projects) for (const project of projects)
this._addProject(project, this._fullConfig.rootDir); this._addProject(project, this._fullConfig.rootDir, rootDir);
this._fullConfig.projects = this._projects.map(p => p.config); this._fullConfig.projects = this._projects.map(p => p.config);
} }
@ -162,13 +162,13 @@ export class Loader {
}; };
} }
private _addProject(projectConfig: Project, rootDir: string) { private _addProject(projectConfig: Project, rootDir: string, configDir: string) {
let testDir = takeFirst(projectConfig.testDir, rootDir); let testDir = takeFirst(projectConfig.testDir, rootDir);
if (!path.isAbsolute(testDir)) if (!path.isAbsolute(testDir))
testDir = path.resolve(rootDir, testDir); testDir = path.resolve(configDir, testDir);
let outputDir = takeFirst(this._configOverrides.outputDir, projectConfig.outputDir, this._config.outputDir, path.resolve(process.cwd(), 'test-results')); let outputDir = takeFirst(this._configOverrides.outputDir, projectConfig.outputDir, this._config.outputDir, path.resolve(process.cwd(), 'test-results'));
if (!path.isAbsolute(outputDir)) if (!path.isAbsolute(outputDir))
outputDir = path.resolve(rootDir, outputDir); outputDir = path.resolve(configDir, outputDir);
const fullProject: FullProject = { const fullProject: FullProject = {
define: takeFirst(this._configOverrides.define, projectConfig.define, this._config.define, []), define: takeFirst(this._configOverrides.define, projectConfig.define, this._config.define, []),
expect: takeFirst(this._configOverrides.expect, projectConfig.expect, this._config.expect, undefined), expect: takeFirst(this._configOverrides.expect, projectConfig.expect, this._config.expect, undefined),

1
tests/playwright-test/test-output-dir.spec.ts
View file

@ -396,7 +396,6 @@ test('should accept a relative path for outputDir', async ({ runInlineTest }, te
}); });
test('should have output dir based on rootDir (cwd)', async ({ runInlineTest }, testInfo) => { test('should have output dir based on rootDir (cwd)', async ({ runInlineTest }, testInfo) => {
test.fixme(true, 'https://github.com/microsoft/playwright/issues/9380');
const result = await runInlineTest({ const result = await runInlineTest({
'playwright.config.js': ` 'playwright.config.js': `
const path = require('path'); const path = require('path');