yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: write blob report to the config dir by default (#22697)

Browse Source
This commit is contained in:
Yury Semikhatsky 2023-04-27 17:25:29 -07:00 committed by GitHub
parent f08caea8f2
commit 16f664e22c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/playwright-test/src/reporters/blob.ts
View File

@ -23,7 +23,6 @@ import { yazl } from 'playwright-core/lib/zipBundle';
import { Readable } from 'stream'; import { Readable } from 'stream';
import type { FullConfig, FullResult, TestResult } from '../../types/testReporter'; import type { FullConfig, FullResult, TestResult } from '../../types/testReporter';
import type { Suite } from '../common/test'; import type { Suite } from '../common/test';
import { defaultReportFolder } from './html';
import { TeleReporterEmitter } from './teleEmitter'; import { TeleReporterEmitter } from './teleEmitter';
@ -83,7 +82,7 @@ export class BlobReporter extends TeleReporterEmitter {
} }
private _computeOutputFileName(config: FullConfig) { private _computeOutputFileName(config: FullConfig) {
const outputDir = this._resolveOutputDir(); const outputDir = path.resolve(this._options.configDir, this._options.outputDir || '');
let shardSuffix = ''; let shardSuffix = '';
if (config.shard) { if (config.shard) {
const paddedNumber = `${config.shard.current}`.padStart(`${config.shard.total}`.length, '0'); const paddedNumber = `${config.shard.current}`.padStart(`${config.shard.total}`.length, '0');
@ -91,11 +90,4 @@ export class BlobReporter extends TeleReporterEmitter {
} }
return path.join(outputDir, `report${shardSuffix}.zip`); return path.join(outputDir, `report${shardSuffix}.zip`);
} }
private _resolveOutputDir(): string {
const { outputDir } = this._options;
if (outputDir)
return path.resolve(this._options.configDir, outputDir);
return defaultReportFolder(this._options.configDir);
}
} }

2
packages/playwright-test/src/reporters/html.ts
View File

@ -142,7 +142,7 @@ function reportFolderFromEnv(): string | undefined {
return undefined; return undefined;
} }
export function defaultReportFolder(searchForPackageJson: string): string { function defaultReportFolder(searchForPackageJson: string): string {
let basePath = getPackageJsonPath(searchForPackageJson); let basePath = getPackageJsonPath(searchForPackageJson);
if (basePath) if (basePath)
basePath = path.dirname(basePath); basePath = path.dirname(basePath);