microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-09-11 20:37:54 +03:00
Code Issues Projects Releases Wiki Activity

chore(trace): do not nest API actions based on time (#31990)

Browse Source 
They should be properly nested based on Node.js zones now.
This commit is contained in:
Yury Semikhatsky 2024-08-05 10:06:14 -07:00 committed by GitHub
parent 5c9ce6b9d9
commit fef27395a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/playwright/src/index.ts
View File

@ -261,7 +261,6 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
title: renderApiCall(apiName, params),
apiName,
params,
canNestByTime: true,
});
userData.userObject = step;
out.stepId = step.stepId;

8
packages/playwright/src/worker/testInfo.ts
View File

@ -44,9 +44,6 @@ export interface TestStepInternal {
infectParentStepsWithError?: boolean;
box?: boolean;
isStage?: boolean;
// TODO: this сould be decided based on the category, but pw:api
// is from a different abstraction layer.
canNestByTime?: boolean;
}
export type TestStage = {
@ -255,11 +252,6 @@ export class TestInfoImpl implements TestInfo {
parentStep = this._findLastStageStep();
} else {
parentStep = zones.zoneData<TestStepInternal>('stepZone');
if (!parentStep && data.canNestByTime) {
// API steps (but not test.step calls) can be nested by time, instead of by stack.
// However, do not nest chains of route.continue by checking the title.
parentStep = this._findLastNonFinishedStep(step => step.title !== data.title);
}
if (!parentStep) {
// If no parent step on stack, assume the current stage as parent.
parentStep = this._findLastStageStep();

4
tests/playwright-test/playwright.trace.spec.ts
View File

@ -1216,9 +1216,9 @@ test('should not nest top level expect into unfinished api calls ', {
' browserContext.newPage',
'page.route',
'page.goto',
' route.fetch',
' page.unrouteAll',
'route.fetch',
'expect.toBeVisible',
'page.unrouteAll',
'After Hooks',
' fixture: page',
' fixture: context',

6
tests/playwright-test/test-step.spec.ts
View File

@ -542,7 +542,7 @@ fixture | fixture: browser
`);
});
test('should nest page.continue inside page.goto steps', async ({ runInlineTest }) => {
test('should not nest page.continue inside page.goto steps', async ({ runInlineTest }) => {
const result = await runInlineTest({
'reporter.ts': stepIndentReporter,
'playwright.config.ts': `module.exports = { reporter: './reporter', };`,
@ -566,7 +566,7 @@ fixture | fixture: page
pw:api | browserContext.newPage
pw:api |page.route @ a.test.ts:4
pw:api |page.goto(http://localhost:1234) @ a.test.ts:5
pw:api | route.fulfill @ a.test.ts:4
pw:api |route.fulfill @ a.test.ts:4
hook |After Hooks
fixture | fixture: page
fixture | fixture: context
@ -1154,7 +1154,7 @@ pw:api | browserContext.newPage
fixture | fixture: request
pw:api | apiRequest.newContext
pw:api |page.waitForNavigation @ a.test.ts:5
pw:api | page.goto(data:text/html,<button></button>) @ a.test.ts:6
pw:api |page.goto(data:text/html,<button></button>) @ a.test.ts:6
pw:api |page.click(button) @ a.test.ts:8
pw:api |locator.getByRole('button').click @ a.test.ts:9
pw:api |apiRequestContext.get(http://localhost2) @ a.test.ts:10