From 70c083451eac690cdffa4748b35af7971d14936f Mon Sep 17 00:00:00 2001 From: cristhianzl Date: Fri, 15 Mar 2024 15:56:13 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20(index.tsx):=20add=20data-testid?= =?UTF-8?q?=20attributes=20to=20the=20toolbar=20select=20items=20to=20impr?= =?UTF-8?q?ove=20testability=20=E2=99=BB=EF=B8=8F=20(toolbarSelectItem/ind?= =?UTF-8?q?ex.tsx):=20remove=20unused=20import=20and=20refactor=20code=20t?= =?UTF-8?q?o=20include=20data-testid=20attribute=20in=20the=20rendered=20e?= =?UTF-8?q?lement=20=F0=9F=93=9D=20(index.ts):=20add=20dataTestId=20proper?= =?UTF-8?q?ty=20to=20the=20toolbarSelectItemProps=20type=20to=20reflect=20?= =?UTF-8?q?the=20addition=20of=20data-testid=20attribute=20in=20the=20comp?= =?UTF-8?q?onent=20=F0=9F=93=9D=20(auto=5Flogin.spec.ts):=20increase=20tim?= =?UTF-8?q?eout=20for=20page.waitForTimeout=20to=2016=20seconds=20and=20te?= =?UTF-8?q?st.setTimeout=20to=20140=20seconds=20to=20accommodate=20slower?= =?UTF-8?q?=20test=20execution=20=F0=9F=93=9D=20(keyPairListComponent.spec?= =?UTF-8?q?.ts):=20increase=20timeout=20for=20page.waitForTimeout=20to=202?= =?UTF-8?q?0=20seconds=20to=20accommodate=20slower=20test=20execution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/nodeToolbarComponent/index.tsx | 6 +++ .../toolbarSelectItem/index.tsx | 37 ++++++++++--------- src/frontend/src/types/components/index.ts | 3 +- .../tests/end-to-end/auto_login.spec.ts | 4 +- .../end-to-end/keyPairListComponent.spec.ts | 2 +- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 755bdc908..f17ad2537 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -453,6 +453,7 @@ export default function NodeToolbarComponent({ shift={false} value={"Edit"} icon={"Settings2"} + dataTestId="edit-button-modal" /> )} @@ -463,6 +464,7 @@ export default function NodeToolbarComponent({ shift={false} value={"Duplicate"} icon={"Copy"} + dataTestId="duplicate-button-modal" /> @@ -472,6 +474,7 @@ export default function NodeToolbarComponent({ shift={false} value={"Copy"} icon={"Clipboard"} + dataTestId="copy-button-modal" /> {isOutdated && ( @@ -482,6 +485,7 @@ export default function NodeToolbarComponent({ shift={false} value={"Update"} icon={"Code"} + dataTestId="update-button-modal" /> )} @@ -499,6 +503,7 @@ export default function NodeToolbarComponent({ styleObj={{ iconClasses: "relative top-0.5 -m-1 mr-1 h-6 w-6", }} + dataTestId="share-button-modal" /> )} @@ -523,6 +528,7 @@ export default function NodeToolbarComponent({ shift={true} value={"Docs"} icon={"FileText"} + dataTestId="docs-button-modal" /> {isMinimal && ( diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/toolbarSelectItem/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/toolbarSelectItem/index.tsx index 00e31e08a..725248554 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/toolbarSelectItem/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/toolbarSelectItem/index.tsx @@ -1,4 +1,3 @@ -import { useEffect } from "react"; import ForwardedIconComponent from "../../../../../components/genericIconComponent"; import { toolbarSelectItemProps } from "../../../../../types/components"; @@ -9,10 +8,10 @@ export default function ToolbarSelectItem({ value, icon, styleObj, + dataTestId, }: toolbarSelectItemProps) { - return ( -
+
) : ( - - {shift ? ( - "Ctrl" - ) : ( - "Ctrl +" - )} + + {shift ? "Ctrl" : "Ctrl +"} )} - {shift && ( - - )} - {keyboardKey} + {shift && ( + + )} + + {keyboardKey} +
); } diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index 55f33da16..ab32dab62 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -702,5 +702,6 @@ export type toolbarSelectItemProps = { ctrlClasses?: string; keyClasses?: string; valueClasses?: string; - } + }; + dataTestId: string; }; diff --git a/src/frontend/tests/end-to-end/auto_login.spec.ts b/src/frontend/tests/end-to-end/auto_login.spec.ts index 3208f754f..7e847cefd 100644 --- a/src/frontend/tests/end-to-end/auto_login.spec.ts +++ b/src/frontend/tests/end-to-end/auto_login.spec.ts @@ -1,7 +1,7 @@ import { test } from "@playwright/test"; test.beforeEach(async ({ page }) => { - await page.waitForTimeout(1000); - test.setTimeout(120000); + await page.waitForTimeout(16000); + test.setTimeout(140000); }); test.describe("Auto_login tests", () => { test("auto_login sign in", async ({ page }) => { diff --git a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts index 80e080dd7..53d454359 100644 --- a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts +++ b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts @@ -1,6 +1,6 @@ import { expect, test } from "@playwright/test"; test.beforeEach(async ({ page }) => { - await page.waitForTimeout(10000); + await page.waitForTimeout(20000); test.setTimeout(120000); }); test("KeypairListComponent", async ({ page }) => {