From 73dc4560a4b930d202fb1a788b008336fb5ee5ac Mon Sep 17 00:00:00 2001
From: vsvishalsharma <vsvishalsharma777@gmail.com>
Date: Mon, 3 Feb 2025 14:08:41 +0530
Subject: [PATCH 1/4] Updated Selectors in Validation E2E

---
 frontend/cypress/e2e/validation.cy.js            | 1 +
 frontend/cypress/pages/Validation.js             | 9 +++++----
 frontend/src/components/validation/SearchForm.js | 1 +
 frontend/src/components/validation/Validation.js | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/cypress/e2e/validation.cy.js b/frontend/cypress/e2e/validation.cy.js
index 3e0f947f6a..ca19c05c19 100644
--- a/frontend/cypress/e2e/validation.cy.js
+++ b/frontend/cypress/e2e/validation.cy.js
@@ -13,6 +13,7 @@ before("login", () => {
   loginPage.visit();
 });
 
+
 const navigateToValidationPage = (validationType) => {
   homePage = loginPage.goToHomePage();
   validation = homePage[`goToValidationBy${validationType}`]();
diff --git a/frontend/cypress/pages/Validation.js b/frontend/cypress/pages/Validation.js
index d6ed96eb82..0ee07629a7 100644
--- a/frontend/cypress/pages/Validation.js
+++ b/frontend/cypress/pages/Validation.js
@@ -8,20 +8,21 @@ class Validation {
   }
 
   validateTestUnit(unitType) {
-    cy.get("#cell-testName-0 > .sampleInfo").should("contain.text", unitType);
+    cy.get("[data-testid='sampleInfo']").should("contain.text", unitType);
   }
 
   enterLabNumberAndSearch(labNo) {
     cy.get("#accessionNumber").type(labNo);
-    cy.get(".cds--sm\\:col-span-4.cds--lg\\:col-span-16 > #submit").click();
-    cy.get("#cell-sampleInfo-0 > .sampleInfo").should("contain.text", labNo);
+    cy.get("[data-testid='Search-btn']").click();
+    cy.get("[data-testid='LabNo']").should("contain.text", labNo);
   }
 
   saveResults(note) {
     cy.get("#cell-save-0 > .cds--form-item > .cds--checkbox-label").click();
     cy.get("#resultList0\\.note").type(note);
-    cy.get(":nth-child(3) > #submit").click();
+    cy.get("[data-testis='Save-btn']").click();
   }
 }
 
 export default Validation;
+
diff --git a/frontend/src/components/validation/SearchForm.js b/frontend/src/components/validation/SearchForm.js
index b5f8b2f74b..ddcece663e 100644
--- a/frontend/src/components/validation/SearchForm.js
+++ b/frontend/src/components/validation/SearchForm.js
@@ -330,6 +330,7 @@ const SearchForm = (props) => {
                       type="submit"
                       id="submit"
                       style={{ marginTop: "16px" }}
+                      data-testid='Search-btn'
                     >
                       <FormattedMessage id="label.button.search" />
                     </Button>
diff --git a/frontend/src/components/validation/Validation.js b/frontend/src/components/validation/Validation.js
index eb1190b237..cac9a00f3a 100644
--- a/frontend/src/components/validation/Validation.js
+++ b/frontend/src/components/validation/Validation.js
@@ -212,7 +212,7 @@ const Validation = (props) => {
               hasIconOnly
               renderIcon={Copy}
             />
-            <div className="sampleInfo">
+            <div className="sampleInfo" data-testid='LabNo'>
               <br></br>
               {formatLabNum
                 ? convertAlphaNumLabNumForDisplay(row.accessionNumber)
@@ -234,7 +234,7 @@ const Validation = (props) => {
         );
       case "testName":
         return (
-          <div className="sampleInfo">
+          <div className="sampleInfo" data-testid='sampleInfo'>
             <br></br>
             {testName}
             <br></br>
@@ -470,6 +470,7 @@ const Validation = (props) => {
               onClick={() => handleSave(values)}
               id="submit"
               style={{ marginTop: "16px" }}
+              data-testis='Save-btn'
               disabled={isSubmitting}
             >
               <FormattedMessage id="label.button.save" />

From c82474979d72eb9fcf3fe9b7337bbd0b80c99637 Mon Sep 17 00:00:00 2001
From: vsvishalsharma <vsvishalsharma777@gmail.com>
Date: Mon, 3 Feb 2025 15:14:32 +0530
Subject: [PATCH 2/4] First changes

---
 frontend/cypress/pages/Validation.js             | 3 +--
 frontend/src/components/validation/SearchForm.js | 2 +-
 frontend/src/components/validation/Validation.js | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/cypress/pages/Validation.js b/frontend/cypress/pages/Validation.js
index 0ee07629a7..2ae21ba99b 100644
--- a/frontend/cypress/pages/Validation.js
+++ b/frontend/cypress/pages/Validation.js
@@ -18,11 +18,10 @@ class Validation {
   }
 
   saveResults(note) {
-    cy.get("#cell-save-0 > .cds--form-item > .cds--checkbox-label").click();
+    cy.get("[data-testid='Checkbox']").click();
     cy.get("#resultList0\\.note").type(note);
     cy.get("[data-testis='Save-btn']").click();
   }
 }
 
 export default Validation;
-
diff --git a/frontend/src/components/validation/SearchForm.js b/frontend/src/components/validation/SearchForm.js
index ddcece663e..7a28c03001 100644
--- a/frontend/src/components/validation/SearchForm.js
+++ b/frontend/src/components/validation/SearchForm.js
@@ -330,7 +330,7 @@ const SearchForm = (props) => {
                       type="submit"
                       id="submit"
                       style={{ marginTop: "16px" }}
-                      data-testid='Search-btn'
+                      data-testid="Search-btn"
                     >
                       <FormattedMessage id="label.button.search" />
                     </Button>
diff --git a/frontend/src/components/validation/Validation.js b/frontend/src/components/validation/Validation.js
index cac9a00f3a..a96fc5fce6 100644
--- a/frontend/src/components/validation/Validation.js
+++ b/frontend/src/components/validation/Validation.js
@@ -212,7 +212,7 @@ const Validation = (props) => {
               hasIconOnly
               renderIcon={Copy}
             />
-            <div className="sampleInfo" data-testid='LabNo'>
+            <div className="sampleInfo" data-testid="LabNo">
               <br></br>
               {formatLabNum
                 ? convertAlphaNumLabNumForDisplay(row.accessionNumber)
@@ -234,7 +234,7 @@ const Validation = (props) => {
         );
       case "testName":
         return (
-          <div className="sampleInfo" data-testid='sampleInfo'>
+          <div className="sampleInfo" data-testid="sampleInfo">
             <br></br>
             {testName}
             <br></br>
@@ -245,7 +245,7 @@ const Validation = (props) => {
       case "save":
         return (
           <>
-            <Field name="isAccepted">
+            <Field name="isAccepted" data-testid="Checkbox">
               {({ field }) => (
                 <Checkbox
                   id={"resultList" + row.id + ".isAccepted"}
@@ -470,7 +470,7 @@ const Validation = (props) => {
               onClick={() => handleSave(values)}
               id="submit"
               style={{ marginTop: "16px" }}
-              data-testis='Save-btn'
+              data-testis="Save-btn"
               disabled={isSubmitting}
             >
               <FormattedMessage id="label.button.save" />

From 962bebdab6f6f1c8db9be6f92d88c957a153db3a Mon Sep 17 00:00:00 2001
From: vsvishalsharma <vsvishalsharma777@gmail.com>
Date: Mon, 3 Feb 2025 15:55:58 +0530
Subject: [PATCH 3/4] fix:test failure

---
 frontend/cypress/pages/Validation.js          |  2 +-
 .../src/components/validation/Validation.js   | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/cypress/pages/Validation.js b/frontend/cypress/pages/Validation.js
index 2ae21ba99b..ebb98f7631 100644
--- a/frontend/cypress/pages/Validation.js
+++ b/frontend/cypress/pages/Validation.js
@@ -20,7 +20,7 @@ class Validation {
   saveResults(note) {
     cy.get("[data-testid='Checkbox']").click();
     cy.get("#resultList0\\.note").type(note);
-    cy.get("[data-testis='Save-btn']").click();
+    cy.get("[data-testid='Save-btn']").click();
   }
 }
 
diff --git a/frontend/src/components/validation/Validation.js b/frontend/src/components/validation/Validation.js
index a96fc5fce6..dd7170bb1a 100644
--- a/frontend/src/components/validation/Validation.js
+++ b/frontend/src/components/validation/Validation.js
@@ -245,17 +245,19 @@ const Validation = (props) => {
       case "save":
         return (
           <>
-            <Field name="isAccepted" data-testid="Checkbox">
-              {({ field }) => (
-                <Checkbox
-                  id={"resultList" + row.id + ".isAccepted"}
-                  name={"resultList[" + row.id + "].isAccepted"}
-                  labelText=""
-                  value={true}
-                  onChange={(e) => handleCheckBox(e, row.id)}
-                />
-              )}
-            </Field>
+            <div data-testid="Checkbox">
+              <Field name="isAccepted">
+                {({ field }) => (
+                  <Checkbox
+                    id={"resultList" + row.id + ".isAccepted"}
+                    name={"resultList[" + row.id + "].isAccepted"}
+                    labelText=""
+                    value={true}
+                    onChange={(e) => handleCheckBox(e, row.id)}
+                  />
+                )}
+              </Field>
+            </div>
           </>
         );
 
@@ -470,7 +472,7 @@ const Validation = (props) => {
               onClick={() => handleSave(values)}
               id="submit"
               style={{ marginTop: "16px" }}
-              data-testis="Save-btn"
+              data-testid="Save-btn"
               disabled={isSubmitting}
             >
               <FormattedMessage id="label.button.save" />

From 8befc92417bceddc62e9b2aaa5ce795064248dce Mon Sep 17 00:00:00 2001
From: vsvishalsharma <vsvishalsharma777@gmail.com>
Date: Wed, 5 Feb 2025 12:19:14 +0530
Subject: [PATCH 4/4] fix:formate the validation.cy.js

---
 frontend/cypress/e2e/validation.cy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/cypress/e2e/validation.cy.js b/frontend/cypress/e2e/validation.cy.js
index ca19c05c19..3e0f947f6a 100644
--- a/frontend/cypress/e2e/validation.cy.js
+++ b/frontend/cypress/e2e/validation.cy.js
@@ -13,7 +13,6 @@ before("login", () => {
   loginPage.visit();
 });
 
-
 const navigateToValidationPage = (validationType) => {
   homePage = loginPage.goToHomePage();
   validation = homePage[`goToValidationBy${validationType}`]();