From 4965dca58816be948ab1f16bf34dbce49d1da1c8 Mon Sep 17 00:00:00 2001 From: cristhianzl Date: Fri, 19 Apr 2024 12:38:57 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20(Makefile):=20remove=20unnecessa?= =?UTF-8?q?ry=20kill=20command=20for=20frontend=20server=20in=20run=5Ffron?= =?UTF-8?q?tend=20target=20=F0=9F=93=9D=20(frontend/.gitignore):=20add=20t?= =?UTF-8?q?est-results/=20directory=20to=20.gitignore=20=E2=AC=86=EF=B8=8F?= =?UTF-8?q?=20(frontend/package.json):=20upgrade=20@playwright/test=20depe?= =?UTF-8?q?ndency=20to=20version=201.43.1=20=F0=9F=92=A1=20(frontend/tests?= =?UTF-8?q?/end-to-end/filterEdge.spec.ts):=20update=20expected=20tooltip?= =?UTF-8?q?=20test=20ID=20from=20"tooltip-Models"=20to=20"tooltip-Model=20?= =?UTF-8?q?Specs"=20=F0=9F=92=A1=20(frontend/tests/end-to-end/filterEdge.s?= =?UTF-8?q?pec.ts):=20update=20expected=20test=20ID=20from=20"disclosure-m?= =?UTF-8?q?odels"=20to=20"disclosure-model=20specs"=20=F0=9F=92=A1=20(fron?= =?UTF-8?q?tend/tests/end-to-end/globalVariables.spec.ts):=20add=20hover?= =?UTF-8?q?=20and=20delete=20functionality=20to=20test=20for=20global=20va?= =?UTF-8?q?riables=20=F0=9F=92=A1=20(frontend/tests/end-to-end/saveCompone?= =?UTF-8?q?nts.spec.ts):=20add=20additional=20wait=20times=20to=20ensure?= =?UTF-8?q?=20modal=20is=20loaded=20before=20interacting=20with=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 1 - src/frontend/.gitignore | 4 ++++ src/frontend/package-lock.json | 24 +++++++++---------- src/frontend/package.json | 2 +- .../tests/end-to-end/filterEdge.spec.ts | 12 ++++------ .../tests/end-to-end/globalVariables.spec.ts | 7 ++++++ .../tests/end-to-end/saveComponents.spec.ts | 3 ++- 7 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 6d279e62f..75f7e89a1 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,6 @@ install_frontendc: cd src/frontend && rm -rf node_modules package-lock.json && npm install run_frontend: - @-kill -9 `lsof -t -i:3000` cd src/frontend && npm start tests_frontend: diff --git a/src/frontend/.gitignore b/src/frontend/.gitignore index a6dee659a..285b976e3 100644 --- a/src/frontend/.gitignore +++ b/src/frontend/.gitignore @@ -28,3 +28,7 @@ yarn-error.log* /playwright-report/ /blob-report/ /playwright/.cache/ +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 7b2e691b6..2ec5cdfb3 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -71,7 +71,7 @@ "zustand": "^4.4.7" }, "devDependencies": { - "@playwright/test": "^1.42.0", + "@playwright/test": "^1.43.1", "@swc/cli": "^0.1.62", "@swc/core": "^1.3.80", "@tailwindcss/typography": "^0.5.9", @@ -1759,12 +1759,12 @@ } }, "node_modules/@playwright/test": { - "version": "1.42.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz", - "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==", + "version": "1.43.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.43.1.tgz", + "integrity": "sha512-HgtQzFgNEEo4TE22K/X7sYTYNqEMMTZmFS8kTq6m8hXj+m1D8TgwgIbumHddJa9h4yl4GkKb8/bgAl2+g7eDgA==", "dev": true, "dependencies": { - "playwright": "1.42.1" + "playwright": "1.43.1" }, "bin": { "playwright": "cli.js" @@ -9780,11 +9780,11 @@ } }, "node_modules/playwright": { - "version": "1.42.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz", - "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==", + "version": "1.43.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.1.tgz", + "integrity": "sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==", "dependencies": { - "playwright-core": "1.42.1" + "playwright-core": "1.43.1" }, "bin": { "playwright": "cli.js" @@ -9797,9 +9797,9 @@ } }, "node_modules/playwright-core": { - "version": "1.42.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz", - "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==", + "version": "1.43.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.1.tgz", + "integrity": "sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==", "bin": { "playwright-core": "cli.js" }, diff --git a/src/frontend/package.json b/src/frontend/package.json index 6e3fbd344..338c8a541 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -93,7 +93,7 @@ }, "proxy": "http://127.0.0.1:7860", "devDependencies": { - "@playwright/test": "^1.42.0", + "@playwright/test": "^1.43.1", "@swc/cli": "^0.1.62", "@swc/core": "^1.3.80", "@tailwindcss/typography": "^0.5.9", diff --git a/src/frontend/tests/end-to-end/filterEdge.spec.ts b/src/frontend/tests/end-to-end/filterEdge.spec.ts index 898499b23..a5621e65b 100644 --- a/src/frontend/tests/end-to-end/filterEdge.spec.ts +++ b/src/frontend/tests/end-to-end/filterEdge.spec.ts @@ -69,7 +69,9 @@ test("LLMChain - Tooltip", async ({ page }) => { ).toBeVisible(); await page.waitForTimeout(2000); - await expect(page.getByTestId("tooltip-Models").first()).toBeVisible(); + await expect( + page.getByTestId("tooltip-Model Specs").first() + ).toBeVisible(); await page.getByTestId("icon-Search").click(); @@ -138,13 +140,7 @@ test("LLMChain - Filter", async ({ page }) => { ) .click(); - await page - .locator( - '//*[@id="react-flow-id"]/div/div[1]/div[1]/div/div[2]/div/div/div[2]/div[4]/div/button/div/div' - ) - .click(); - - await expect(page.getByTestId("disclosure-models")).toBeVisible(); + await expect(page.getByTestId("disclosure-model specs")).toBeVisible(); await expect(page.getByTestId("model_specsAnthropic").first()).toBeVisible(); await expect(page.getByTestId("model_specsAmazon Bedrock")).toBeVisible(); await expect(page.getByTestId("model_specsAzureChatOpenAI")).toBeVisible(); diff --git a/src/frontend/tests/end-to-end/globalVariables.spec.ts b/src/frontend/tests/end-to-end/globalVariables.spec.ts index bd3758a7d..7eec399fb 100644 --- a/src/frontend/tests/end-to-end/globalVariables.spec.ts +++ b/src/frontend/tests/end-to-end/globalVariables.spec.ts @@ -69,4 +69,11 @@ test("GlobalVariables", async ({ page }) => { await page.getByText("Save Variable", { exact: true }).click(); expect(page.getByText(credentialName, { exact: true })).not.toBeNull(); await page.getByText(credentialName, { exact: true }).isVisible(); + await page + .getByText(credentialName, { exact: true }) + .hover() + .then(async () => { + await page.getByTestId("icon-Trash2").last().click(); + await page.getByText("Delete", { exact: true }).nth(1).click(); + }); }); diff --git a/src/frontend/tests/end-to-end/saveComponents.spec.ts b/src/frontend/tests/end-to-end/saveComponents.spec.ts index 47b35bd27..b089abc9c 100644 --- a/src/frontend/tests/end-to-end/saveComponents.spec.ts +++ b/src/frontend/tests/end-to-end/saveComponents.spec.ts @@ -17,9 +17,10 @@ test.describe("save component tests", () => { while (modalCount === 0) { await page.locator('//*[@id="new-project-btn"]').click(); + await page.waitForTimeout(5000); modalCount = await page.getByTestId("modal-title")?.count(); } - + await page.waitForTimeout(1000); await page.getByTestId("blank-flow").click(); await page.waitForTimeout(1000);