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

package/lib/common/transform.js

@@ -37,16 +37,17 @@ function validateTsConfig(tsconfig) {
   if (!tsconfig.tsConfigPath || !tsconfig.baseUrl) return;
   // Make 'baseUrl' absolute, because it is relative to the tsconfig.json, not to cwd.
   const absoluteBaseUrl = _path.default.resolve(_path.default.dirname(tsconfig.tsConfigPath), tsconfig.baseUrl);
-  const paths = tsconfig.paths || {
-    '*': ['*']
-  };
+  const pathsFallback = [{
+    key: '*',
+    values: ['*']
+  }];
   return {
     allowJs: tsconfig.allowJs,
     absoluteBaseUrl,
-    paths: Object.entries(paths).map(([key, values]) => ({
+    paths: Object.entries(tsconfig.paths || {}).map(([key, values]) => ({
       key,
       values
-    }))
+    })).concat(pathsFallback)
   };
 }
 function loadAndValidateTsconfigForFile(file) {

package/lib/index.js

@@ -440,7 +440,8 @@ const playwrightFixtures = {
           location: stackTrace === null || stackTrace === void 0 ? void 0 : stackTrace.frames[0],
           category: 'pw:api',
           title: apiCall,
-          wallTime
+          wallTime,
+          laxParent: true
         });
         userData.userObject = step;
       },

package/lib/reporters/merge.js

@@ -84,8 +84,6 @@ function mergeEvents(shardReports) {
   for (const reportJsonl of shardReports) {
     const parsedEvents = parseEvents(reportJsonl);
     for (const event of parsedEvents) {
-      // TODO: show remaining events?
-      if (event.method === 'onError') throw new Error('Error in shard');
       if (event.method === 'onBegin') beginEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);else events.push(event);
     }
   }

package/lib/worker/testInfo.js

@@ -56,6 +56,7 @@ class TestInfoImpl {
     this._lastStepId = 0;
     this._projectInternal = void 0;
     this._configInternal = void 0;
+    this._steps = [];
     this.testId = void 0;
     this.repeatEachIndex = void 0;
     this.retry = void 0;
@@ -163,15 +164,28 @@ class TestInfoImpl {
   }
   _addStep(data) {
     const stepId = `${data.category}@${data.title}@${++this._lastStepId}`;
-    const parentStep = _utils.zones.zoneData('stepZone', (0, _utils.captureRawStack)());
-    let callbackHandled = false;
-    const firstErrorIndex = this.errors.length;
+    let parentStep = _utils.zones.zoneData('stepZone', (0, _utils.captureRawStack)());
+
+    // For out-of-stack calls, locate the enclosing step.
+    let isLaxParent = false;
+    if (!parentStep && data.laxParent) {
+      const visit = step => {
+        // Never nest into under another lax element, it could be a series
+        // of no-reply actions, ala page.continue().
+        if (!step.endWallTime && step.category === data.category && !step.laxParent) parentStep = step;
+        step.steps.forEach(visit);
+      };
+      this._steps.forEach(visit);
+      isLaxParent = !!parentStep;
+    }
     const step = {
       stepId,
       ...data,
+      laxParent: isLaxParent,
+      steps: [],
       complete: result => {
-        if (callbackHandled) return;
-        callbackHandled = true;
+        if (step.endWallTime) return;
+        step.endWallTime = Date.now();
         let error;
         if (result.error instanceof Error) {
           // Step function threw an error.
@@ -180,19 +194,22 @@ class TestInfoImpl {
           // Internal API step reported an error.
           error = result.error;
         } else {
-          // There was some other error (porbably soft expect) during step execution.
-          // Report step as failed to make it easier to spot.
-          error = this.errors[firstErrorIndex];
+          // One of the child steps failed (probably soft expect).
+          // Report this step as failed to make it easier to spot.
+          error = step.steps.map(s => s.error).find(e => !!e);
         }
+        step.error = error;
         const payload = {
           testId: this._test.id,
           stepId,
-          wallTime: Date.now(),
+          wallTime: step.endWallTime,
           error
         };
         this._onStepEnd(payload);
       }
     };
+    const parentStepList = parentStep ? parentStep.steps : this._steps;
+    parentStepList.push(step);
     const hasLocation = data.location && !data.location.file.includes('@playwright');
     // Sanitize location that comes from user land, it might have extra properties.
     const location = data.location && hasLocation ? {

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-4-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-4-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"