@playwright/test 1.34.0-alpha-may-2-2023 → 1.34.0-alpha-may-3-2023

package/lib/worker/workerMain.js

@@ -391,18 +391,8 @@ class WorkerMain extends _process.ProcessRunner {
           firstAfterHooksError = firstAfterHooksError || afterEachError;
         }
 
-        // Run "afterAll" hooks for suites that are not shared with the next test.
-        // In case of failure the worker will be stopped and we have to make sure that afterAll
-        // hooks run before test fixtures teardown.
-        for (const suite of reversedSuites) {
-          if (!nextSuites.has(suite) || testInfo._isFailure()) {
-            const afterAllError = await this._runAfterAllHooksForSuite(suite, testInfo);
-            firstAfterHooksError = firstAfterHooksError || afterAllError;
-          }
-        }
-
         // Teardown test-scoped fixtures. Attribute to 'test' so that users understand
-        // they should probably increate the test timeout to fix this issue.
+        // they should probably increase the test timeout to fix this issue.
         testInfo._timeoutManager.setCurrentRunnable({
           type: 'test',
           slot: afterHooksSlot
@@ -411,6 +401,16 @@ class WorkerMain extends _process.ProcessRunner {
         const testScopeError = await testInfo._runAndFailOnError(() => this._fixtureRunner.teardownScope('test', testInfo._timeoutManager));
         (0, _util2.debugTest)(`tearing down test scope finished`);
         firstAfterHooksError = firstAfterHooksError || testScopeError;
+
+        // Run "afterAll" hooks for suites that are not shared with the next test.
+        // In case of failure the worker will be stopped and we have to make sure that afterAll
+        // hooks run before worker fixtures teardown.
+        for (const suite of reversedSuites) {
+          if (!nextSuites.has(suite) || testInfo._isFailure()) {
+            const afterAllError = await this._runAfterAllHooksForSuite(suite, testInfo);
+            firstAfterHooksError = firstAfterHooksError || afterAllError;
+          }
+        }
       });
       if (testInfo._isFailure()) this._isStopped = true;
       if (this._isStopped) {
@@ -421,10 +421,6 @@ class WorkerMain extends _process.ProcessRunner {
         // Give it more time for the full cleanup.
         await testInfo._runWithTimeout(async () => {
           (0, _util2.debugTest)(`running full cleanup after the failure`);
-          for (const suite of reversedSuites) {
-            const afterAllError = await this._runAfterAllHooksForSuite(suite, testInfo);
-            firstAfterHooksError = firstAfterHooksError || afterAllError;
-          }
           const teardownSlot = {
             timeout: this._project.project.timeout,
             elapsed: 0
@@ -438,6 +434,11 @@ class WorkerMain extends _process.ProcessRunner {
           const testScopeError = await testInfo._runAndFailOnError(() => this._fixtureRunner.teardownScope('test', testInfo._timeoutManager));
           (0, _util2.debugTest)(`tearing down test scope finished`);
           firstAfterHooksError = firstAfterHooksError || testScopeError;
+          for (const suite of reversedSuites) {
+            const afterAllError = await this._runAfterAllHooksForSuite(suite, testInfo);
+            firstAfterHooksError = firstAfterHooksError || afterAllError;
+          }
+
           // Attribute to 'teardown' because worker fixtures are not perceived as a part of a test.
           testInfo._timeoutManager.setCurrentRunnable({
             type: 'teardown',
@@ -509,7 +510,15 @@ class WorkerMain extends _process.ProcessRunner {
           category: 'hook',
           title: `${hook.type} hook`,
           location: hook.location
-        }, () => this._fixtureRunner.resolveParametersAndRunFunction(hook.fn, testInfo, 'all-hooks-only'));
+        }, async () => {
+          try {
+            await this._fixtureRunner.resolveParametersAndRunFunction(hook.fn, testInfo, 'all-hooks-only');
+          } finally {
+            // Each beforeAll hook has its own scope for test fixtures. Attribute to the same runnable and timeSlot.
+            // Note: we must teardown even after beforeAll fails, because we'll run more beforeAlls.
+            await this._fixtureRunner.teardownScope('test', testInfo._timeoutManager);
+          }
+        });
       } catch (e) {
         // Always run all the hooks, and capture the first error.
         beforeAllError = beforeAllError || e;
@@ -540,7 +549,15 @@ class WorkerMain extends _process.ProcessRunner {
           category: 'hook',
           title: `${hook.type} hook`,
           location: hook.location
-        }, () => this._fixtureRunner.resolveParametersAndRunFunction(hook.fn, testInfo, 'all-hooks-only'));
+        }, async () => {
+          try {
+            await this._fixtureRunner.resolveParametersAndRunFunction(hook.fn, testInfo, 'all-hooks-only');
+          } finally {
+            // Each afterAll hook has its own scope for test fixtures. Attribute to the same runnable and timeSlot.
+            // Note: we must teardown even after afterAll fails, because we'll run more afterAlls.
+            await this._fixtureRunner.teardownScope('test', testInfo._timeoutManager);
+          }
+        });
       });
       firstError = firstError || afterAllError;
       (0, _util2.debugTest)(`${hook.type} hook at "${(0, _util2.formatLocation)(hook.location)}" finished`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.34.0-alpha-may-2-2023",
+  "version": "1.34.0-alpha-may-3-2023",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
@@ -36,7 +36,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.34.0-alpha-may-2-2023"
+    "playwright-core": "1.34.0-alpha-may-3-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"