chore: allow opt-into the legacy global setup mode (#11888)
This commit is contained in:
parent
c3c99a5f66
commit
9116adc684
|
|
@ -140,6 +140,14 @@ export class Runner {
|
|||
async runAllTests(options: RunOptions = {}): Promise<FullResult> {
|
||||
this._reporter = await this._createReporter(!!options.listOnly);
|
||||
const config = this._loader.fullConfig();
|
||||
|
||||
let legacyGlobalTearDown: (() => Promise<void>) | undefined;
|
||||
if (process.env.PW_TEST_LEGACY_GLOBAL_SETUP_MODE) {
|
||||
legacyGlobalTearDown = await this._performGlobalSetup(config);
|
||||
if (!legacyGlobalTearDown)
|
||||
return { status: 'failed' };
|
||||
}
|
||||
|
||||
const result = await raceAgainstTimeout(() => this._run(!!options.listOnly, options.filePatternFilter || [], options.projectFilter), config.globalTimeout);
|
||||
let fullResult: FullResult;
|
||||
if (result.timedOut) {
|
||||
|
|
@ -149,6 +157,7 @@ export class Runner {
|
|||
fullResult = result.result;
|
||||
}
|
||||
await this._reporter.onEnd?.(fullResult);
|
||||
await legacyGlobalTearDown?.();
|
||||
|
||||
// Calling process.exit() might truncate large stdout/stderr output.
|
||||
// See https://github.com/nodejs/node/issues/6456.
|
||||
|
|
@ -351,21 +360,19 @@ export class Runner {
|
|||
if (list)
|
||||
return { status: 'passed' };
|
||||
|
||||
// 13. Declare global setup to tear down in finally.
|
||||
const internalGlobalTeardowns: (() => Promise<void>)[] = [];
|
||||
let webServer: WebServer | undefined;
|
||||
let globalSetupResult: any;
|
||||
|
||||
// 13. Run Global setup.
|
||||
let globalTearDown: (() => Promise<void>) | undefined;
|
||||
if (!process.env.PW_TEST_LEGACY_GLOBAL_SETUP_MODE) {
|
||||
globalTearDown = await this._performGlobalSetup(config);
|
||||
if (!globalTearDown)
|
||||
return { status: 'failed' };
|
||||
}
|
||||
|
||||
const result: FullResult = { status: 'passed' };
|
||||
|
||||
// 14. Run tests.
|
||||
try {
|
||||
// 14. Perform global setup.
|
||||
for (const internalGlobalSetup of this._internalGlobalSetups)
|
||||
internalGlobalTeardowns.push(await internalGlobalSetup());
|
||||
webServer = config.webServer ? await WebServer.create(config.webServer) : undefined;
|
||||
if (config.globalSetup)
|
||||
globalSetupResult = await (await this._loader.loadGlobalHook(config.globalSetup, 'globalSetup'))(this._loader.fullConfig());
|
||||
|
||||
const sigintWatcher = new SigIntWatcher();
|
||||
|
||||
let hasWorkerErrors = false;
|
||||
|
|
@ -389,34 +396,58 @@ export class Runner {
|
|||
this._reporter.onError?.(serializeError(e));
|
||||
return { status: 'failed' };
|
||||
} finally {
|
||||
|
||||
await this._runAndAssignError(async () => {
|
||||
if (globalSetupResult && typeof globalSetupResult === 'function')
|
||||
await globalSetupResult(this._loader.fullConfig());
|
||||
}, result);
|
||||
|
||||
await this._runAndAssignError(async () => {
|
||||
if (config.globalTeardown)
|
||||
await (await this._loader.loadGlobalHook(config.globalTeardown, 'globalTeardown'))(this._loader.fullConfig());
|
||||
}, result);
|
||||
|
||||
await this._runAndAssignError(async () => {
|
||||
await webServer?.kill();
|
||||
}, result);
|
||||
|
||||
await this._runAndAssignError(async () => {
|
||||
for (const internalGlobalTeardown of internalGlobalTeardowns)
|
||||
await internalGlobalTeardown();
|
||||
}, result);
|
||||
await globalTearDown?.();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private async _runAndAssignError(callback: () => Promise<void>, result: FullResult) {
|
||||
private async _performGlobalSetup(config: FullConfig): Promise<(() => Promise<void>) | undefined> {
|
||||
const result: FullResult = { status: 'passed' };
|
||||
const internalGlobalTeardowns: (() => Promise<void>)[] = [];
|
||||
let globalSetupResult: any;
|
||||
let webServer: WebServer | undefined;
|
||||
|
||||
const tearDown = async () => {
|
||||
await this._runAndReportError(async () => {
|
||||
if (globalSetupResult && typeof globalSetupResult === 'function')
|
||||
await globalSetupResult(this._loader.fullConfig());
|
||||
}, result);
|
||||
|
||||
await this._runAndReportError(async () => {
|
||||
if (config.globalTeardown)
|
||||
await (await this._loader.loadGlobalHook(config.globalTeardown, 'globalTeardown'))(this._loader.fullConfig());
|
||||
}, result);
|
||||
|
||||
await this._runAndReportError(async () => {
|
||||
await webServer?.kill();
|
||||
}, result);
|
||||
|
||||
await this._runAndReportError(async () => {
|
||||
for (const internalGlobalTeardown of internalGlobalTeardowns)
|
||||
await internalGlobalTeardown();
|
||||
}, result);
|
||||
};
|
||||
|
||||
await this._runAndReportError(async () => {
|
||||
for (const internalGlobalSetup of this._internalGlobalSetups)
|
||||
internalGlobalTeardowns.push(await internalGlobalSetup());
|
||||
webServer = config.webServer ? await WebServer.create(config.webServer) : undefined;
|
||||
if (config.globalSetup)
|
||||
globalSetupResult = await (await this._loader.loadGlobalHook(config.globalSetup, 'globalSetup'))(this._loader.fullConfig());
|
||||
}, result);
|
||||
|
||||
if (result.status !== 'passed') {
|
||||
tearDown();
|
||||
return;
|
||||
}
|
||||
|
||||
return tearDown;
|
||||
}
|
||||
|
||||
private async _runAndReportError(callback: () => Promise<void>, result: FullResult) {
|
||||
try {
|
||||
await callback();
|
||||
} catch (e) {
|
||||
if (result.status === 'passed')
|
||||
result.status = 'failed';
|
||||
this._reporter.onError?.(serializeError(e));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@
|
|||
|
||||
import { test, expect } from './playwright-test-fixtures';
|
||||
|
||||
for (const mode of ['legacy', 'default']) {
|
||||
test.describe(`${mode} mode`, () => {
|
||||
const env = { PW_TEST_LEGACY_GLOBAL_SETUP_MODE: mode === 'legacy' ? '1' : undefined };
|
||||
|
||||
test('globalSetup and globalTeardown should work', async ({ runInlineTest }) => {
|
||||
const { results, output } = await runInlineTest({
|
||||
'playwright.config.ts': `
|
||||
|
|
@ -43,7 +47,7 @@ test('globalSetup and globalTeardown should work', async ({ runInlineTest }) =>
|
|||
expect(process.env.FOO).toBe('42');
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(results[0].status).toBe('passed');
|
||||
expect(output).toContain('teardown=42');
|
||||
});
|
||||
|
|
@ -75,12 +79,13 @@ test('globalTeardown runs after failures', async ({ runInlineTest }) => {
|
|||
expect(process.env.FOO).toBe('43');
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(results[0].status).toBe('failed');
|
||||
expect(output).toContain('teardown=42');
|
||||
});
|
||||
|
||||
test('globalTeardown does not run when globalSetup times out', async ({ runInlineTest }) => {
|
||||
test.skip(!!env.PW_TEST_LEGACY_GLOBAL_SETUP_MODE);
|
||||
const result = await runInlineTest({
|
||||
'playwright.config.ts': `
|
||||
import * as path from 'path';
|
||||
|
|
@ -105,7 +110,7 @@ test('globalTeardown does not run when globalSetup times out', async ({ runInlin
|
|||
test('should not run', async ({}, testInfo) => {
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
// We did not run tests, so we should only have 1 skipped test.
|
||||
expect(result.skipped).toBe(1);
|
||||
expect(result.passed).toBe(0);
|
||||
|
|
@ -134,7 +139,7 @@ test('globalSetup should work with sync function', async ({ runInlineTest }) =>
|
|||
expect(value).toEqual({ foo: 'bar' });
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(passed).toBe(1);
|
||||
});
|
||||
|
||||
|
|
@ -154,7 +159,7 @@ test('globalSetup should throw when passed non-function', async ({ runInlineTest
|
|||
test('should work', async ({}) => {
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(output).toContain(`globalSetup.ts: globalSetup file must export a single function.`);
|
||||
});
|
||||
|
||||
|
|
@ -182,7 +187,7 @@ test('globalSetup should work with default export and run the returned fn', asyn
|
|||
test('should work', async ({}) => {
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(passed).toBe(1);
|
||||
expect(exitCode).toBe(0);
|
||||
expect(output).toContain(`%%setup: 42`);
|
||||
|
|
@ -210,7 +215,7 @@ test('globalSetup should allow requiring a package from node_modules', async ({
|
|||
expect(process.env.FOO).toBe('42');
|
||||
});
|
||||
`,
|
||||
});
|
||||
}, undefined, env);
|
||||
expect(results[0].status).toBe('passed');
|
||||
});
|
||||
|
||||
|
|
@ -256,7 +261,7 @@ const authFiles = {
|
|||
};
|
||||
|
||||
test('globalSetup should work for auth', async ({ runInlineTest }) => {
|
||||
const result = await runInlineTest(authFiles);
|
||||
const result = await runInlineTest(authFiles, undefined, env);
|
||||
expect(result.exitCode).toBe(0);
|
||||
expect(result.passed).toBe(1);
|
||||
});
|
||||
|
|
@ -265,3 +270,5 @@ test('globalSetup auth should compile', async ({ runTSC }) => {
|
|||
const result = await runTSC(authFiles);
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue