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

revert ordering

Browse source
This commit is contained in:
Simon Knott 2024-10-08 16:55:22 +02:00
parent 3ef8178cca
commit d1273ad1b6
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -392,15 +392,15 @@ test('globalSetup should support multiple', async ({ runInlineTest }) => {
'playwright.config.ts': ` 'playwright.config.ts': `
module.exports = { module.exports = {
globalSetup: ['./globalSetup1.ts','./globalSetup2.ts','./globalSetup3.ts','./globalSetup4.ts'], globalSetup: ['./globalSetup1.ts','./globalSetup2.ts','./globalSetup3.ts','./globalSetup4.ts'],
globalTeardown: ['./globalTeardown2.ts', './globalTeardown3.ts'], globalTeardown: ['./globalTeardown1.ts', './globalTeardown2.ts'],
}; };
`, `,
'globalSetup1.ts': `module.exports = () => { console.log('%%globalSetup1'); return () => console.log('%%globalSetup1Function'); };`, 'globalSetup1.ts': `module.exports = () => { console.log('%%globalSetup1'); return () => { console.log('%%globalSetup1Function'); throw new Error('kaboom'); } };`,
'globalSetup2.ts': `module.exports = () => console.log('%%globalSetup2');`, 'globalSetup2.ts': `module.exports = () => console.log('%%globalSetup2');`,
'globalSetup3.ts': `module.exports = () => { console.log('%%globalSetup3'); return () => console.log('%%globalSetup3Function'); }`, 'globalSetup3.ts': `module.exports = () => { console.log('%%globalSetup3'); return () => console.log('%%globalSetup3Function'); }`,
'globalSetup4.ts': `module.exports = () => console.log('%%globalSetup4');`, 'globalSetup4.ts': `module.exports = () => console.log('%%globalSetup4');`,
'globalTeardown2.ts': `module.exports = () => { console.log('%%globalTeardown2'); throw new Error('kaboom'); }`, 'globalTeardown1.ts': `module.exports = () => console.log('%%globalTeardown1')`,
'globalTeardown3.ts': `module.exports = () => console.log('%%globalTeardown3');`, 'globalTeardown2.ts': `module.exports = () => console.log('%%globalTeardown2');`,
'a.test.js': ` 'a.test.js': `
import { test } from '@playwright/test'; import { test } from '@playwright/test';
@ -420,9 +420,9 @@ test('globalSetup should support multiple', async ({ runInlineTest }) => {
'test a', 'test a',
'test b', 'test b',
'globalSetup3Function', 'globalSetup3Function',
'globalTeardown3',
'globalTeardown2', 'globalTeardown2',
// 'globalSetup1Function' is missing, because globalTeardown2 errored out. 'globalSetup1Function',
// 'globalTeardown1' is missing, because globalTeardown1 errored out.
]); ]);
expect(result.output).toContain('Error: kaboom'); expect(result.output).toContain('Error: kaboom');
}); });