@empiricalrun/playwright-utils 0.22.4 → 0.22.6

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @empiricalrun/playwright-utils
 
+## 0.22.6
+
+### Patch Changes
+
+- Updated dependencies [6914e32]
+- Updated dependencies [22ef805]
+  - @empiricalrun/test-gen@0.46.9
+
+## 0.22.5
+
+### Patch Changes
+
+- c8d0e94: fix: revert to older prompt for overlay dismissals
+- 1fe5894: feat: add overlay dismissal to hover action
+- 1922ab3: chore: Refactor playwright overlay tests structure
+- Updated dependencies [353ee4e]
+- Updated dependencies [4c8ec02]
+- Updated dependencies [05329d3]
+- Updated dependencies [46b3e75]
+- Updated dependencies [ef4842b]
+- Updated dependencies [ea5f6ef]
+- Updated dependencies [8ad1b4c]
+- Updated dependencies [1922ab3]
+- Updated dependencies [295b611]
+  - @empiricalrun/test-gen@0.46.8
+
 ## 0.22.4
 
 ### Patch Changes

package/dist/overlay-tests/click.spec.js

@@ -1,123 +1,68 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const test_1 = require("@playwright/test");
-const http_server_1 = __importDefault(require("http-server"));
-const path_1 = __importDefault(require("path"));
-const test_2 = require("../test");
-const test = test_1.test.extend({
-    server: [
-        // eslint-disable-next-line no-empty-pattern
-        async ({}, use, workerInfo) => {
-            const port = 1234 + workerInfo.workerIndex;
-            const server = http_server_1.default.createServer({
-                root: path_1.default.join(process.cwd(), "test-data"),
-            });
-            await new Promise((resolve) => {
-                server.listen(port, () => {
-                    console.log(`Server running at http://localhost:${port}`);
-                    resolve();
-                });
-            });
-            await use({
-                port,
-                baseURL: `http://localhost:${port}`,
-            });
-            server.close();
-        },
-        { scope: "worker" },
-    ],
+const test_1 = require("../test");
+const fixtures_1 = require("./fixtures");
+fixtures_1.test.beforeEach(async ({ page }) => {
+    (0, test_1.injectLocatorHighlightScripts)(page, fixtures_1.test);
 });
-test.beforeEach(async ({ page }) => {
-    (0, test_2.injectLocatorHighlightScripts)(page, test);
-});
-test("should dismiss survicate for click", async ({ page, server }) => {
+(0, fixtures_1.test)("should dismiss survicate for hover", async ({ page, server }) => {
     await page.goto(`${server.baseURL}/survey.html`);
     // Assert that Survicate and button loads
-    await (0, test_1.expect)(page.getByText("Start survey")).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByText("Start survey")).toBeVisible();
     const targetButton = page.getByRole("button", { name: "Target" });
-    await (0, test_1.expect)(targetButton).toBeVisible();
+    await (0, fixtures_1.expect)(targetButton).toBeVisible();
     // Get initial z-index
     const initialZIndex = await targetButton.evaluate((el) => window.getComputedStyle(el).getPropertyValue("z-index"));
-    // Do the click, which should pass after survey overlay is dismissed
-    await targetButton.click();
+    // Do the hover, which should pass after survey overlay is dismissed
+    await targetButton.hover();
     // Assert z-index hasn't changed
     const finalZIndex = await targetButton.evaluate((el) => window.getComputedStyle(el).getPropertyValue("z-index"));
-    (0, test_1.expect)(finalZIndex).toBe(initialZIndex);
+    (0, fixtures_1.expect)(finalZIndex).toBe(initialZIndex);
 });
-test("should dismiss two-step overlay for click", async ({ page, server }) => {
+(0, fixtures_1.test)("should dismiss two-step overlay for click", async ({ page, server }) => {
     await page.goto(`${server.baseURL}/tos.html`);
     // Assert that button and overlay load
-    await (0, test_1.expect)(page.getByRole("button", { name: "Target" })).toBeVisible();
-    await (0, test_1.expect)(page.getByRole("heading", { name: "Terms of Service" })).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("button", { name: "Target" })).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("heading", { name: "Terms of Service" })).toBeVisible();
     // Do the click, which should pass
     await page.getByRole("button", { name: "Target" }).click();
-    await (0, test_1.expect)(page.getByRole("heading", { name: "Terms of Service" })).not.toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("heading", { name: "Terms of Service" })).not.toBeVisible();
 });
-test("should choose and dismiss the correct overlay", async ({ page, server, }) => {
+(0, fixtures_1.test)("should choose and dismiss the correct overlay", async ({ page, server, }) => {
     await page.goto(`${server.baseURL}/two-overlays.html`);
     // Assert that button and overlays load
-    await (0, test_1.expect)(page.getByRole("button", { name: "Target" })).toBeVisible();
-    await (0, test_1.expect)(page.getByText("This is a toast message")).toBeVisible();
-    await (0, test_1.expect)(page.getByRole("button", { name: "Close" })).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("button", { name: "Target" })).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByText("This is a toast message")).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("button", { name: "Close" })).toBeVisible();
     // Do the click, which should pass
     await page.getByRole("button", { name: "Target" }).click();
     // Assert correct overlay was dismissed
-    await (0, test_1.expect)(page.getByText("This is a toast message")).not.toBeVisible();
-    await (0, test_1.expect)(page.getByRole("button", { name: "Close" })).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByText("This is a toast message")).not.toBeVisible();
+    await (0, fixtures_1.expect)(page.getByRole("button", { name: "Close" })).toBeVisible();
 });
