Skip to content

test(commonTests): restore disabled focus target testing for non-"none" focus targets #7235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcfranco merged 1 commit into from
Jun 27, 2023
Merged

test(commonTests): restore disabled focus target testing for non-"none" focus targets #7235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 33 additions & 7 deletions packages/calcite-components/src/tests/commonTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,14 +972,18 @@ export function disabled(
return focusTarget === "host" ? tag : await page.evaluate(() => document.activeElement?.tagName.toLowerCase());
}

const getTabAndClickFocusTarget = async (page: E2EPage, tag: string): Promise<string[]> => {
const focusTarget = options.focusTarget;
const focusTargetString = await getFocusTarget(page, tag, focusTarget as FocusTarget);
const getTabAndClickFocusTarget = async (
page: E2EPage,
tag: string,
focusTarget: DisabledOptions["focusTarget"]
): Promise<string[]> => {
if (typeof focusTarget === "object") {
return [focusTarget.tab, focusTarget.click];
}

const [tabFocusTarget, clickFocusTarget] =
typeof focusTarget === "object" ? [focusTarget.tab, focusTarget.click] : [focusTargetString, focusTargetString];
const sameClickAndTabFocusTarget = await getFocusTarget(page, tag, focusTarget);

return [tabFocusTarget, clickFocusTarget];
return [sameClickAndTabFocusTarget, sameClickAndTabFocusTarget];
};

const getShadowFocusableCenterCoordinates = async (page: E2EPage, tabFocusTarget: string): Promise<number[]> => {
Expand Down Expand Up @@ -1028,7 +1032,7 @@ export function disabled(

await page.keyboard.press("Tab");

const [tabFocusTarget, clickFocusTarget] = await getTabAndClickFocusTarget(page, tag);
const [tabFocusTarget, clickFocusTarget] = await getTabAndClickFocusTarget(page, tag, options.focusTarget);

expect(tabFocusTarget).not.toBe("body");
await expectToBeFocused(page, tabFocusTarget);
Expand Down Expand Up @@ -1061,6 +1065,28 @@ export function disabled(
expect(spy).toHaveReceivedEventTimes(1);
}
});

component.setProperty("disabled", true);
await page.waitForChanges();

expect(component.getAttribute("aria-disabled")).toBe("true");

await resetFocusOrder();
await page.keyboard.press("Tab");
await expectToBeFocused(page, "body");

await page.mouse.click(shadowFocusableCenterX, shadowFocusableCenterY);
await expectToBeFocused(page, "body");

assertOnMouseAndPointerEvents(eventSpies, (spy) => {
if (spy.eventName === "click") {
// some components emit more than one click event (e.g., from calling `click()`),
// so we check if at least one event is received
expect(spy.length).toBeGreaterThanOrEqual(2);
} else {
expect(spy).toHaveReceivedEventTimes(eventsExpectedToBubble.includes(spy.eventName) ? 2 : 1);
}
});
});

it("events are no longer blocked right after enabling", async () => {
Expand Down