playwright 1.54.1 → 1.56.1

package/lib/common/fixtures.js

@@ -90,7 +90,7 @@ class FixturePool {
           continue;
         }
       } else if (previous) {
-        options = { auto: previous.auto, scope: previous.scope, option: previous.option, timeout: previous.timeout, customTitle: previous.customTitle, box: previous.box };
+        options = { auto: previous.auto, scope: previous.scope, option: previous.option, timeout: previous.timeout, customTitle: previous.customTitle };
       } else if (!options) {
         options = { auto: false, scope: "test", option: false, timeout: void 0 };
       }

package/lib/common/suiteUtils.js

@@ -31,10 +31,8 @@ __export(suiteUtils_exports, {
   applyRepeatEachIndex: () => applyRepeatEachIndex,
   bindFileSuiteToProject: () => bindFileSuiteToProject,
   filterByFocusedLine: () => filterByFocusedLine,
-  filterByTestIds: () => filterByTestIds,
   filterOnly: () => filterOnly,
   filterSuite: () => filterSuite,
-  filterSuiteWithOnlySemantics: () => filterSuiteWithOnlySemantics,
   filterTestsRemoveEmptySuites: () => filterTestsRemoveEmptySuites
 });
 module.exports = __toCommonJS(suiteUtils_exports);
@@ -127,11 +125,6 @@ function filterByFocusedLine(suite, focusedTestFileLines) {
   const testFilter = (test) => testFileLineMatches(test.location.file, test.location.line, test.location.column);
   return filterSuite(suite, suiteFilter, testFilter);
 }
-function filterByTestIds(suite, testIdMatcher) {
-  if (!testIdMatcher)
-    return;
-  filterTestsRemoveEmptySuites(suite, (test) => testIdMatcher(test.id));
-}
 function createFileMatcherFromFilter(filter) {
   const fileMatcher = (0, import_util.createFileMatcher)(filter.re || filter.exact || "");
   return (testFileName, testLine, testColumn) => fileMatcher(testFileName) && (filter.line === testLine || filter.line === null) && (filter.column === testColumn || filter.column === null);
@@ -141,9 +134,7 @@ function createFileMatcherFromFilter(filter) {
   applyRepeatEachIndex,
   bindFileSuiteToProject,
   filterByFocusedLine,
-  filterByTestIds,
   filterOnly,
   filterSuite,
-  filterSuiteWithOnlySemantics,
   filterTestsRemoveEmptySuites
 });

package/lib/index.js

@@ -42,7 +42,7 @@ var playwrightLibrary = __toESM(require("playwright-core"));
 var import_utils = require("playwright-core/lib/utils");
 var import_globals = require("./common/globals");
 var import_testType = require("./common/testType");
-var import_util = require("./util");
+var import_browserBackend = require("./mcp/test/browserBackend");
 var import_expect = require("./matchers/expect");
 var import_configLoader = require("./common/configLoader");
 var import_testType2 = require("./common/testType");
@@ -61,20 +61,20 @@ if (process["__pw_initiator__"]) {
   process["__pw_initiator__"] = new Error().stack;
 }
 const playwrightFixtures = {
-  defaultBrowserType: ["chromium", { scope: "worker", option: true }],
-  browserName: [({ defaultBrowserType }, use) => use(defaultBrowserType), { scope: "worker", option: true }],
+  defaultBrowserType: ["chromium", { scope: "worker", option: true, box: true }],
+  browserName: [({ defaultBrowserType }, use) => use(defaultBrowserType), { scope: "worker", option: true, box: true }],
   playwright: [async ({}, use) => {
     await use(require("playwright-core"));
   }, { scope: "worker", box: true }],
-  headless: [({ launchOptions }, use) => use(launchOptions.headless ?? true), { scope: "worker", option: true }],
-  channel: [({ launchOptions }, use) => use(launchOptions.channel), { scope: "worker", option: true }],
-  launchOptions: [{}, { scope: "worker", option: true }],
+  headless: [({ launchOptions }, use) => use(launchOptions.headless ?? true), { scope: "worker", option: true, box: true }],
+  channel: [({ launchOptions }, use) => use(launchOptions.channel), { scope: "worker", option: true, box: true }],
+  launchOptions: [{}, { scope: "worker", option: true, box: true }],
   connectOptions: [async ({ _optionConnectOptions }, use) => {
     await use(connectOptionsFromEnv() || _optionConnectOptions);
-  }, { scope: "worker", option: true }],
-  screenshot: ["off", { scope: "worker", option: true }],
-  video: ["off", { scope: "worker", option: true }],
-  trace: ["off", { scope: "worker", option: true }],
+  }, { scope: "worker", option: true, box: true }],
+  screenshot: ["off", { scope: "worker", option: true, box: true }],
+  video: ["off", { scope: "worker", option: true, box: true }],
+  trace: ["off", { scope: "worker", option: true, box: true }],
   _browserOptions: [async ({ playwright, headless, channel, launchOptions }, use) => {
     const options = {
       handleSIGINT: false,
@@ -103,45 +103,41 @@ const playwrightFixtures = {
         }
       });
       await use(browser2);
-      await browser2._wrapApiCall(async () => {
-        await browser2.close({ reason: "Test ended." });
-      }, { internal: true });
+      await browser2.close({ reason: "Test ended." });
       return;
     }
     const browser = await playwright[browserName].launch();
     await use(browser);
