From 0bbd77afd05528dc88460d956cc1bc270392bfdb Mon Sep 17 00:00:00 2001 From: cristhianzl Date: Wed, 27 Mar 2024 16:29:48 -0300 Subject: [PATCH] merge fix --- .../tests/end-to-end/codeAreaModalComponent.spec.ts | 9 --------- src/frontend/tests/end-to-end/dropdownComponent.spec.ts | 5 ----- src/frontend/tests/end-to-end/floatComponent.spec.ts | 5 ----- src/frontend/tests/end-to-end/flowPage.spec.ts | 5 ----- src/frontend/tests/end-to-end/inputComponent.spec.ts | 5 ----- src/frontend/tests/end-to-end/intComponent.spec.ts | 5 ----- .../tests/end-to-end/keyPairListComponent.spec.ts | 5 ----- src/frontend/tests/end-to-end/nestedComponent.spec.ts | 5 ----- .../tests/end-to-end/promptModalComponent.spec.ts | 5 ----- src/frontend/tests/end-to-end/toggleComponent.spec.ts | 5 ----- 10 files changed, 54 deletions(-) diff --git a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts index 36ed0cc87..d814591f1 100644 --- a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts +++ b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts @@ -1,20 +1,11 @@ import { expect, test } from "@playwright/test"; test.beforeEach(async ({ page }) => { -<<<<<<< HEAD - await page.waitForTimeout(1000); - test.setTimeout(120000); -}); -test("CodeAreaModalComponent", async ({ page }) => { - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= // await page.waitForTimeout(2000); // test.setTimeout(120000); }); test("CodeAreaModalComponent", async ({ page }) => { await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts index 5f603bf86..8aae83ccd 100644 --- a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts +++ b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("dropDownComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/floatComponent.spec.ts b/src/frontend/tests/end-to-end/floatComponent.spec.ts index 900844345..530d1715c 100644 --- a/src/frontend/tests/end-to-end/floatComponent.spec.ts +++ b/src/frontend/tests/end-to-end/floatComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("FloatComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/flowPage.spec.ts b/src/frontend/tests/end-to-end/flowPage.spec.ts index 60e1fe428..4a3ba0a22 100644 --- a/src/frontend/tests/end-to-end/flowPage.spec.ts +++ b/src/frontend/tests/end-to-end/flowPage.spec.ts @@ -11,13 +11,8 @@ test.describe("Flow Page tests", () => { } test("save", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/inputComponent.spec.ts b/src/frontend/tests/end-to-end/inputComponent.spec.ts index da788b469..8254b9f79 100644 --- a/src/frontend/tests/end-to-end/inputComponent.spec.ts +++ b/src/frontend/tests/end-to-end/inputComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("InputComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/intComponent.spec.ts b/src/frontend/tests/end-to-end/intComponent.spec.ts index bb7da741e..dc4c80379 100644 --- a/src/frontend/tests/end-to-end/intComponent.spec.ts +++ b/src/frontend/tests/end-to-end/intComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("IntComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts index 66752146c..77ce208a6 100644 --- a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts +++ b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("KeypairListComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/nestedComponent.spec.ts b/src/frontend/tests/end-to-end/nestedComponent.spec.ts index 5e90f58ce..e14ae1b1b 100644 --- a/src/frontend/tests/end-to-end/nestedComponent.spec.ts +++ b/src/frontend/tests/end-to-end/nestedComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("NestedComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts index 6d058cee2..e511b0e0a 100644 --- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts +++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("PromptTemplateComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000); diff --git a/src/frontend/tests/end-to-end/toggleComponent.spec.ts b/src/frontend/tests/end-to-end/toggleComponent.spec.ts index 0e83256ac..aa4c4ab8a 100644 --- a/src/frontend/tests/end-to-end/toggleComponent.spec.ts +++ b/src/frontend/tests/end-to-end/toggleComponent.spec.ts @@ -4,13 +4,8 @@ test.beforeEach(async ({ page }) => { // test.setTimeout(120000); }); test("ToggleComponent", async ({ page }) => { -<<<<<<< HEAD - await page.goto("http://localhost:3000/"); - await page.waitForTimeout(1000); -======= await page.goto("/"); await page.waitForTimeout(2000); ->>>>>>> zustand/io/migration await page.locator('//*[@id="new-project-btn"]').click(); await page.waitForTimeout(1000);