From ec375a33cb66d835cac5963b5c9ca5ef5de06960 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 27 Jun 2023 15:44:10 -0700 Subject: [PATCH] chore(linting): allow e2ePage variable naming (#7236) **Related Issue:** N/A ## Summary Prevents `unicorn/avoid-abbreviations` from flagging `e2ePage`. --- packages/calcite-components/.eslintrc.json | 3 +++ .../src/tests/commonTests.ts | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/calcite-components/.eslintrc.json b/packages/calcite-components/.eslintrc.json index 1fdc3a1fec8..65056ad0151 100644 --- a/packages/calcite-components/.eslintrc.json +++ b/packages/calcite-components/.eslintrc.json @@ -123,6 +123,9 @@ "unicorn/prevent-abbreviations": [ "error", { + "allowList": { + "e2ePage": true + }, "extendDefaultReplacements": false, "replacements": { "e": { diff --git a/packages/calcite-components/src/tests/commonTests.ts b/packages/calcite-components/src/tests/commonTests.ts index 481d99fb731..a5c53ae6de7 100644 --- a/packages/calcite-components/src/tests/commonTests.ts +++ b/packages/calcite-components/src/tests/commonTests.ts @@ -1251,12 +1251,12 @@ export function floatingUIOwner( export async function t9n(componentTestSetup: ComponentTestSetup): Promise { let component: E2EElement; - let E2Epage: E2EPage; + let page: E2EPage; let getCurrentMessages: () => Promise; beforeEach(async () => { - const { page, tag } = await getTagAndPage(componentTestSetup); - E2Epage = page; + const { page: e2ePage, tag } = await getTagAndPage(componentTestSetup); + page = e2ePage; component = await page.find(tag); getCurrentMessages = async (): Promise => { return page.$eval(tag, (component: HTMLElement & { messages: MessageBundle }) => component.messages); @@ -1277,7 +1277,7 @@ export async function t9n(componentTestSetup: ComponentTestSetup): Promise const messageOverride = { [firstMessageProp]: "override test" }; component.setProperty("messageOverrides", messageOverride); - await E2Epage.waitForChanges(); + await page.waitForChanges(); expect(await getCurrentMessages()).toEqual({ ...messages, @@ -1286,13 +1286,13 @@ export async function t9n(componentTestSetup: ComponentTestSetup): Promise // reset test changes component.setProperty("messageOverrides", undefined); - await E2Epage.waitForChanges(); + await page.waitForChanges(); } async function assertLangSwitch(): Promise { const enMessages = await getCurrentMessages(); const fakeBundleIdentifier = "__fake__"; - await E2Epage.evaluate( + await page.evaluate( (enMessages, fakeBundleIdentifier) => { const orig = window.fetch; window.fetch = async function (input, init) { @@ -1314,14 +1314,14 @@ export async function t9n(componentTestSetup: ComponentTestSetup): Promise ); component.setAttribute("lang", "es"); - await E2Epage.waitForChanges(); - await E2Epage.waitForTimeout(3000); + await page.waitForChanges(); + await page.waitForTimeout(3000); const esMessages = await getCurrentMessages(); expect(esMessages).toHaveProperty(fakeBundleIdentifier); // reset test changes component.removeAttribute("lang"); - await E2Epage.waitForChanges(); + await page.waitForChanges(); } }