yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

testrunner: teach runHook to accept hook arguments (#2682)

Browse Source
This commit is contained in:
Andrey Lushnikov 2020-06-23 18:17:14 -07:00 committed by GitHub
parent 22b4a6bd27
commit 07dbd0baae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/testrunner/TestRunner.js
View File

@ -195,7 +195,7 @@ class TestWorker {
return; return;
const environment = this._environmentStack.pop(); const environment = this._environmentStack.pop();
for (const hook of environment.hooks('afterAll')) { for (const hook of environment.hooks('afterAll')) {
if (!await this._runHook(testRun, hook, environment.name())) if (!await this._runHook(testRun, hook, environment.name(), [this._state]))
return; return;
} }
} }
@ -205,7 +205,7 @@ class TestWorker {
const environment = environmentStack[this._environmentStack.length]; const environment = environmentStack[this._environmentStack.length];
this._environmentStack.push(environment); this._environmentStack.push(environment);
for (const hook of environment.hooks('beforeAll')) { for (const hook of environment.hooks('beforeAll')) {
if (!await this._runHook(testRun, hook, environment.name())) if (!await this._runHook(testRun, hook, environment.name(), [this._state]))
return; return;
} }
} }
@ -219,7 +219,7 @@ class TestWorker {
await this._willStartTestRun(testRun); await this._willStartTestRun(testRun);
for (const environment of this._environmentStack) { for (const environment of this._environmentStack) {
for (const hook of environment.hooks('beforeEach')) for (const hook of environment.hooks('beforeEach'))
await this._runHook(testRun, hook, environment.name(), true); await this._runHook(testRun, hook, environment.name(), [this._state, testRun]);
} }
if (!testRun._error && !this._markTerminated(testRun)) { if (!testRun._error && !this._markTerminated(testRun)) {
@ -243,15 +243,15 @@ class TestWorker {
for (const environment of this._environmentStack.slice().reverse()) { for (const environment of this._environmentStack.slice().reverse()) {
for (const hook of environment.hooks('afterEach')) for (const hook of environment.hooks('afterEach'))
await this._runHook(testRun, hook, environment.name(), true); await this._runHook(testRun, hook, environment.name(), [this._state, testRun]);
} }
await this._didFinishTestRun(testRun); await this._didFinishTestRun(testRun);
} }
async _runHook(testRun, hook, fullName, passTestRun = false) { async _runHook(testRun, hook, fullName, hookArgs = []) {
await this._willStartHook(testRun, hook, fullName); await this._willStartHook(testRun, hook, fullName);
const timeout = this._testRunner._hookTimeout; const timeout = this._testRunner._hookTimeout;
const { promise, terminate } = runUserCallback(hook.body, timeout, passTestRun ? [this._state, testRun] : [this._state]); const { promise, terminate } = runUserCallback(hook.body, timeout, hookArgs);
this._runningHookTerminate = terminate; this._runningHookTerminate = terminate;
let error = await promise; let error = await promise;
this._runningHookTerminate = null; this._runningHookTerminate = null;
@ -323,7 +323,7 @@ class TestWorker {
while (this._environmentStack.length > 0) { while (this._environmentStack.length > 0) {
const environment = this._environmentStack.pop(); const environment = this._environmentStack.pop();
for (const hook of environment.hooks('afterAll')) for (const hook of environment.hooks('afterAll'))
await this._runHook(null, hook, environment.name()); await this._runHook(null, hook, environment.name(), [this._state]);
} }
} }
} }