Unverified Commit 7a34e5ea authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix playwright trace names (#30374)

parent 431178bf
...@@ -15,7 +15,6 @@ let page: Page ...@@ -15,7 +15,6 @@ let page: Page
let browser: Browser let browser: Browser
let context: BrowserContext let context: BrowserContext
let pageLogs: Array<{ source: string; message: string }> = [] let pageLogs: Array<{ source: string; message: string }> = []
let traceStarted = false
const tracePlaywright = process.env.TRACE_PLAYWRIGHT const tracePlaywright = process.env.TRACE_PLAYWRIGHT
...@@ -27,11 +26,10 @@ export async function quit() { ...@@ -27,11 +26,10 @@ export async function quit() {
} }
class Playwright extends BrowserInterface { class Playwright extends BrowserInterface {
private browserName: string private activeTrace?: string
async setup(browserName: string) { async setup(browserName: string) {
if (browser) return if (browser) return
this.browserName = browserName
const headless = !!process.env.HEADLESS const headless = !!process.env.HEADLESS
if (browserName === 'safari') { if (browserName === 'safari') {
...@@ -49,14 +47,14 @@ class Playwright extends BrowserInterface { ...@@ -49,14 +47,14 @@ class Playwright extends BrowserInterface {
} }
async loadPage(url: string) { async loadPage(url: string) {
if (traceStarted) { if (this.activeTrace) {
const traceDir = path.join(__dirname, '../../traces') const traceDir = path.join(__dirname, '../../traces')
const traceOutputPath = path.join( const traceOutputPath = path.join(
traceDir, traceDir,
`${path `${path
.relative(path.join(__dirname, '../../'), process.env.TEST_FILE_PATH) .relative(path.join(__dirname, '../../'), process.env.TEST_FILE_PATH)
.replace(/\//g, '-')}`, .replace(/\//g, '-')}`,
`playwright-${encodeURIComponent(url)}-${Date.now()}.zip` `playwright-${this.activeTrace}-${Date.now()}.zip`
) )
await fs.remove(traceOutputPath) await fs.remove(traceOutputPath)
...@@ -110,7 +108,7 @@ class Playwright extends BrowserInterface { ...@@ -110,7 +108,7 @@ class Playwright extends BrowserInterface {
screenshots: true, screenshots: true,
snapshots: true, snapshots: true,
}) })
traceStarted = true this.activeTrace = encodeURIComponent(url)
} }
await page.goto(url, { waitUntil: 'load' }) await page.goto(url, { waitUntil: 'load' })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment