fix flaky tests

Author: MCatherine1994

frontend/cypress/e2e/smoke-test-03/23-a-class-seedlot-reg-form-ownership.cy.ts

@@ -71,8 +71,18 @@ describe('A Class Seedlot Registration form, Ownership', () => {
       .then(($checkbox) => {
         if ($checkbox.is(':not(:checked)')) {
           cy.get('#default-owner-checkbox').check({ force: true });
-          // Save changes
-          cy.saveSeedlotRegFormProgress();
+
+          // Inline wait for save confirmation
+          cy.get('button.form-action-btn')
+            .contains('Save')
+            .click();
+
+          // Wait for the "Changes saved!" message
+          cy.contains('Changes saved!', { timeout: 30000 }).should('be.visible');
+
+          // Optional: wait until any inline loading spinners disappear
+          cy.get('svg.bx--inline-loading__spinner', { timeout: 30000 })
+            .should('not.exist');
         }
       })
       .should('be.checked');

frontend/cypress/e2e/smoke-test-03/24-a-class-seedlot-reg-form-extraction.cy.ts

@@ -200,33 +200,45 @@ describe('A Class Seedlot Registration form, Extraction and Storage', () => {
   });
 
   it('Extraction Date inputs', () => {
+    // Wait for end date input to be enabled
     cy.get('#ext-end-date')
+      .should('not.be.disabled')
       .clear()
       .type('2024-05-28')
       .blur();
 
-    // Invalid start date
+    // Wait for start date input to be enabled
     cy.get('#ext-start-date')
+      .should('not.be.disabled')
       .clear()
       .type('2024-05-29')
       .blur();
 
+    // Check invalid date error messages
     cy.get(`.${prefix}--date-picker`)
       .find(`.${prefix}--form-requirement`)
       .should('have.length', 2)
       .and('contain.text', regFormData.extraction.invalidDateErrorMsg);
 
-    // Valid start date
+    // Enter valid start date
     cy.get('#ext-start-date')
+      .should('not.be.disabled')
       .clear()
       .type('2024-05-27')
       .blur();
 
+    // Ensure extraction agency checkbox is checked
     cy.get('#ext-agency-tsc-checkbox')
+      .should('not.be.disabled')
       .check({ force: true });
 
     // Save changes
     cy.saveSeedlotRegFormProgress();
+
+    // Retry-friendly check: make sure step shows 'Complete'
+    cy.contains(`.${prefix}--progress-step-button`, 'Extraction')
+      .find(`.${prefix}--assistive-text`)
+      .should('contain.text', 'Complete');
   });
 
   it('Edit Storage agency section details', () => {

frontend/cypress/e2e/smoke-test-04/32-a-class-seedlot-reg-form-orchard.cy.ts

@@ -543,75 +543,42 @@ describe('A Class Seedlot Registration form, Orchard', () => {
   });
 
   it('Change pollen information', () => {
-    cy.get('#pollen-contam-yes')
-      .check({ force: true });
-
-    cy.get('#pollen-contam-yes')
-      .should('be.checked');
-
-    cy.get('#orchard-breading-perc')
-      .should('be.visible');
+    cy.get('#pollen-contam-yes').check({ force: true }).should('be.checked');
 
-    cy.get('#orchard-is-regional')
-      .should('be.visible');
-
-    cy.get('#orchard-is-regional')
-      .should('be.checked');
+    cy.get('#orchard-breading-perc').should('be.visible');
+    cy.get('#orchard-is-regional').should('be.visible').should('be.checked');
 
     cy.get('#orchard-breading-perc-helper-text')
       .should('have.text', regFormData.orchard.pollenHelperText);
 
-    // Check pollen breeding % error msg
-    cy.get('#orchard-breading-perc')
-      .clear()
-      .type('-1', { delay: TYPE_DELAY })
-      .blur();
-
-    cy.get('#orchard-breading-perc-error-msg')
-      .should('have.text', regFormData.orchard.pollenError);
-
-    cy.get('#orchard-breading-perc')
-      .clear()
-      .type('101', { delay: TYPE_DELAY })
-      .blur();
-
-    cy.get('#orchard-breading-perc-error-msg')
-      .should('have.text', regFormData.orchard.pollenError);
-
-    cy.get('#orchard-breading-perc')
-      .clear()
-      .type('21.1576', { delay: TYPE_DELAY })
-      .blur();
-
-    cy.get('#orchard-breading-perc-error-msg')
-      .should('have.text', regFormData.orchard.pollenError);
+    // Error checks
+    const invalidValues = ['-1', '101', '21.1576'];
+    invalidValues.forEach((val) => {
+      cy.get('#orchard-breading-perc').clear().type(val, { delay: TYPE_DELAY }).blur();
+      cy.get('#orchard-breading-perc-error-msg').should('have.text', regFormData.orchard.pollenError);
+    });
 
-    cy.get('#orchard-breading-perc')
-      .clear()
-      .type('5', { delay: TYPE_DELAY })
-      .blur();
+    cy.get('#orchard-breading-perc').clear().type('5', { delay: TYPE_DELAY }).blur();
 
     // Save changes
     cy.saveSeedlotRegFormProgress();
 
-    // Wait for 500ms to ensure the save is complete
-    cy.wait(HALF_SECOND);
-
-    // Check complete status of Orchard step
+    // Wait for the step to show 'Complete' instead of a fixed wait
     cy.contains(`.${prefix}--progress-step-button`, 'Orchard')
       .find(`.${prefix}--assistive-text`)
-      .should('have.text', 'Complete');
+      .should('contain.text', 'Complete');
   });
 
   it('Step complete status', () => {
-    // Press next button
     cy.get('.seedlot-registration-button-row')
       .find('button.form-action-btn')
       .contains('Next')
       .click();
 
-    // Check step complete status
+    // Retry-friendly check for complete step
     cy.get(`.${prefix}--progress-step--complete`)
-      .contains('Orchard');
+      .contains('Orchard')
+      .should('exist')
+      .and('be.visible');
   });
 });