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

Revert "make behaviour congruent for globalTeardown"

Browse source 
This reverts commit 9b785662f6.
This commit is contained in:
Simon Knott 2024-10-18 11:00:36 +02:00
parent d8d044e5ed
commit d841c675cc
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/playwright/src/runner/tasks.ts
View file

@ -182,15 +182,10 @@ function createGlobalSetupTask(index: number, length: number): Task<TestRun> {
globalSetupFinished = true; globalSetupFinished = true;
}, },
teardown: async ({ config }) => { teardown: async ({ config }) => {
let firstError: any;
if (typeof globalSetupResult === 'function') if (typeof globalSetupResult === 'function')
try { await globalSetupResult(); } catch (error) { firstError = error; } await globalSetupResult();
if (globalSetupFinished) if (globalSetupFinished)
await teardownHook?.(config.config); await teardownHook?.(config.config);
if (firstError)
throw firstError;
}, },
}; };
} }

2
tests/playwright-test/global-setup.spec.ts
View file

@ -422,7 +422,7 @@ test('globalSetup should support multiple', async ({ runInlineTest }) => {
'globalSetup3Function', 'globalSetup3Function',
'globalTeardown2', 'globalTeardown2',
'globalSetup1Function', 'globalSetup1Function',
'globalTeardown1', // 'globalTeardown1' is missing, because globalSetup1Function errored out.
]); ]);
expect(result.output).toContain('Error: kaboom'); expect(result.output).toContain('Error: kaboom');
}); });