Add filter in search box application to fix failed test (#406)

* Add filter in search box application to fix failed test

* Fixed the 'Force Update' behavior of Fleet-77

* Fixed backward compatibility of Force Update

Author: sbulage

tests/cypress/e2e/unit_tests/p1_fleet.spec.ts

@@ -110,9 +110,11 @@ describe('Test Self-Healing of resource modification when correctDrift option us
 
           if (correctDrift === 'yes') {
             // Resources will be restored, hence count will be 1/1.
+            cy.filterInSearchBox(appName);
             cy.verifyTableRow(0, appName, '1/1');
           } else {
             // Resource count will get increased as resource will not be restored
+            cy.filterInSearchBox(appName);
             cy.verifyTableRow(0, appName, '2/2');
           }
           cy.deleteAllFleetRepos();
@@ -135,6 +137,7 @@ describe('Test Self-Healing of resource modification when correctDrift option us
       cy.modifyDeployedApplication(appName);
 
       // Resource count will get increased as resource will not be restored
+      cy.filterInSearchBox(appName);
       cy.verifyTableRow(0, appName, '2/2');
 
       // Update exising GitRepo by enabling 'correctDrift'
@@ -154,6 +157,7 @@ describe('Test Self-Healing of resource modification when correctDrift option us
       cy.modifyDeployedApplication(appName);
 
       // Resources will be restored, hence count will be 1/1.
+      cy.filterInSearchBox(appName);
       cy.verifyTableRow(0, appName, '1/1');
 
       cy.deleteAllFleetRepos();

tests/cypress/support/commands.ts

@@ -320,8 +320,44 @@ Cypress.Commands.add('open3dotsMenu', (name, selection, checkNotInMenu=false) =>
       cy.wait(500);
       cy.get('body', { timeout: 10000 }).then(($body) => {
         if ($body.find('.card-title > h4').text().includes('Force Update')) {
-          cy.get('[data-testid="deactivate-driver-confirm"] > span').should('be.visible').click();
-        }    
+          const buttonSelector = '[data-testid="deactivate-driver-confirm"] > span';
+
+          cy.get(buttonSelector)
+            .should('be.visible')
+            .and('contain.text', 'Update')
+            .click();
+          // Below code repeat the Update process when object is modified.
+          // When there is no object modified state, then it will work as expected.
+          cy.wait(500);
+
+          cy.get('body').then(($body) => {
+            if ($body.find(buttonSelector).length === 0) {
+              cy.log('Button disappeared after click — Success');
+            } else {
+              cy.get(buttonSelector, { timeout: 30000 }).then(($btn) => {
+                const text = $btn.text().trim();
+
+                // Button label changed when object modified,
+                // it shows Update --> Updating... --> Error --> Update
+                if (text === 'Update') {
+                  cy.log('No need to click on Update again');
+                } else {
+                  cy.get(buttonSelector, { timeout: 30000 })
+                    .should(($btn) => {
+                      expect($btn.text().trim()).to.eq('Update');
+                    });
+
+                  cy.get(buttonSelector)
+                    .should('be.visible')
+                    .and('contain.text', 'Update')
+                    .click();
+
+                  cy.log('Second click complete');
+                }
+              });
+            }
+          });
+        }
       })
     };
     // Ensure dropdown is not present