-    await browser._wrapApiCall(async () => {
-      await browser.close({ reason: "Test ended." });
-    }, { internal: true });
+    await browser.close({ reason: "Test ended." });
   }, { scope: "worker", timeout: 0 }],
-  acceptDownloads: [({ contextOptions }, use) => use(contextOptions.acceptDownloads ?? true), { option: true }],
-  bypassCSP: [({ contextOptions }, use) => use(contextOptions.bypassCSP ?? false), { option: true }],
-  colorScheme: [({ contextOptions }, use) => use(contextOptions.colorScheme === void 0 ? "light" : contextOptions.colorScheme), { option: true }],
-  deviceScaleFactor: [({ contextOptions }, use) => use(contextOptions.deviceScaleFactor), { option: true }],
-  extraHTTPHeaders: [({ contextOptions }, use) => use(contextOptions.extraHTTPHeaders), { option: true }],
-  geolocation: [({ contextOptions }, use) => use(contextOptions.geolocation), { option: true }],
-  hasTouch: [({ contextOptions }, use) => use(contextOptions.hasTouch ?? false), { option: true }],
-  httpCredentials: [({ contextOptions }, use) => use(contextOptions.httpCredentials), { option: true }],
-  ignoreHTTPSErrors: [({ contextOptions }, use) => use(contextOptions.ignoreHTTPSErrors ?? false), { option: true }],
-  isMobile: [({ contextOptions }, use) => use(contextOptions.isMobile ?? false), { option: true }],
-  javaScriptEnabled: [({ contextOptions }, use) => use(contextOptions.javaScriptEnabled ?? true), { option: true }],
-  locale: [({ contextOptions }, use) => use(contextOptions.locale ?? "en-US"), { option: true }],
-  offline: [({ contextOptions }, use) => use(contextOptions.offline ?? false), { option: true }],
-  permissions: [({ contextOptions }, use) => use(contextOptions.permissions), { option: true }],
-  proxy: [({ contextOptions }, use) => use(contextOptions.proxy), { option: true }],
-  storageState: [({ contextOptions }, use) => use(contextOptions.storageState), { option: true }],
-  clientCertificates: [({ contextOptions }, use) => use(contextOptions.clientCertificates), { option: true }],
-  timezoneId: [({ contextOptions }, use) => use(contextOptions.timezoneId), { option: true }],
-  userAgent: [({ contextOptions }, use) => use(contextOptions.userAgent), { option: true }],
-  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === void 0 ? { width: 1280, height: 720 } : contextOptions.viewport), { option: true }],
-  actionTimeout: [0, { option: true }],
-  testIdAttribute: ["data-testid", { option: true }],
-  navigationTimeout: [0, { option: true }],
+  acceptDownloads: [({ contextOptions }, use) => use(contextOptions.acceptDownloads ?? true), { option: true, box: true }],
+  bypassCSP: [({ contextOptions }, use) => use(contextOptions.bypassCSP ?? false), { option: true, box: true }],
+  colorScheme: [({ contextOptions }, use) => use(contextOptions.colorScheme === void 0 ? "light" : contextOptions.colorScheme), { option: true, box: true }],
+  deviceScaleFactor: [({ contextOptions }, use) => use(contextOptions.deviceScaleFactor), { option: true, box: true }],
+  extraHTTPHeaders: [({ contextOptions }, use) => use(contextOptions.extraHTTPHeaders), { option: true, box: true }],
+  geolocation: [({ contextOptions }, use) => use(contextOptions.geolocation), { option: true, box: true }],
+  hasTouch: [({ contextOptions }, use) => use(contextOptions.hasTouch ?? false), { option: true, box: true }],
+  httpCredentials: [({ contextOptions }, use) => use(contextOptions.httpCredentials), { option: true, box: true }],
+  ignoreHTTPSErrors: [({ contextOptions }, use) => use(contextOptions.ignoreHTTPSErrors ?? false), { option: true, box: true }],
+  isMobile: [({ contextOptions }, use) => use(contextOptions.isMobile ?? false), { option: true, box: true }],
+  javaScriptEnabled: [({ contextOptions }, use) => use(contextOptions.javaScriptEnabled ?? true), { option: true, box: true }],
+  locale: [({ contextOptions }, use) => use(contextOptions.locale ?? "en-US"), { option: true, box: true }],
+  offline: [({ contextOptions }, use) => use(contextOptions.offline ?? false), { option: true, box: true }],
+  permissions: [({ contextOptions }, use) => use(contextOptions.permissions), { option: true, box: true }],
+  proxy: [({ contextOptions }, use) => use(contextOptions.proxy), { option: true, box: true }],
+  storageState: [({ contextOptions }, use) => use(contextOptions.storageState), { option: true, box: true }],
+  clientCertificates: [({ contextOptions }, use) => use(contextOptions.clientCertificates), { option: true, box: true }],
+  timezoneId: [({ contextOptions }, use) => use(contextOptions.timezoneId), { option: true, box: true }],
+  userAgent: [({ contextOptions }, use) => use(contextOptions.userAgent), { option: true, box: true }],
+  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === void 0 ? { width: 1280, height: 720 } : contextOptions.viewport), { option: true, box: true }],
+  actionTimeout: [0, { option: true, box: true }],
+  testIdAttribute: ["data-testid", { option: true, box: true }],
+  navigationTimeout: [0, { option: true, box: true }],
   baseURL: [async ({}, use) => {
     await use(process.env.PLAYWRIGHT_TEST_BASE_URL);
-  }, { option: true }],
-  serviceWorkers: [({ contextOptions }, use) => use(contextOptions.serviceWorkers ?? "allow"), { option: true }],
-  contextOptions: [{}, { option: true }],
+  }, { option: true, box: true }],
+  serviceWorkers: [({ contextOptions }, use) => use(contextOptions.serviceWorkers ?? "allow"), { option: true, box: true }],
+  contextOptions: [{}, { option: true, box: true }],
   _combinedContextOptions: [async ({
     acceptDownloads,
     bypassCSP,
@@ -221,10 +217,10 @@ const playwrightFixtures = {
     if (testIdAttribute)
       playwrightLibrary.selectors.setTestIdAttribute(testIdAttribute);
     testInfo.snapshotSuffix = process.platform;
-    if ((0, import_utils.debugMode)())
+    if ((0, import_utils.debugMode)() === "inspector")
       testInfo._setDebugMode();
     playwright._defaultContextOptions = _combinedContextOptions;
-    playwright._defaultContextTimeout = actionTimeout || 0;
+    playwright._defaultContextTimeout = testInfo._pauseOnError() ? 5e3 : actionTimeout || 0;
     playwright._defaultContextNavigationTimeout = navigationTimeout || 0;
     await use();
     playwright._defaultContextOptions = void 0;
@@ -242,11 +238,12 @@ const playwrightFixtures = {
         if (!testInfo2 || data.apiName.includes("setTestIdAttribute") || data.apiName === "tracing.groupEnd")
           return;
         const zone = (0, import_utils.currentZone)().data("stepZone");
-        if (zone && zone.category === "expect") {
+        const isExpectCall = data.apiName === "locator._expect" || data.apiName === "frame._expect" || data.apiName === "page._expectScreenshot";
+        if (zone && zone.category === "expect" && isExpectCall) {
           if (zone.apiName)
             data.apiName = zone.apiName;
           if (zone.title)
-            data.title = (0, import_util.stepTitle)(zone.category, zone.title);
+            data.title = zone.title;
           data.stepId = zone.stepId;
           return;
         }
@@ -255,7 +252,8 @@ const playwrightFixtures = {
           category: "pw:api",
           title: renderTitle(channel.type, channel.method, channel.params, data.title),
           apiName: data.apiName,
-          params: channel.params
+          params: channel.params,
+          group: (0, import_utils.getActionGroup)({ type: channel.type, method: channel.method })
         }, tracingGroupSteps[tracingGroupSteps.length - 1]);
         data.userData = step;
         data.stepId = step.stepId;
@@ -310,6 +308,7 @@ const playwrightFixtures = {
     const videoMode = normalizeVideoMode(video);
     const captureVideo = shouldCaptureVideo(videoMode, testInfo) && !_reuseContext;
     const contexts = /* @__PURE__ */ new Map();
+    let counter = 0;
     await use(async (options) => {
       const hook = testInfoImpl._currentHookType();
       if (hook === "beforeAll" || hook === "afterAll") {
@@ -326,10 +325,6 @@ const playwrightFixtures = {
         }
       } : {};
       const context = await browser.newContext({ ...videoOptions, ...options });
-      const contextData = { pagesWithVideo: [] };
-      contexts.set(context, contextData);
-      if (captureVideo)
-        context.on("page", (page) => contextData.pagesWithVideo.push(page));
       if (process.env.PW_CLOCK === "frozen") {
         await context._wrapApiCall(async () => {
           await context.clock.install({ time: 0 });
@@ -340,33 +335,39 @@ const playwrightFixtures = {
           await context.clock.install({ time: 0 });
         }, { internal: true });
       }
-      return context;
-    });
-    let counter = 0;
-    const closeReason = testInfo.status === "timedOut" ? "Test timeout of " + testInfo.timeout + "ms exceeded." : "Test ended.";
-    await Promise.all([...contexts.keys()].map(async (context) => {
-      await context._wrapApiCall(async () => {
+      let closed = false;
+      const close = async () => {
+        if (closed)
+          return;
+        closed = true;
+        const closeReason = testInfo.status === "timedOut" ? "Test timeout of " + testInfo.timeout + "ms exceeded." : "Test ended.";
         await context.close({ reason: closeReason });
-      }, { internal: true });
-      const testFailed = testInfo.status !== testInfo.expectedStatus;
-      const preserveVideo = captureVideo && (videoMode === "on" || testFailed && videoMode === "retain-on-failure" || videoMode === "on-first-retry" && testInfo.retry === 1);
-      if (preserveVideo) {
-        const { pagesWithVideo: pagesForVideo } = contexts.get(context);
-        const videos = pagesForVideo.map((p) => p.video()).filter(Boolean);
-        await Promise.all(videos.map(async (v) => {
-          try {
-            const savedPath = testInfo.outputPath(`video${counter ? "-" + counter : ""}.webm`);
-            ++counter;
-            await v.saveAs(savedPath);
-            testInfo.attachments.push({ name: "video", path: savedPath, contentType: "video/webm" });
-          } catch (e) {
-          }
-        }));
-      }
-    }));
+        const testFailed = testInfo.status !== testInfo.expectedStatus;
+        const preserveVideo = captureVideo && (videoMode === "on" || testFailed && videoMode === "retain-on-failure" || videoMode === "on-first-retry" && testInfo.retry === 1);
+        if (preserveVideo) {
+          const { pagesWithVideo: pagesForVideo } = contexts.get(context);
+          const videos = pagesForVideo.map((p) => p.video()).filter((video2) => !!video2);
+          await Promise.all(videos.map(async (v) => {
+            try {
+              const savedPath = testInfo.outputPath(`video${counter ? "-" + counter : ""}.webm`);
+              ++counter;
+              await v.saveAs(savedPath);
+              testInfo.attachments.push({ name: "video", path: savedPath, contentType: "video/webm" });
+            } catch (e) {
+            }
+          }));
+        }
+      };
+      const contextData = { close, pagesWithVideo: [] };
+      if (captureVideo)
+        context.on("page", (page) => contextData.pagesWithVideo.push(page));
+      contexts.set(context, contextData);
+      return { context, close };
+    });
+    await Promise.all([...contexts.values()].map((data) => data.close()));
   }, { scope: "test", title: "context", box: true }],
-  _optionContextReuseMode: ["none", { scope: "worker", option: true }],
-  _optionConnectOptions: [void 0, { scope: "worker", option: true }],
+  _optionContextReuseMode: ["none", { scope: "worker", option: true, box: true }],
+  _optionConnectOptions: [void 0, { scope: "worker", option: true, box: true }],
   _reuseContext: [async ({ video, _optionContextReuseMode }, use) => {
     let mode = _optionContextReuseMode;
     if (process.env.PW_TEST_REUSE_CONTEXT)
@@ -374,17 +375,21 @@ const playwrightFixtures = {
     const reuse = mode === "when-possible" && normalizeVideoMode(video) === "off";
     await use(reuse);
   }, { scope: "worker", title: "context", box: true }],
-  context: async ({ playwright, browser, _reuseContext, _contextFactory }, use, testInfo) => {
-    attachConnectedHeaderIfNeeded(testInfo, browser);
+  context: async ({ browser, _reuseContext, _contextFactory }, use, testInfo) => {
+    const browserImpl = browser;
+    attachConnectedHeaderIfNeeded(testInfo, browserImpl);
     if (!_reuseContext) {
-      await use(await _contextFactory());
+      const { context: context2, close } = await _contextFactory();
+      testInfo._onDidFinishTestFunctions.unshift(() => (0, import_browserBackend.runBrowserBackendAtEnd)(context2, testInfo.errors[0]?.message));
+      await use(context2);
+      await close();
       return;
     }
-    const defaultContextOptions = playwright.chromium._defaultContextOptions;
-    const context = await browser._newContextForReuse(defaultContextOptions);
+    const context = await browserImpl._wrapApiCall(() => browserImpl._newContextForReuse(), { internal: true });
+    testInfo._onDidFinishTestFunctions.unshift(() => (0, import_browserBackend.runBrowserBackendAtEnd)(context, testInfo.errors[0]?.message));
     await use(context);
     const closeReason = testInfo.status === "timedOut" ? "Test timeout of " + testInfo.timeout + "ms exceeded." : "Test ended.";
-    await browser._disconnectFromReusedContext(closeReason);
+    await browserImpl._wrapApiCall(() => browserImpl._disconnectFromReusedContext(closeReason), { internal: true });
   },
   page: async ({ context, _reuseContext }, use) => {
     if (!_reuseContext) {
@@ -548,22 +553,24 @@ class ArtifactsRecorder {
     const screenshotOptions = typeof screenshot === "string" ? void 0 : screenshot;
     this._startedCollectingArtifacts = Symbol("startedCollectingArtifacts");
     this._screenshotRecorder = new SnapshotRecorder(this, normalizeScreenshotMode(screenshot), "screenshot", "image/png", ".png", async (page, path2) => {
-      await page.screenshot({ ...screenshotOptions, timeout: 5e3, path: path2, caret: "initial" });
+      await page._wrapApiCall(async () => {
+        await page.screenshot({ ...screenshotOptions, timeout: 5e3, path: path2, caret: "initial" });
+      }, { internal: true });
     });
   }
   async willStartTest(testInfo) {
     this._testInfo = testInfo;
-    testInfo._onDidFinishTestFunction = () => this.didFinishTestFunction();
+    testInfo._onDidFinishTestFunctions.push(() => this.didFinishTestFunction());
     this._screenshotRecorder.fixOrdinal();
     await Promise.all(this._playwright._allContexts().map((context) => this.didCreateBrowserContext(context)));
     const existingApiRequests = Array.from(this._playwright.request._contexts);
     await Promise.all(existingApiRequests.map((c) => this.didCreateRequestContext(c)));
   }
   async didCreateBrowserContext(context) {
-    await this._startTraceChunkOnContextCreation(context.tracing);
+    await this._startTraceChunkOnContextCreation(context, context.tracing);
   }
   async willCloseBrowserContext(context) {
-    await this._stopTracing(context.tracing);
+    await this._stopTracing(context, context.tracing);
     await this._screenshotRecorder.captureTemporary(context);
     await this._takePageSnapshot(context);
   }
@@ -575,18 +582,20 @@ class ArtifactsRecorder {
     if (this._pageSnapshot)
       return;
     const page = context.pages()[0];
+    if (!page)
+      return;
     try {
-      this._pageSnapshot = await page?.locator("body").ariaSnapshot({ timeout: 5e3 });
+      await page._wrapApiCall(async () => {
+        this._pageSnapshot = await page._snapshotForAI({ timeout: 5e3 });
+      }, { internal: true });
     } catch {
     }
   }
   async didCreateRequestContext(context) {
-    const tracing2 = context._tracing;
-    await this._startTraceChunkOnContextCreation(tracing2);
+    await this._startTraceChunkOnContextCreation(context, context._tracing);
   }
   async willCloseRequestContext(context) {
-    const tracing2 = context._tracing;
-    await this._stopTracing(tracing2);
+    await this._stopTracing(context, context._tracing);
   }
   async didFinishTestFunction() {
     await this._screenshotRecorder.maybeCapture();
@@ -596,10 +605,9 @@ class ArtifactsRecorder {
     const leftoverContexts = this._playwright._allContexts();
     const leftoverApiRequests = Array.from(this._playwright.request._contexts);
     await Promise.all(leftoverContexts.map(async (context2) => {
-      await this._stopTracing(context2.tracing);
+      await this._stopTracing(context2, context2.tracing);
     }).concat(leftoverApiRequests.map(async (context2) => {
-      const tracing2 = context2._tracing;
-      await this._stopTracing(tracing2);
+      await this._stopTracing(context2, context2._tracing);
     })));
     await this._screenshotRecorder.persistTemporary();
     const context = leftoverContexts[0];
@@ -622,30 +630,34 @@ class ArtifactsRecorder {
       }, void 0);
     }
   }
-  async _startTraceChunkOnContextCreation(tracing2) {
-    const options = this._testInfo._tracing.traceOptions();
-    if (options) {
-      const title = this._testInfo._tracing.traceTitle();
-      const name = this._testInfo._tracing.generateNextTraceRecordingName();
-      if (!tracing2[kTracingStarted]) {
-        await tracing2.start({ ...options, title, name });
-        tracing2[kTracingStarted] = true;
+  async _startTraceChunkOnContextCreation(channelOwner, tracing2) {
+    await channelOwner._wrapApiCall(async () => {
+      const options = this._testInfo._tracing.traceOptions();
+      if (options) {
+        const title = this._testInfo._tracing.traceTitle();
+        const name = this._testInfo._tracing.generateNextTraceRecordingName();
+        if (!tracing2[kTracingStarted]) {
+          await tracing2.start({ ...options, title, name });
+          tracing2[kTracingStarted] = true;
+        } else {
+          await tracing2.startChunk({ title, name });
+        }
       } else {
-        await tracing2.startChunk({ title, name });
-      }
-    } else {
-      if (tracing2[kTracingStarted]) {
-        tracing2[kTracingStarted] = false;
-        await tracing2.stop();
+        if (tracing2[kTracingStarted]) {
+          tracing2[kTracingStarted] = false;
+          await tracing2.stop();
+        }
       }
-    }
+    }, { internal: true });
   }
-  async _stopTracing(tracing2) {
-    if (tracing2[this._startedCollectingArtifacts])
-      return;
-    tracing2[this._startedCollectingArtifacts] = true;
-    if (this._testInfo._tracing.traceOptions() && tracing2[kTracingStarted])
-      await tracing2.stopChunk({ path: this._testInfo._tracing.maybeGenerateNextTraceRecordingPath() });
+  async _stopTracing(channelOwner, tracing2) {
+    await channelOwner._wrapApiCall(async () => {
+      if (tracing2[this._startedCollectingArtifacts])
+        return;
+      tracing2[this._startedCollectingArtifacts] = true;
+      if (this._testInfo._tracing.traceOptions() && tracing2[kTracingStarted])
+        await tracing2.stopChunk({ path: this._testInfo._tracing.maybeGenerateNextTraceRecordingPath() });
+    }, { internal: true });
   }
 }
 function renderTitle(type, method, params, title) {

package/lib/isomorphic/testTree.js

@@ -25,7 +25,7 @@ __export(testTree_exports, {
 });
 module.exports = __toCommonJS(testTree_exports);
 class TestTree {
-  constructor(rootFolder, rootSuite, loadErrors, projectFilters, pathSeparator) {
+  constructor(rootFolder, rootSuite, loadErrors, projectFilters, pathSeparator, hideFiles) {
     this._treeItemById = /* @__PURE__ */ new Map();
     this._treeItemByTestId = /* @__PURE__ */ new Map();
     const filterProjects = projectFilters && [...projectFilters.values()].some(Boolean);
@@ -43,10 +43,10 @@ class TestTree {
       hasLoadErrors: false
     };
     this._treeItemById.set(rootFolder, this.rootItem);
-    const visitSuite = (project, parentSuite, parentGroup) => {
-      for (const suite of parentSuite.suites) {
+    const visitSuite = (project, parentSuite, parentGroup, mode) => {
+      for (const suite of mode === "tests" ? [] : parentSuite.suites) {
         if (!suite.title) {
-          visitSuite(project, suite, parentGroup);
+          visitSuite(project, suite, parentGroup, "all");
           continue;
         }
         let group = parentGroup.children.find((item) => item.kind === "group" && item.title === suite.title);
@@ -66,9 +66,9 @@ class TestTree {
           };
           this._addChild(parentGroup, group);
         }
-        visitSuite(project, suite, group);
+        visitSuite(project, suite, group, "all");
       }
-      for (const test of parentSuite.tests) {
+      for (const test of mode === "suites" ? [] : parentSuite.tests) {
         const title = test.title;
         let testCaseItem = parentGroup.children.find((t) => t.kind !== "group" && t.title === title);
         if (!testCaseItem) {
@@ -124,8 +124,16 @@ class TestTree {
       if (filterProjects && !projectFilters.get(projectSuite.title))
         continue;
       for (const fileSuite of projectSuite.suites) {
-        const fileItem = this._fileItem(fileSuite.location.file.split(pathSeparator), true);
-        visitSuite(projectSuite.project(), fileSuite, fileItem);
+        if (hideFiles) {
+          visitSuite(projectSuite.project(), fileSuite, this.rootItem, "suites");
+          if (fileSuite.tests.length) {
+            const defaultDescribeItem = this._defaultDescribeItem();
+            visitSuite(projectSuite.project(), fileSuite, defaultDescribeItem, "tests");
+          }
+        } else {
+          const fileItem = this._fileItem(fileSuite.location.file.split(pathSeparator), true);
+          visitSuite(projectSuite.project(), fileSuite, fileItem, "all");
+        }
       }
     }
     for (const loadError of loadErrors) {
@@ -192,6 +200,25 @@ class TestTree {
     this._addChild(parentFileItem, fileItem);
     return fileItem;
   }
+  _defaultDescribeItem() {
+    let defaultDescribeItem = this._treeItemById.get("<anonymous>");
+    if (!defaultDescribeItem) {
+      defaultDescribeItem = {
+        kind: "group",
+        subKind: "describe",
+        id: "<anonymous>",
+        title: "<anonymous>",
+        location: { file: "", line: 0, column: 0 },
+        duration: 0,
+        parent: this.rootItem,
+        children: [],
+        status: "none",
+        hasLoadErrors: false
+      };
+      this._addChild(this.rootItem, defaultDescribeItem);
+    }
+    return defaultDescribeItem;
+  }
   sortAndPropagateStatus() {
     sortAndPropagateStatus(this.rootItem);
   }

package/lib/matchers/expect.js

@@ -222,26 +222,25 @@ class ExpectMetaInfoProxyHandler {
       const customMessage = this._info.message || "";
       const argsSuffix = computeArgsSuffix(matcherName, args);
       const defaultTitle = `${this._info.poll ? "poll " : ""}${this._info.isSoft ? "soft " : ""}${this._info.isNot ? "not " : ""}${matcherName}${argsSuffix}`;
-      const title = customMessage || defaultTitle;
+      const title = customMessage || `Expect ${(0, import_utils.escapeWithQuotes)(defaultTitle, '"')}`;
       const apiName = `expect${this._info.poll ? ".poll " : ""}${this._info.isSoft ? ".soft " : ""}${this._info.isNot ? ".not" : ""}.${matcherName}${argsSuffix}`;
       const stackFrames = (0, import_util.filteredStackTrace)((0, import_utils.captureRawStack)());
-      const category = matcherName === "toPass" || this._info.poll ? "test.step" : "expect";
-      const formattedTitle = category === "expect" ? title : `Expect "${title}"`;
       const stepInfo = {
-        category,
+        category: "expect",
         apiName,
-        title: formattedTitle,
+        title,
         params: args[0] ? { expected: args[0] } : void 0,
         infectParentStepsWithError: this._info.isSoft
       };
       const step = testInfo._addStep(stepInfo);
       const reportStepError = (e) => {
         const jestError = (0, import_matcherHint.isJestError)(e) ? e : null;
-        const error = jestError ? new import_matcherHint.ExpectError(jestError, customMessage, stackFrames) : e;
+        const expectError = jestError ? new import_matcherHint.ExpectError(jestError, customMessage, stackFrames) : void 0;
         if (jestError?.matcherResult.suggestedRebaseline) {
           step.complete({ suggestedRebaseline: jestError?.matcherResult.suggestedRebaseline });
           return;
         }
+        const error = expectError ?? e;
         step.complete({ error });
         if (this._info.isSoft)
           testInfo._failWithError(error);
@@ -260,7 +259,7 @@ class ExpectMetaInfoProxyHandler {
         finalizer();
         return result;
       } catch (e) {
-        reportStepError(e);
+        void reportStepError(e);
       }
     };
   }

package/lib/matchers/matcherHint.js

@@ -19,22 +19,42 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var matcherHint_exports = {};
 __export(matcherHint_exports, {
   ExpectError: () => ExpectError,
-  isJestError: () => isJestError,
-  kNoElementsFoundError: () => kNoElementsFoundError,
-  matcherHint: () => matcherHint
+  callLogText: () => callLogText,
+  formatMatcherMessage: () => formatMatcherMessage,
+  isJestError: () => isJestError
 });
 module.exports = __toCommonJS(matcherHint_exports);
 var import_utils = require("playwright-core/lib/utils");
-var import_utils2 = require("playwright-core/lib/utils");
-const kNoElementsFoundError = "<element(s) not found>";
-function matcherHint(state, locator, matcherName, expression, actual, matcherOptions, timeout) {
-  let header = state.utils.matcherHint(matcherName, expression, actual, matcherOptions).replace(/ \/\/ deep equality/, "") + "\n\n";
-  if (timeout)
-    header = import_utils2.colors.red(`Timed out ${timeout}ms waiting for `) + header;
-  if (locator)
-    header += `Locator: ${String(locator)}
+var import_expectBundle = require("../common/expectBundle");
+function formatMatcherMessage(state, details) {
+  const receiver = details.receiver ?? (details.locator ? "locator" : "page");
+  let message = (0, import_expectBundle.DIM_COLOR)("expect(") + (0, import_expectBundle.RECEIVED_COLOR)(receiver) + (0, import_expectBundle.DIM_COLOR)(")" + (state.promise ? "." + state.promise : "") + (state.isNot ? ".not" : "") + ".") + details.matcherName + (0, import_expectBundle.DIM_COLOR)("(") + (0, import_expectBundle.EXPECTED_COLOR)(details.expectation) + (0, import_expectBundle.DIM_COLOR)(")") + " failed\n\n";
+  const diffLines = details.printedDiff?.split("\n");
+  if (diffLines?.length === 2) {
+    details.printedExpected = diffLines[0];
+    details.printedReceived = diffLines[1];
+    details.printedDiff = void 0;
+  }
+  const align = !details.errorMessage && details.printedExpected?.startsWith("Expected:") && (!details.printedReceived || details.printedReceived.startsWith("Received:"));
+  if (details.locator)
+    message += `Locator: ${align ? " " : ""}${String(details.locator)}
+`;
+  if (details.printedExpected)
+    message += details.printedExpected + "\n";
+  if (details.printedReceived)
+    message += details.printedReceived + "\n";
+  if (details.timedOut && details.timeout)
+    message += `Timeout: ${align ? " " : ""}${details.timeout}ms
 `;
-  return header;
+  if (details.printedDiff)
+    message += details.printedDiff + "\n";
+  if (details.errorMessage) {
+    message += details.errorMessage;
+    if (!details.errorMessage.endsWith("\n"))
+      message += "\n";
+  }
+  message += callLogText(details.log);
+  return message;
 }
 class ExpectError extends Error {
   constructor(jestError, customMessage, stackFrames) {
@@ -50,10 +70,18 @@ class ExpectError extends Error {
 function isJestError(e) {
   return e instanceof Error && "matcherResult" in e;
 }
+const callLogText = (log) => {
+  if (!log || !log.some((l) => !!l))
+    return "";
+  return `
+Call log:
+${(0, import_expectBundle.DIM_COLOR)(log.join("\n"))}
+`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ExpectError,
-  isJestError,
-  kNoElementsFoundError,
-  matcherHint
+  callLogText,
+  formatMatcherMessage,
+  isJestError
 });