From f6bbc0f0d8a93e7a1295a467f1d6b5da4f12a50e Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sat, 2 Dec 2023 08:34:55 +0100
Subject: [PATCH 01/26] test: modifies playground

---
 agenta-web/cypress/e2e/playground.cy.ts                 | 2 +-
 agenta-web/src/components/Playground/Views/TestView.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index da8a2aad3a..a486e47257 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -4,7 +4,7 @@ describe("Playground Prompt Test", function () {
     })
 
     it("Should test prompt functionality in the Playground", () => {
-        cy.get('[data-cy="testview-input-parameters-0"]').type("Germany")
+        cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
         cy.get('[data-cy="testview-input-parameters-result"]').should("contain.text", "Loading...")
         cy.get('[data-cy="testview-input-parameters-result"]').should(
diff --git a/agenta-web/src/components/Playground/Views/TestView.tsx b/agenta-web/src/components/Playground/Views/TestView.tsx
index ba34c49c78..bb2300b99e 100644
--- a/agenta-web/src/components/Playground/Views/TestView.tsx
+++ b/agenta-web/src/components/Playground/Views/TestView.tsx
@@ -150,7 +150,7 @@ const BoxComponent: React.FC<BoxComponentProps> = ({
                 ) : (
                     inputParamsNames.map((key, index) => (
                         <TextArea
-                            data-cy={`testview-input-parameters-${index}`}
+                            data-cy={"testview-input-parameters"}
                             key={index}
                             value={testData[key]}
                             placeholder={renameVariables(key)}

From 283c5e61c275c9eec21686d173b4a97373880137 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 10:55:03 +0100
Subject: [PATCH 02/26] dummy key

---
 agenta-web/cypress/support/commands/evaluations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index 8959fdf7d4..4d60463add 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -103,7 +103,7 @@ Cypress.Commands.add("cleanupVariantAndTestset", () => {
 
 Cypress.Commands.add("addingOpenaiKey", () => {
     cy.visit("/settings")
-    cy.get('[data-cy="openai-api-input"]').eq(0).type(apiKey)
+    cy.get('[data-cy="openai-api-input"]').eq(0).type("apiKey")
     cy.get('[data-cy="openai-api-save"]').eq(0).click()
 })
 

From 066e345ad9ba7318fc59b191cf33af2e81634aa8 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 11:27:58 +0100
Subject: [PATCH 03/26] modifies playground test

---
 agenta-web/cypress/e2e/testset.cy.ts               | 2 +-
 agenta-web/cypress/support/commands/evaluations.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 14f7e10aa5..d57f72a67b 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -41,7 +41,7 @@ describe("Testsets crud and UI functionality", () => {
                         cy.get("div.ag-cell")
                             .eq(1)
                             .within(() => {
-                                cy.get("span").eq(0).dblclick()
+                                cy.get("span").should("be.visible").eq(0).dblclick()
                                 cy.get(".ag-input-field-input").type(country.country)
                             })
                         cy.get("div.ag-cell")
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index 4d60463add..8f8741f94a 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -64,7 +64,7 @@ Cypress.Commands.add("createVariantsAndTestsets", () => {
     cy.get('[data-cy="testset-name-input"]').type(testsetName)
     cy.wrap(testsetName).as("testsetName")
 
-    cy.get(".ag-row").should("have.length", 3)
+    cy.get(".ag-row").should("be.visible").should("have.length", 3)
     countries.forEach((country, index) => {
         cy.get(".ag-row")
             .eq(index)
@@ -103,7 +103,7 @@ Cypress.Commands.add("cleanupVariantAndTestset", () => {
 
 Cypress.Commands.add("addingOpenaiKey", () => {
     cy.visit("/settings")
-    cy.get('[data-cy="openai-api-input"]').eq(0).type("apiKey")
+    cy.get('[data-cy="openai-api-input"]').eq(0).type("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")
     cy.get('[data-cy="openai-api-save"]').eq(0).click()
 })
 

From 09ef5ac453bfce6eb38bf5d72e17ce8d5173c686 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 11:42:33 +0100
Subject: [PATCH 04/26] minor changes

---
 agenta-web/cypress.config.ts                       | 1 +
 agenta-web/cypress/support/commands/evaluations.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 6824bd5527..fe76429f99 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
+        specPattern: ["*/e2e/testset.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index 8f8741f94a..da7020b6b0 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -103,7 +103,7 @@ Cypress.Commands.add("cleanupVariantAndTestset", () => {
 
 Cypress.Commands.add("addingOpenaiKey", () => {
     cy.visit("/settings")
-    cy.get('[data-cy="openai-api-input"]').eq(0).type("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")
+    cy.get('[data-cy="openai-api-input"]').eq(0).type("apiKey")
     cy.get('[data-cy="openai-api-save"]').eq(0).click()
 })
 

From e5f72f152ee73722e4d0828b1793b2211dbf613e Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 12:19:09 +0100
Subject: [PATCH 05/26] improve test

---
 agenta-web/cypress/e2e/testset.cy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index d57f72a67b..fbd5a2bd75 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -47,7 +47,7 @@ describe("Testsets crud and UI functionality", () => {
                         cy.get("div.ag-cell")
                             .eq(2)
                             .within(() => {
-                                cy.get("span").eq(0).dblclick()
+                                cy.get("span").should("be.visible").eq(0).dblclick()
                                 cy.get(".ag-input-field-input").type(
                                     `The capital of ${country.country} is ${country.capital}.`,
                                 )

From a8e9ffbfaf483c66b6fc7f7bbf820a1b73003ba8 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 12:20:09 +0100
Subject: [PATCH 06/26] minor changes

---
 agenta-web/cypress.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index fe76429f99..4b2d402cd8 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -5,8 +5,8 @@ import {config} from "dotenv"
 config({path: ".env.local"})
 
 export default defineConfig({
-    video: false,
-    screenshotOnRunFailure: false,
+    // video: false,
+    // screenshotOnRunFailure: false,
     e2e: {
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,

From beb211fd4d4cc53a3bce6a73b2c1f23a28f07c34 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 14:05:36 +0100
Subject: [PATCH 07/26] Refactor Cypress test for populating a testset

---
 agenta-web/cypress.config.ts         |  4 ++--
 agenta-web/cypress/e2e/testset.cy.ts | 30 +++++++++++-----------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 4b2d402cd8..fe76429f99 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -5,8 +5,8 @@ import {config} from "dotenv"
 config({path: ".env.local"})
 
 export default defineConfig({
-    // video: false,
-    // screenshotOnRunFailure: false,
+    video: false,
+    screenshotOnRunFailure: false,
     e2e: {
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index fbd5a2bd75..993eaf5596 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -35,24 +35,18 @@ describe("Testsets crud and UI functionality", () => {
             cy.get('[data-cy="testset-name-input"]').type(testsetName)
             cy.get(".ag-row").should("have.length", 3)
             countries.forEach((country, index) => {
-                cy.get(".ag-row")
-                    .eq(index)
-                    .within(() => {
-                        cy.get("div.ag-cell")
-                            .eq(1)
-                            .within(() => {
-                                cy.get("span").should("be.visible").eq(0).dblclick()
-                                cy.get(".ag-input-field-input").type(country.country)
-                            })
-                        cy.get("div.ag-cell")
-                            .eq(2)
-                            .within(() => {
-                                cy.get("span").should("be.visible").eq(0).dblclick()
-                                cy.get(".ag-input-field-input").type(
-                                    `The capital of ${country.country} is ${country.capital}.`,
-                                )
-                            })
-                    })
+                const countryInputSelector = `.ag-row:eq(${index}) div.ag-cell:eq(1)`
+                const capitalInputSelector = `.ag-row:eq(${index}) div.ag-cell:eq(2)`
+
+                cy.get(countryInputSelector)
+                    .dblclick()
+                    .find(".ag-input-field-input")
+                    .type(country.country)
+
+                cy.get(capitalInputSelector)
+                    .dblclick()
+                    .find(".ag-input-field-input")
+                    .type(`The capital of ${country.country} is ${country.capital}.`)
             })
             cy.intercept("/api/testsets/*").as("saveTestsetRequest")
             cy.get('[data-cy="testset-save-button"]').click()

From 0a47cafb2176d9fe428aaeeeae209b3158d4ae61 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sun, 3 Dec 2023 14:24:01 +0100
Subject: [PATCH 08/26] test fix

---
 agenta-web/cypress/e2e/testset.cy.ts | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 993eaf5596..1ec29bbede 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -35,18 +35,22 @@ describe("Testsets crud and UI functionality", () => {
             cy.get('[data-cy="testset-name-input"]').type(testsetName)
             cy.get(".ag-row").should("have.length", 3)
             countries.forEach((country, index) => {
-                const countryInputSelector = `.ag-row:eq(${index}) div.ag-cell:eq(1)`
-                const capitalInputSelector = `.ag-row:eq(${index}) div.ag-cell:eq(2)`
-
-                cy.get(countryInputSelector)
-                    .dblclick()
-                    .find(".ag-input-field-input")
-                    .type(country.country)
-
-                cy.get(capitalInputSelector)
-                    .dblclick()
-                    .find(".ag-input-field-input")
-                    .type(`The capital of ${country.country} is ${country.capital}.`)
+                cy.get(".ag-row")
+                    .eq(index)
+                    .within(() => {
+                        cy.get("div.ag-cell")
+                            .eq(1).dblclick()
+                            .within(() => {
+                                cy.get(".ag-input-field-input").type(country.country)
+                            })
+                        cy.get("div.ag-cell")
+                            .eq(2).dblclick()
+                            .within(() => {
+                                cy.get(".ag-input-field-input").type(
+                                    `The capital of ${country.country} is ${country.capital}.`,
+                                )
+                            })
+                    })
             })
             cy.intercept("/api/testsets/*").as("saveTestsetRequest")
             cy.get('[data-cy="testset-save-button"]').click()

From 16367d191d2563037cb1fb47a14e1b57e38aae5c Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:23:16 +0100
Subject: [PATCH 09/26] modifies test for ag-grid inputs

---
 agenta-web/cypress/e2e/testset.cy.ts | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 1ec29bbede..0e3ea8dcaa 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -35,21 +35,12 @@ describe("Testsets crud and UI functionality", () => {
             cy.get('[data-cy="testset-name-input"]').type(testsetName)
             cy.get(".ag-row").should("have.length", 3)
             countries.forEach((country, index) => {
-                cy.get(".ag-row")
-                    .eq(index)
+                cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
                     .within(() => {
-                        cy.get("div.ag-cell")
-                            .eq(1).dblclick()
-                            .within(() => {
-                                cy.get(".ag-input-field-input").type(country.country)
-                            })
-                        cy.get("div.ag-cell")
-                            .eq(2).dblclick()
-                            .within(() => {
-                                cy.get(".ag-input-field-input").type(
-                                    `The capital of ${country.country} is ${country.capital}.`,
-                                )
-                            })
+                        cy.get('.ag-cell[col-id="country"]').type(country.country)
+                        cy.get('.ag-cell[col-id="correct_answer"]').type(
+                            `The capital of ${country.country} is ${country.capital}.`,
+                        )
                     })
             })
             cy.intercept("/api/testsets/*").as("saveTestsetRequest")

From d15e781f15fec94232955839e9f29e8793bb9d5c Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:33:33 +0100
Subject: [PATCH 10/26] assertion test

---
 agenta-web/cypress/e2e/testset.cy.ts | 44 +++++++++++++++-------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 0e3ea8dcaa..3eb7bc7f0c 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -33,27 +33,31 @@ describe("Testsets crud and UI functionality", () => {
         it("successfully creates the testset and navigates to the list", () => {
             const testsetName = randString(8)
             cy.get('[data-cy="testset-name-input"]').type(testsetName)
+            cy.get(".ag-cell").should("exist")
+            cy.get(".ag-cell").should("be.visible")
+            cy.get(".ag-row").should("exist")
+            cy.get(".ag-row").should("be.visible")
             cy.get(".ag-row").should("have.length", 3)
-            countries.forEach((country, index) => {
-                cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
-                    .within(() => {
-                        cy.get('.ag-cell[col-id="country"]').type(country.country)
-                        cy.get('.ag-cell[col-id="correct_answer"]').type(
-                            `The capital of ${country.country} is ${country.capital}.`,
-                        )
-                    })
-            })
-            cy.intercept("/api/testsets/*").as("saveTestsetRequest")
-            cy.get('[data-cy="testset-save-button"]').click()
-            //wait for the save api to complete
-            cy.wait("@saveTestsetRequest")
-            cy.clickLinkAndWait('[data-cy="app-testsets-link"]')
-            cy.url().should("include", "/testsets")
-
-            // validate that the new testset is in the list
-            cy.get('[data-cy="app-testset-list"]').as("table")
-            cy.get("@table").get(".ant-table-pagination li a").last().click()
-            cy.get("@table").contains(testsetName).as("tempTestSet").should("be.visible")
+            // countries.forEach((country, index) => {
+            //     cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
+            //         .within(() => {
+            //             cy.get('.ag-cell[col-id="country"]').type(country.country)
+            //             cy.get('.ag-cell[col-id="correct_answer"]').type(
+            //                 `The capital of ${country.country} is ${country.capital}.`,
+            //             )
+            //         })
+            // })
+            // cy.intercept("/api/testsets/*").as("saveTestsetRequest")
+            // cy.get('[data-cy="testset-save-button"]').click()
+            // //wait for the save api to complete
+            // cy.wait("@saveTestsetRequest")
+            // cy.clickLinkAndWait('[data-cy="app-testsets-link"]')
+            // cy.url().should("include", "/testsets")
+
+            // // validate that the new testset is in the list
+            // cy.get('[data-cy="app-testset-list"]').as("table")
+            // cy.get("@table").get(".ant-table-pagination li a").last().click()
+            // cy.get("@table").contains(testsetName).as("tempTestSet").should("be.visible")
         })
     })
 

From dd1518c5d734e6271686dde4266613518b4b75fb Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:41:46 +0100
Subject: [PATCH 11/26] assertion test

---
 agenta-web/cypress/e2e/testset.cy.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 3eb7bc7f0c..7acd1cc42e 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -38,6 +38,15 @@ describe("Testsets crud and UI functionality", () => {
             cy.get(".ag-row").should("exist")
             cy.get(".ag-row").should("be.visible")
             cy.get(".ag-row").should("have.length", 3)
+            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("be.visible")
+
+            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("have.length", 3)
+            cy.get('.ag-cell[col-id="country"]').should("be.visible")
+
+            cy.get('.ag-cell[col-id="country"]').should("have.length", 3)
+            cy.get('.ag-cell[col-id="correct_answer"]').should("be.visible")
+
+            cy.get('.ag-cell[col-id="correct_answer"]').should("have.length", 3)
             // countries.forEach((country, index) => {
             //     cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
             //         .within(() => {

From 0164ec74bac1ad47425d03286851b05bdf231079 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:42:30 +0100
Subject: [PATCH 12/26] typo

---
 agenta-web/cypress/e2e/testset.cy.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 7acd1cc42e..08bc3e35f4 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -40,13 +40,13 @@ describe("Testsets crud and UI functionality", () => {
             cy.get(".ag-row").should("have.length", 3)
             cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("be.visible")
 
-            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("have.length", 3)
+            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("exist")
             cy.get('.ag-cell[col-id="country"]').should("be.visible")
 
-            cy.get('.ag-cell[col-id="country"]').should("have.length", 3)
+            cy.get('.ag-cell[col-id="country"]').should("exist")
             cy.get('.ag-cell[col-id="correct_answer"]').should("be.visible")
 
-            cy.get('.ag-cell[col-id="correct_answer"]').should("have.length", 3)
+            cy.get('.ag-cell[col-id="correct_answer"]').should("exist")
             // countries.forEach((country, index) => {
             //     cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
             //         .within(() => {

From ddba284c3ef347a7ae3dcd23427be558543ab36d Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:51:37 +0100
Subject: [PATCH 13/26] modifies test

---
 agenta-web/cypress/e2e/testset.cy.ts | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 08bc3e35f4..95caab5750 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -38,24 +38,15 @@ describe("Testsets crud and UI functionality", () => {
             cy.get(".ag-row").should("exist")
             cy.get(".ag-row").should("be.visible")
             cy.get(".ag-row").should("have.length", 3)
-            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("be.visible")
-
-            cy.get(`.ag-center-cols-container .ag-row[row-index="0"]`).should("exist")
-            cy.get('.ag-cell[col-id="country"]').should("be.visible")
-
-            cy.get('.ag-cell[col-id="country"]').should("exist")
-            cy.get('.ag-cell[col-id="correct_answer"]').should("be.visible")
-
-            cy.get('.ag-cell[col-id="correct_answer"]').should("exist")
-            // countries.forEach((country, index) => {
-            //     cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
-            //         .within(() => {
-            //             cy.get('.ag-cell[col-id="country"]').type(country.country)
-            //             cy.get('.ag-cell[col-id="correct_answer"]').type(
-            //                 `The capital of ${country.country} is ${country.capital}.`,
-            //             )
-            //         })
-            // })
+            countries.forEach((country, index) => {
+                cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
+                    .within(() => {
+                        cy.get('.ag-cell').eq(1).type(country.country)
+                        cy.get('.ag-cell').eq(2).type(
+                            `The capital of ${country.country} is ${country.capital}.`,
+                        )
+                    })
+            })
             // cy.intercept("/api/testsets/*").as("saveTestsetRequest")
             // cy.get('[data-cy="testset-save-button"]').click()
             // //wait for the save api to complete

From 4a5300edf4107ec30e8b1f7245ac40db6ba262dc Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 15:59:27 +0100
Subject: [PATCH 14/26] revert test changes

---
 agenta-web/cypress.config.ts                  |  1 -
 agenta-web/cypress/e2e/testset.cy.ts          | 39 ++++++++-----------
 .../cypress/support/commands/evaluations.ts   | 24 +++---------
 3 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index fe76429f99..6824bd5527 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,6 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/testset.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/e2e/testset.cy.ts b/agenta-web/cypress/e2e/testset.cy.ts
index 95caab5750..839138ff92 100644
--- a/agenta-web/cypress/e2e/testset.cy.ts
+++ b/agenta-web/cypress/e2e/testset.cy.ts
@@ -33,31 +33,26 @@ describe("Testsets crud and UI functionality", () => {
         it("successfully creates the testset and navigates to the list", () => {
             const testsetName = randString(8)
             cy.get('[data-cy="testset-name-input"]').type(testsetName)
-            cy.get(".ag-cell").should("exist")
-            cy.get(".ag-cell").should("be.visible")
-            cy.get(".ag-row").should("exist")
-            cy.get(".ag-row").should("be.visible")
             cy.get(".ag-row").should("have.length", 3)
             countries.forEach((country, index) => {
-                cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`)
-                    .within(() => {
-                        cy.get('.ag-cell').eq(1).type(country.country)
-                        cy.get('.ag-cell').eq(2).type(
-                            `The capital of ${country.country} is ${country.capital}.`,
-                        )
-                    })
+                cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`).within(() => {
+                    cy.get(".ag-cell").eq(1).type(country.country)
+                    cy.get(".ag-cell")
+                        .eq(2)
+                        .type(`The capital of ${country.country} is ${country.capital}.`)
+                })
             })
-            // cy.intercept("/api/testsets/*").as("saveTestsetRequest")
-            // cy.get('[data-cy="testset-save-button"]').click()
-            // //wait for the save api to complete
-            // cy.wait("@saveTestsetRequest")
-            // cy.clickLinkAndWait('[data-cy="app-testsets-link"]')
-            // cy.url().should("include", "/testsets")
-
-            // // validate that the new testset is in the list
-            // cy.get('[data-cy="app-testset-list"]').as("table")
-            // cy.get("@table").get(".ant-table-pagination li a").last().click()
-            // cy.get("@table").contains(testsetName).as("tempTestSet").should("be.visible")
+            cy.intercept("/api/testsets/*").as("saveTestsetRequest")
+            cy.get('[data-cy="testset-save-button"]').click()
+            //wait for the save api to complete
+            cy.wait("@saveTestsetRequest")
+            cy.clickLinkAndWait('[data-cy="app-testsets-link"]')
+            cy.url().should("include", "/testsets")
+
+            // validate that the new testset is in the list
+            cy.get('[data-cy="app-testset-list"]').as("table")
+            cy.get("@table").get(".ant-table-pagination li a").last().click()
+            cy.get("@table").contains(testsetName).as("tempTestSet").should("be.visible")
         })
     })
 
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index da7020b6b0..14c112124f 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -66,24 +66,12 @@ Cypress.Commands.add("createVariantsAndTestsets", () => {
 
     cy.get(".ag-row").should("be.visible").should("have.length", 3)
     countries.forEach((country, index) => {
-        cy.get(".ag-row")
-            .eq(index)
-            .within(() => {
-                cy.get("div.ag-cell")
-                    .eq(1)
-                    .within(() => {
-                        cy.get("span").eq(0).dblclick()
-                        cy.get(".ag-input-field-input").type(country.country)
-                    })
-                cy.get("div.ag-cell")
-                    .eq(2)
-                    .within(() => {
-                        cy.get("span").eq(0).dblclick()
-                        cy.get(".ag-input-field-input").type(
-                            `The capital of ${country.country} is ${country.capital}.`,
-                        )
-                    })
-            })
+        cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`).within(() => {
+            cy.get(".ag-cell").eq(1).type(country.country)
+            cy.get(".ag-cell")
+                .eq(2)
+                .type(`The capital of ${country.country} is ${country.capital}.`)
+        })
     })
 
     cy.get('[data-cy="testset-save-button"]').click()

From 50776acfec2900e629edaac95efc4a890248ae38 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 17:24:06 +0100
Subject: [PATCH 15/26] modifies playground test

---
 agenta-web/cypress.config.ts            | 1 +
 agenta-web/cypress/e2e/playground.cy.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 6824bd5527..2d69a1f196 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
+        specPattern: ["*/e2e/playground.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index a486e47257..add6c290dd 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -6,8 +6,8 @@ describe("Playground Prompt Test", function () {
     it("Should test prompt functionality in the Playground", () => {
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
-        cy.get('[data-cy="testview-input-parameters-result"]').should("contain.text", "Loading...")
-        cy.get('[data-cy="testview-input-parameters-result"]').should(
+        cy.get('[data-cy^="testview-input-parameters-result"]').eq(0).should("contain.text", "Loading...")
+        cy.get('[data-cy^="testview-input-parameters-result"]').eq(0).should(
             "contain.text",
             "The capital of Germany is Berlin.",
         )

From 8b7eb0c186171b4d82a89ed1fb16a69ea6ca1e84 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Thu, 7 Dec 2023 17:45:07 +0100
Subject: [PATCH 16/26] playground test: minor changes

---
 agenta-web/cypress/e2e/playground.cy.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index add6c290dd..353cb355f0 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -6,8 +6,8 @@ describe("Playground Prompt Test", function () {
     it("Should test prompt functionality in the Playground", () => {
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
-        cy.get('[data-cy^="testview-input-parameters-result"]').eq(0).should("contain.text", "Loading...")
-        cy.get('[data-cy^="testview-input-parameters-result"]').eq(0).should(
+        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should("contain.text", "Loading...")
+        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
             "contain.text",
             "The capital of Germany is Berlin.",
         )

From 0ba4d8487b61b2967c529203c52bb78068debd51 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 00:09:05 +0100
Subject: [PATCH 17/26] format fix

---
 agenta-web/cypress/e2e/playground.cy.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index 353cb355f0..29bf8bf079 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -6,7 +6,10 @@ describe("Playground Prompt Test", function () {
     it("Should test prompt functionality in the Playground", () => {
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
-        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should("contain.text", "Loading...")
+        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
+            "contain.text",
+            "Loading...",
+        )
         cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
             "contain.text",
             "The capital of Germany is Berlin.",

From 7da2119f080af4eddeefebcd389f4aa1004957bd Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 00:10:45 +0100
Subject: [PATCH 18/26] revert changes to run all tests

---
 agenta-web/cypress.config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 2d69a1f196..6824bd5527 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,6 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/playground.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",

From 59594a606a2bf2a5c48d67381d989f73f17e850c Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 00:12:02 +0100
Subject: [PATCH 19/26] minor fix

---
 agenta-web/cypress/support/commands/evaluations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index 14c112124f..c96c984e84 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -91,7 +91,7 @@ Cypress.Commands.add("cleanupVariantAndTestset", () => {
 
 Cypress.Commands.add("addingOpenaiKey", () => {
     cy.visit("/settings")
-    cy.get('[data-cy="openai-api-input"]').eq(0).type("apiKey")
+    cy.get('[data-cy="openai-api-input"]').eq(0).type(apiKey)
     cy.get('[data-cy="openai-api-save"]').eq(0).click()
 })
 

From 82f7f5b46c7bd20fb4d70429e58c691942c3af10 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 00:15:38 +0100
Subject: [PATCH 20/26] revert changes

---
 agenta-web/src/components/Playground/Views/TestView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agenta-web/src/components/Playground/Views/TestView.tsx b/agenta-web/src/components/Playground/Views/TestView.tsx
index 57636d525a..3244a70240 100644
--- a/agenta-web/src/components/Playground/Views/TestView.tsx
+++ b/agenta-web/src/components/Playground/Views/TestView.tsx
@@ -150,7 +150,7 @@ const BoxComponent: React.FC<BoxComponentProps> = ({
                 ) : (
                     inputParamsNames.map((key, index) => (
                         <TextArea
-                            data-cy={"testview-input-parameters"}
+                            data-cy={`testview-input-parameters-${index}`}
                             key={index}
                             value={testData[key]}
                             placeholder={renameVariables(key)}

From 0f5a46931cb4b8919d7e1cdd64c162678a2e975d Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 01:19:50 +0100
Subject: [PATCH 21/26] cypress test: ab testing

---
 agenta-web/cypress.config.ts                        |  2 +-
 agenta-web/cypress/e2e/ab-testing-evaluation.cy.ts  | 13 +++++++------
 agenta-web/cypress/e2e/playground.cy.ts             |  5 ++++-
 agenta-web/cypress/support/commands/evaluations.ts  |  2 +-
 .../EvaluationTable/SingleModelEvaluationTable.tsx  |  2 +-
 .../EvaluationCardView/EvaluationVotePanel.tsx      |  2 ++
 .../Evaluations/EvaluationCardView/index.tsx        |  2 +-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 2d69a1f196..980b98b2fd 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/playground.cy.ts"],
+        specPattern: ["*/e2e/ab-testing-evaluation.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/e2e/ab-testing-evaluation.cy.ts b/agenta-web/cypress/e2e/ab-testing-evaluation.cy.ts
index a54245d469..2e58da24ab 100644
--- a/agenta-web/cypress/e2e/ab-testing-evaluation.cy.ts
+++ b/agenta-web/cypress/e2e/ab-testing-evaluation.cy.ts
@@ -69,15 +69,16 @@ describe("A/B Testing Evaluation workflow", () => {
 
             cy.clickLinkAndWait('[data-cy="start-new-evaluation-button"]')
             cy.url().should("include", "/human_a_b_testing")
+            cy.get('[data-cy="evalInstructionsShown-ok-btn"]').click()
+
+            cy.get('[data-cy="abTesting-app-variant-vote-button"]').should("not.exist")
+            cy.get('[data-cy="abTesting-both-bad-vote-button"]').should("not.exist")
             cy.wait(1000)
             cy.get('[data-cy="abTesting-run-all-button"]').click()
-            cy.get('[data-cy^="abTesting-app-variant-1-vote-button"]').should("not.be.disabled")
-            cy.get('[data-cy^="abTesting-app-variant-2-vote-button"]').should("not.be.disabled")
-            cy.get('[data-cy^="abTesting-both-bad-vote-button"]').should("not.be.disabled")
 
-            cy.get('[data-cy="abTesting-app-variant-1-vote-button-0"]').click()
-            cy.get('[data-cy="abTesting-app-variant-2-vote-button-1"]').click()
-            cy.get('[data-cy="abTesting-both-bad-vote-button-2"]').click()
+            cy.get('[data-cy="abTesting-app-variant-vote-button"]').eq(0).click()
+            cy.get('[data-cy="abTesting-app-variant-vote-button"]').eq(1).click()
+            cy.get('[data-cy="abTesting-both-bad-vote-button"]').click()
         })
     })
 
diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index 353cb355f0..29bf8bf079 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -6,7 +6,10 @@ describe("Playground Prompt Test", function () {
     it("Should test prompt functionality in the Playground", () => {
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
-        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should("contain.text", "Loading...")
+        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
+            "contain.text",
+            "Loading...",
+        )
         cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
             "contain.text",
             "The capital of Germany is Berlin.",
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index 14c112124f..c96c984e84 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -91,7 +91,7 @@ Cypress.Commands.add("cleanupVariantAndTestset", () => {
 
 Cypress.Commands.add("addingOpenaiKey", () => {
     cy.visit("/settings")
-    cy.get('[data-cy="openai-api-input"]').eq(0).type("apiKey")
+    cy.get('[data-cy="openai-api-input"]').eq(0).type(apiKey)
     cy.get('[data-cy="openai-api-save"]').eq(0).click()
 })
 
diff --git a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx
index a07a948022..5f69df6787 100644
--- a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx
+++ b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx
@@ -407,7 +407,7 @@ const SingleModelEvaluationTable: React.FC<EvaluationTableProps> = ({
                                 type="primary"
                                 onClick={runAllEvaluations}
                                 size="large"
-                                data-cy="abTesting-run-all-button"
+                                data-cy="single-model-run-all-button"
                             >
                                 Run All
                             </Button>
diff --git a/agenta-web/src/components/Evaluations/EvaluationCardView/EvaluationVotePanel.tsx b/agenta-web/src/components/Evaluations/EvaluationCardView/EvaluationVotePanel.tsx
index a8ae9830d4..06875a67f1 100644
--- a/agenta-web/src/components/Evaluations/EvaluationCardView/EvaluationVotePanel.tsx
+++ b/agenta-web/src/components/Evaluations/EvaluationCardView/EvaluationVotePanel.tsx
@@ -92,6 +92,7 @@ const ComparisonVote: React.FC<ComparisonVoteProps> = ({variants, onChange, valu
                         onClick={getOnClick(variant.variantId)}
                         type={value === variant.variantId ? "primary" : undefined}
                         danger
+                        data-cy="abTesting-app-variant-vote-button"
                     >
                         {String.fromCharCode(65 + ix)}: {variant.variantName}
                     </Button>
@@ -106,6 +107,7 @@ const ComparisonVote: React.FC<ComparisonVoteProps> = ({variants, onChange, valu
                 type={value === badId ? "primary" : undefined}
                 key={badId}
                 onClick={getOnClick(badId)}
+                data-cy="abTesting-both-bad-vote-button"
             >
                 Both are bad
             </Button>
diff --git a/agenta-web/src/components/Evaluations/EvaluationCardView/index.tsx b/agenta-web/src/components/Evaluations/EvaluationCardView/index.tsx
index ed1e9476a1..21a4549439 100644
--- a/agenta-web/src/components/Evaluations/EvaluationCardView/index.tsx
+++ b/agenta-web/src/components/Evaluations/EvaluationCardView/index.tsx
@@ -218,7 +218,7 @@ const EvaluationCardView: React.FC<Props> = ({
                     </li>
                 </ol>
             ),
-            okText: "Ok",
+            okText: <span data-cy="evalInstructionsShown-ok-btn">Ok</span>,
             cancelText: null,
             width: 500,
             onCancel: () => (opened.current = false),

From 5c4367e5cb5dc0c1126f50557207158c3158b722 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 01:27:35 +0100
Subject: [PATCH 22/26] modifies test specPattern

---
 agenta-web/cypress.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 2d69a1f196..980b98b2fd 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/playground.cy.ts"],
+        specPattern: ["*/e2e/ab-testing-evaluation.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",

From 3ce4275d31630c98d6cf41c3b56db019590553d4 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 10:17:57 +0100
Subject: [PATCH 23/26] cypress test: exact match fix

---
 agenta-web/cypress.config.ts                        | 1 -
 agenta-web/cypress/e2e/exact-match-evaluation.cy.ts | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 980b98b2fd..6824bd5527 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,6 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/ab-testing-evaluation.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
index 24812a6b32..bdd8a75245 100644
--- a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
+++ b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
@@ -49,9 +49,6 @@ describe("Exact Match Evaluation workflow", () => {
                     // Check if the text contains either "correct" or "wrong"
                     expect(text.includes("correct") || text.includes("wrong")).to.be.true
                 })
-
-            cy.get(".ant-statistic-content-value").first().should("contain", "3 out of 3")
-            cy.get(".ant-message-notice-content").should("exist")
         })
 
         it("Should display Exact Match Evaluation result", () => {

From 6bdcdd446acc3c018ed1023081d61b610bb7ee30 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 14:02:14 +0100
Subject: [PATCH 24/26] modifies playground test

---
 agenta-web/cypress.config.ts                            | 1 +
 agenta-web/cypress/e2e/playground.cy.ts                 | 7 ++-----
 agenta-web/src/components/Playground/Views/TestView.tsx | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 6824bd5527..2d69a1f196 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
+        specPattern: ["*/e2e/playground.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/cypress/e2e/playground.cy.ts b/agenta-web/cypress/e2e/playground.cy.ts
index 29bf8bf079..a486e47257 100644
--- a/agenta-web/cypress/e2e/playground.cy.ts
+++ b/agenta-web/cypress/e2e/playground.cy.ts
@@ -6,11 +6,8 @@ describe("Playground Prompt Test", function () {
     it("Should test prompt functionality in the Playground", () => {
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
-        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
-            "contain.text",
-            "Loading...",
-        )
-        cy.get('textarea[placeholder="Results will be shown here"].ant-input').should(
+        cy.get('[data-cy="testview-input-parameters-result"]').should("contain.text", "Loading...")
+        cy.get('[data-cy="testview-input-parameters-result"]').should(
             "contain.text",
             "The capital of Germany is Berlin.",
         )
diff --git a/agenta-web/src/components/Playground/Views/TestView.tsx b/agenta-web/src/components/Playground/Views/TestView.tsx
index b6d9bb5dfd..4033747cce 100644
--- a/agenta-web/src/components/Playground/Views/TestView.tsx
+++ b/agenta-web/src/components/Playground/Views/TestView.tsx
@@ -184,9 +184,8 @@ const BoxComponent: React.FC<BoxComponentProps> = ({
                 </Col>
             </Row>
             {!isChatVariant && (
-                <Row className={classes.row3}>
+                <Row className={classes.row3} data-cy="testview-input-parameters-result">
                     <TextArea
-                        data-cy="testview-input-parameters-result"
                         value={result}
                         rows={6}
                         placeholder="Results will be shown here"

From 7ce296d0835f30f8e79d94baf39156035c486c7f Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Fri, 8 Dec 2023 15:11:42 +0100
Subject: [PATCH 25/26] revert changes

---
 agenta-web/cypress.config.ts                            | 1 -
 agenta-web/src/components/Playground/Views/TestView.tsx | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress.config.ts b/agenta-web/cypress.config.ts
index 2d69a1f196..6824bd5527 100644
--- a/agenta-web/cypress.config.ts
+++ b/agenta-web/cypress.config.ts
@@ -11,7 +11,6 @@ export default defineConfig({
         baseUrl: "http://localhost",
         defaultCommandTimeout: 30000,
         requestTimeout: 10000,
-        specPattern: ["*/e2e/playground.cy.ts"],
     },
     env: {
         baseApiURL: "http://localhost/api",
diff --git a/agenta-web/src/components/Playground/Views/TestView.tsx b/agenta-web/src/components/Playground/Views/TestView.tsx
index 4033747cce..b6d9bb5dfd 100644
--- a/agenta-web/src/components/Playground/Views/TestView.tsx
+++ b/agenta-web/src/components/Playground/Views/TestView.tsx
@@ -184,8 +184,9 @@ const BoxComponent: React.FC<BoxComponentProps> = ({
                 </Col>
             </Row>
             {!isChatVariant && (
-                <Row className={classes.row3} data-cy="testview-input-parameters-result">
+                <Row className={classes.row3}>
                     <TextArea
+                        data-cy="testview-input-parameters-result"
                         value={result}
                         rows={6}
                         placeholder="Results will be shown here"

From ae238d737a0a5a2476ad66bd84ee285aee3a1be2 Mon Sep 17 00:00:00 2001
From: Kaosiso Ezealigo <ezealigokosiso@gmail.com>
Date: Sat, 9 Dec 2023 13:26:02 +0100
Subject: [PATCH 26/26] revert changes and fix failing tests

---
 agenta-web/cypress/e2e/exact-match-evaluation.cy.ts | 3 +++
 agenta-web/cypress/support/commands/evaluations.ts  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
index bdd8a75245..24812a6b32 100644
--- a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
+++ b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
@@ -49,6 +49,9 @@ describe("Exact Match Evaluation workflow", () => {
                     // Check if the text contains either "correct" or "wrong"
                     expect(text.includes("correct") || text.includes("wrong")).to.be.true
                 })
+
+            cy.get(".ant-statistic-content-value").first().should("contain", "3 out of 3")
+            cy.get(".ant-message-notice-content").should("exist")
         })
 
         it("Should display Exact Match Evaluation result", () => {
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index c96c984e84..71c47a5e99 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -33,7 +33,7 @@ Cypress.Commands.add("createVariant", () => {
         })
     })
 
-    cy.get('[data-cy="create-app-button"]').first().click()
+    cy.get('[data-cy^="create-app-button"]').eq(1).click()
     const appName = randString(5)
 
     cy.get('[data-cy="enter-app-name-modal"]')
@@ -64,7 +64,7 @@ Cypress.Commands.add("createVariantsAndTestsets", () => {
     cy.get('[data-cy="testset-name-input"]').type(testsetName)
     cy.wrap(testsetName).as("testsetName")
 
-    cy.get(".ag-row").should("be.visible").should("have.length", 3)
+    cy.get(".ag-row").should("have.length", 3)
     countries.forEach((country, index) => {
         cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`).within(() => {
             cy.get(".ag-cell").eq(1).type(country.country)