-test("should not return hover patch method in error stack", async ({ page, server, }) => {
-    await page.goto(`${server.baseURL}/tos.html`);
-    let error;
-    try {
-        await page.locator("div.some-random-class-name").hover();
-    }
-    catch (e) {
-        error = e;
-    }
-    (0, test_1.expect)(error).toBeDefined();
-    (0, test_1.expect)(error.stack).toBeDefined();
-    (0, test_1.expect)(error.stack).not.toContain("pw-locator-patch");
-    (0, test_1.expect)(error.stack).not.toContain("hover.ts");
-    const firstLineThatStartsWithAt = error
-        .stack.split("\n")
-        .find((line) => line.trim().startsWith("at "));
-    (0, test_1.expect)(firstLineThatStartsWithAt).toBeDefined();
-    (0, test_1.expect)(firstLineThatStartsWithAt).toContain("overlay-tests/click.spec.ts:97");
-});
-test("should not return click patch method in error stack", async ({ page, server, }) => {
-    await page.goto(`${server.baseURL}/tos.html`);
+(0, fixtures_1.test)("should return from master agent planner", async ({ page, server }) => {
+    await page.goto(`${server.baseURL}/no-overlay.html`);
     let error;
     try {
-        await page.locator("div.some-random-class-name").click();
+        // Click on element that is hidden below another button, which is not
+        // dismissible
+        await page.getByRole("button", { name: "Bottom Button" }).click();
     }
     catch (e) {
         error = e;
     }
-    (0, test_1.expect)(error).toBeDefined();
-    (0, test_1.expect)(error.stack).toBeDefined();
-    (0, test_1.expect)(error.stack).not.toContain("pw-locator-patch");
-    (0, test_1.expect)(error.stack).not.toContain("click.ts");
-    const firstLineThatStartsWithAt = error
-        .stack.split("\n")
-        .find((line) => line.trim().startsWith("at "));
-    (0, test_1.expect)(firstLineThatStartsWithAt).toBeDefined();
-    (0, test_1.expect)(firstLineThatStartsWithAt).toContain("overlay-tests/click.spec.ts:119");
-});
-test.fail("should return from master agent planner", async ({ page, server }) => {
-    await page.goto(`${server.baseURL}/no-overlay.html`);
-    // Deliberately click on a button that doesn't exist
-    await page.getByRole("button", { name: "Bottom Button" }).click();
+    // TODO: add better assertions with result from master agent
+    console.log(fixtures_1.test.info().annotations);
+    (0, fixtures_1.expect)(error).toBeDefined();
+    (0, fixtures_1.expect)(error.message).toContain('<button type="button" class="top-button">Top Button</button> intercepts pointer events');
 });
-test("should be able to pass through pf overlay", async ({ page, server }) => {
+(0, fixtures_1.test)("should be able to pass through pf overlay", async ({ page, server }) => {
     await page.goto(`${server.baseURL}/productfruits.html`);
     await page.locator("#sidebar-menu").getByText("Customise UI").click();
-    await (0, test_1.expect)(page.getByText("This is the Customise UI page")).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByText("This is the Customise UI page")).toBeVisible();
 });
-test("should be able to fill form and dismiss overlay", async ({ page, server, }) => {
+(0, fixtures_1.test)("should be able to fill form and dismiss overlay", async ({ page, server, }) => {
     await page.goto(`${server.baseURL}/overlay-form.html`);
     await page.getByRole("button", { name: "Target" }).click();
-    await (0, test_1.expect)(page.getByText("Target was clicked")).toBeVisible();
+    await (0, fixtures_1.expect)(page.getByText("Target was clicked")).toBeVisible();
 });

package/dist/overlay-tests/fixtures.d.ts

@@ -0,0 +1,10 @@
+type ServerFixture = {
+    port: number;
+    baseURL: string;
+};
+export declare const expect: import("@playwright/test").Expect<{}>;
+export declare const test: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions & {
+    server: ServerFixture;
+}>;
+export {};
+//# sourceMappingURL=fixtures.d.ts.map

package/dist/overlay-tests/fixtures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/overlay-tests/fixtures.ts"],"names":[],"mappings":"AAIA,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,MAAM,uCAAc,CAAC;AAClC,eAAO,MAAM,IAAI;YAA6B,aAAa;EAsBzD,CAAC"}

package/dist/overlay-tests/fixtures.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.test = exports.expect = void 0;
+const test_1 = require("@playwright/test");
+const http_server_1 = __importDefault(require("http-server"));
+const path_1 = __importDefault(require("path"));
+exports.expect = test_1.test.expect;
+exports.test = test_1.test.extend({
+    server: [
+        // eslint-disable-next-line no-empty-pattern
+        async ({}, use, workerInfo) => {
+            const port = 1234 + workerInfo.workerIndex;
+            const server = http_server_1.default.createServer({
+                root: path_1.default.join(process.cwd(), "test-data"),
+            });
+            await new Promise((resolve) => {
+                server.listen(port, () => {
+                    console.log(`Server running at http://localhost:${port}`);
+                    resolve();
+                });
+            });
+            await use({
+                port,
+                baseURL: `http://localhost:${port}`,
+            });
+            server.close();
+        },
+        { scope: "worker" },
+    ],
+});

package/dist/overlay-tests/patch.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=patch.spec.d.ts.map

package/dist/overlay-tests/patch.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch.spec.d.ts","sourceRoot":"","sources":["../../src/overlay-tests/patch.spec.ts"],"names":[],"mappings":""}

package/dist/overlay-tests/patch.spec.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_1 = require("../test");
+const fixtures_1 = require("./fixtures");
+fixtures_1.test.beforeEach(async ({ page }) => {
+    (0, test_1.injectLocatorHighlightScripts)(page, fixtures_1.test);
+});
+(0, fixtures_1.test)("should not return hover patch method in error stack", async ({ page, server, }) => {
+    await page.goto(`${server.baseURL}/tos.html`);
+    let error;
+    try {
+        await page.locator("div.some-random-class-name").hover();
+    }
+    catch (e) {
+        error = e;
+    }
+    (0, fixtures_1.expect)(error).toBeDefined();
+    (0, fixtures_1.expect)(error.stack).toBeDefined();
+    (0, fixtures_1.expect)(error.stack).not.toContain("pw-locator-patch");
+    (0, fixtures_1.expect)(error.stack).not.toContain("hover.ts");
+    const firstLineThatStartsWithAt = error
+        .stack.split("\n")
+        .find((line) => line.trim().startsWith("at "));
+    (0, fixtures_1.expect)(firstLineThatStartsWithAt).toBeDefined();
+    (0, fixtures_1.expect)(firstLineThatStartsWithAt).toContain("overlay-tests/patch.spec.ts:15");
+});
+(0, fixtures_1.test)("should not return click patch method in error stack", async ({ page, server, }) => {
+    await page.goto(`${server.baseURL}/tos.html`);
+    let error;
+    try {
+        await page.locator("div.some-random-class-name").click();
+    }
+    catch (e) {
+        error = e;
+    }
+    (0, fixtures_1.expect)(error).toBeDefined();
+    (0, fixtures_1.expect)(error.stack).toBeDefined();
+    (0, fixtures_1.expect)(error.stack).not.toContain("pw-locator-patch");
+    (0, fixtures_1.expect)(error.stack).not.toContain("click.ts");
+    const firstLineThatStartsWithAt = error
+        .stack.split("\n")
+        .find((line) => line.trim().startsWith("at "));
+    (0, fixtures_1.expect)(firstLineThatStartsWithAt).toBeDefined();
+    (0, fixtures_1.expect)(firstLineThatStartsWithAt).toContain("overlay-tests/patch.spec.ts:37");
+});

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.d.ts

@@ -1,6 +1,8 @@
 import { Page } from "@playwright/test";
+import type { TestFn } from "../../types";
 import { OverlayElement } from "./types";
 export declare function isErrorSupported(errorMessage: string | undefined): boolean;
 export declare function runAgentOnOverlay(pageRef: Page, element: OverlayElement | undefined): Promise<void>;
 export declare function extractInterceptingElement(errorMessage: string): OverlayElement | undefined;
+export declare function handleOverlayDismissal<T>(originalError: any, page: Page, actionName: string, testFn: TestFn, retryAction: () => Promise<T>): Promise<T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,iBAyDpC;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAUzC,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,iBAwDpC;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B;AAwBD,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,aAAa,EAAE,GAAG,EAClB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAC5B,OAAO,CAAC,CAAC,CAAC,CAyBZ"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractInterceptingElement = exports.runAgentOnOverlay = exports.isErrorSupported = void 0;
+exports.handleOverlayDismissal = exports.extractInterceptingElement = exports.runAgentOnOverlay = exports.isErrorSupported = void 0;
 const run_1 = require("@empiricalrun/test-gen/agent/master/run");
 const cache_1 = require("./cache");
 const utils_1 = require("./utils");
@@ -14,9 +14,19 @@ function isErrorSupported(errorMessage) {
 exports.isErrorSupported = isErrorSupported;
 async function runAgentOnOverlay(pageRef, element) {
     const text = await (0, utils_1.textContent)(pageRef, element);
+    const promptAddition = text
+        ? `
+  The popup can be identified with its text content:
+  
+  <popup_text_content>
+  ${text}
+  </popup_text_content>
+  `
+        : ``;
     let task = `
 Find a way to dismiss the popup. If the popup is non dismissible or there is no popup then return immediately.
-Also note that you just need to dismiss popup and do nothing else.`;
+Also note that you just need to dismiss popup and do nothing else.
+${promptAddition}`;
     if ((0, utils_1.isProductFruitsOverlay)(element)) {
         // Special handling for product fruits overlay: Overwrite the task
         task = `
@@ -35,19 +45,6 @@ The only way to work around this is to Click on any other sidebar link element.
 Don't reattempt the click on Target element, your job is done after the first click.
 `;
     }
-    else {
-        // Append overlay text content to the task for better context
-        const promptAddition = text
-            ? `
-  The popup can be identified with its text content:
-  
-  <popup_text_content>
-  ${text}
-  </popup_text_content>
-  `
-            : ``;
-        task += `${promptAddition}`;
-    }
     const { success } = await (0, cache_1.executeFromCache)({
         page: pageRef,
         dom: element?.interceptor,
@@ -127,3 +124,23 @@ function findAllMatches(str, regex) {
     }
     return matches;
 }
+async function handleOverlayDismissal(originalError, page, actionName, testFn, retryAction) {
+    let overlayElement = undefined;
+    try {
+        overlayElement = extractInterceptingElement(originalError.message);
+    }
+    catch (err) {
+        // Ignoring this error
+    }
+    (0, utils_1.annotateForReport)(testFn, `Attempting to auto-dismiss overlay: ${(0, utils_1.overlayDescription)(overlayElement)}`);
+    try {
+        await runAgentOnOverlay(page, overlayElement);
+    }
+    catch (agentError) {
+        (0, utils_1.annotateForReport)(testFn, `Error in overlay dismiss: ${agentError.toString()}`);
+        throw originalError;
+    }
+    (0, utils_1.annotateForReport)(testFn, `Overlay was dismissed, retrying original ${actionName} action`);
+    return await retryAction();
+}
+exports.handleOverlayDismissal = handleOverlayDismissal;

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.d.ts

@@ -1,6 +1,8 @@
 import type { Page } from "@playwright/test";
+import type { TestFn } from "../../types";
 import { OverlayElement } from "./types";
 export declare function overlayDescription(element: OverlayElement | undefined): string | undefined;
 export declare function isProductFruitsOverlay(element: OverlayElement | undefined): boolean | undefined;
 export declare function textContent(pageRef: Page, element: OverlayElement | undefined): Promise<string | undefined>;
+export declare function annotateForReport(testFn: TestFn, description: string): void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,sBASrE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,uBAKzE;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,+BAiDpC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,sBASrE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,uBAKzE;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,+BAiDpC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAMpE"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.textContent = exports.isProductFruitsOverlay = exports.overlayDescription = void 0;
+exports.annotateForReport = exports.textContent = exports.isProductFruitsOverlay = exports.overlayDescription = void 0;
 function overlayDescription(element) {
     if (element) {
         const { interceptor, parent } = element;
@@ -67,3 +67,11 @@ async function textContent(pageRef, element) {
     }
 }
 exports.textContent = textContent;
+function annotateForReport(testFn, description) {
+    console.log(`[Overlay dismissal]: ${description}`);
+    testFn.info().annotations.push({
+        type: "auto-dismiss-overlay",
+        description,
+    });
+}
+exports.annotateForReport = annotateForReport;

package/dist/test/scripts/pw-locator-patch/highlight/click.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"click.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/click.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAqBrC,wBAAgB,UAAU,CACxB,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,QA+Df"}
+{"version":3,"file":"click.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/click.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOrC,wBAAgB,UAAU,CACxB,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,QA8Cf"}

package/dist/test/scripts/pw-locator-patch/highlight/click.js

@@ -2,17 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchClick = void 0;
 const dismiss_overlays_1 = require("../dismiss-overlays");
-const utils_1 = require("../dismiss-overlays/utils");
-const utils_2 = require("../utils");
+const utils_1 = require("../utils");
 // Static flag to track if click has been patched
 const isClickPatched = new WeakMap();
-function annotateForReport(testFn, description) {
-    console.log(`[Overlay dismissal]: ${description}`);
-    testFn.info().annotations.push({
-        type: "auto-dismiss-overlay",
-        description,
-    });
-}
 function patchClick(LocatorClass, testFn) {
     if (isClickPatched.get(LocatorClass)) {
         return;
@@ -21,7 +13,7 @@ function patchClick(LocatorClass, testFn) {
     //ref: github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L255
     LocatorClass.prototype.click = async function (options) {
         let result;
-        const stepName = `locator.click(${(0, utils_2.description)(this)})`;
+        const stepName = `locator.click(${(0, utils_1.description)(this)})`;
         await testFn.step(stepName, async () => {
             try {
                 result = await originalClick.apply(this, [options]);
@@ -37,23 +29,8 @@ function patchClick(LocatorClass, testFn) {
                 if (!(0, dismiss_overlays_1.isErrorSupported)(originalError.message)) {
                     throw originalError;
                 }
-                let overlayElement = undefined;
-                try {
-                    overlayElement = (0, dismiss_overlays_1.extractInterceptingElement)(originalError.message);
-                }
-                catch (err) {
-                    // Ignoring this error
-                }
-                annotateForReport(testFn, `Attempting to auto-dismiss overlay: ${(0, utils_1.overlayDescription)(overlayElement)}`);
-                try {
-                    await (0, dismiss_overlays_1.runAgentOnOverlay)(this._frame._page, overlayElement);
-                }
-                catch (agentError) {
-                    annotateForReport(testFn, `Error in overlay dismiss: ${agentError.toString()}`);
-                    throw originalError;
-                }
-                annotateForReport(testFn, "Overlay was dismissed, retrying original action");
-                await originalClick.apply(this, [options]);
+                // Now that we've confirmed this is an overlay-related error, delegate to handleOverlayDismissal
+                result = await (0, dismiss_overlays_1.handleOverlayDismissal)(originalError, this._frame._page, "click", testFn, () => originalClick.apply(this, [options]));
             }
         }, { box: true });
         return result;

package/dist/test/scripts/pw-locator-patch/highlight/hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/hover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKrC,wBAAgB,UAAU,CACxB,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,QA2Bf"}
+{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/hover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAMrC,wBAAgB,UAAU,CACxB,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,QA+Cf"}

package/dist/test/scripts/pw-locator-patch/highlight/hover.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchHover = void 0;
+const dismiss_overlays_1 = require("../dismiss-overlays");
 const utils_1 = require("../utils");
 const isHoverPatched = new WeakMap();
 function patchHover(LocatorClass, testFn) {
@@ -15,11 +16,19 @@ function patchHover(LocatorClass, testFn) {
             try {
                 result = await originalHover.apply(this, [options]);
             }
-            catch (error) {
-                if (error instanceof Error) {
-                    Error.captureStackTrace(error, LocatorClass.prototype.hover);
+            catch (originalError) {
+                if (originalError instanceof Error) {
+                    Error.captureStackTrace(originalError, LocatorClass.prototype.hover);
                 }
-                throw error;
+                if (process.env.TEST_GEN_TOKEN) {
+                    // Happening during test-gen, we ignore this
+                    throw originalError;
+                }
+                if (!(0, dismiss_overlays_1.isErrorSupported)(originalError.message)) {
+                    throw originalError;
+                }
+                // Now that we've confirmed this is an overlay-related error, delegate to handleOverlayDismissal
+                result = await (0, dismiss_overlays_1.handleOverlayDismissal)(originalError, this._frame._page, "hover", testFn, () => originalHover.apply(this, [options]));
             }
             await (0, utils_1.highlight)(this);
         }, { box: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.22.4",
+  "version": "0.22.6",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -44,7 +44,7 @@
     "rimraf": "^6.0.1",
     "@empiricalrun/llm": "^0.9.35",
     "@empiricalrun/r2-uploader": "^0.3.8",
-    "@empiricalrun/test-gen": "^0.46.7"
+    "@empiricalrun/test-gen": "^0.46.9"
   },
   "scripts": {
     "dev": "tsc --build --watch",