Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/playwright/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/playwright/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "abledom-playwright",
"version": "0.0.18",
"version": "0.0.19",
"description": "AbleDOM tools for Playwright",
"author": "Marat Abdullin <marata@microsoft.com>",
"license": "MIT",
Expand Down
14 changes: 10 additions & 4 deletions tools/playwright/src/page-injector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ export async function attachAbleDOMMethodsToPage(
if (!locatorProto.__locatorIsMonkeyPatchedWithAbleDOM) {
locatorProto.__locatorIsMonkeyPatchedWithAbleDOM = true;

const reportAbleDOMIssues = async (self: Locator) => {
const reportAbleDOMIssues = async (
self: Locator,
timeoutOverride?: number,
) => {
const currentPage = self.page();

// Skip if the page is already closed
Expand All @@ -152,8 +155,11 @@ export async function attachAbleDOMMethodsToPage(
// Get options from the page object
const pageMarkAsRead = (currentPage as unknown as Record<string, unknown>)
.__abledomMarkAsRead as boolean | undefined;
const pageTimeout = (currentPage as unknown as Record<string, unknown>)
.__abledomTimeout as number | undefined;
const pageTimeout =
timeoutOverride === undefined
? ((currentPage as unknown as Record<string, unknown>)
.__abledomTimeout as number | undefined)
: timeoutOverride;

let result: {
hasInstance: boolean;
Expand Down Expand Up @@ -296,7 +302,7 @@ export async function attachAbleDOMMethodsToPage(
(locatorProto as unknown as LocatorProtoWithActions)[action] =
async function (this: Locator, ...args: unknown[]) {
const ret = await originalAction.apply(this, args);
await reportAbleDOMIssues(this);
await reportAbleDOMIssues(this, 0); // Setting the timeout for actions to 0 to avoid side effects.
return ret;
};
}
Expand Down