fix: Update waiting time parameter to fix flaky editAdapter test (apache#3790)

* fix: Update waiting time parameter to fix flaky editAdapter test

* fix: Refactor saveEditProperty calls to use ConnectBtns for consistency

Author: tenthe

ui/cypress/support/utils/connect/ConnectBtns.ts

@@ -23,6 +23,7 @@ export class ConnectBtns {
     public static deleteAdapter() {
         return cy.dataCy('delete-adapter', { timeout: 10000 });
     }
+
     public static editAdapter() {
         return cy.dataCy('edit-adapter');
     }
@@ -99,6 +100,10 @@ export class ConnectBtns {
     }
 
     public static saveEditProperty() {
+        cy.dataCy('sp-save-edit-property', { timeout: 10000 }).should(
+            'have.length',
+            1,
+        );
         return cy.dataCy('sp-save-edit-property', { timeout: 10000 });
     }
 

ui/cypress/support/utils/connect/ConnectEventSchemaUtils.ts

@@ -48,7 +48,7 @@ export class ConnectEventSchemaUtils {
         ConnectBtns.markAsTimestampBtn().click();
 
         // Close
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
 
         this.eventSchemaNextBtnEnabled();
     }
@@ -80,7 +80,6 @@ export class ConnectEventSchemaUtils {
         }).click({ force: true });
         ConnectBtns.timestampStringRegex().should('have.value', timestampRegex);
 
-        ConnectBtns.saveEditProperty().should('have.length', 1);
         ConnectBtns.saveEditProperty().click();
     }
 
@@ -122,19 +121,15 @@ export class ConnectEventSchemaUtils {
             .contains('Multiply')
             .click();
 
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
         cy.dataCy('edit-' + propertyName.toLowerCase(), {
             timeout: 10000,
         }).click({ force: true });
         cy.dataCy('connect-schema-correction-value', { timeout: 10000 }).should(
             'have.value',
             value,
         );
-        cy.dataCy('sp-save-edit-property', { timeout: 10000 }).should(
-            'have.length',
-            1,
-        );
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
     }
 
     public static renameProperty(
@@ -196,7 +191,7 @@ export class ConnectEventSchemaUtils {
             propertyValue,
         );
 
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
 
         // validate that static value is persisted
         ConnectEventSchemaUtils.clickEditProperty(propertyName);
@@ -205,7 +200,7 @@ export class ConnectEventSchemaUtils {
             'have.value',
             propertyValue,
         );
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
     }
 
     public static deleteProperty(propertyName: string) {
@@ -251,16 +246,15 @@ export class ConnectEventSchemaUtils {
             .get('mat-option')
             .contains(dataType)
             .click();
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
         // validate that static value is persisted
         cy.dataCy('edit-' + propertyName.toLowerCase(), {
             timeout: 10000,
         }).click({
             force: true,
         });
         ConnectBtns.changeRuntimeType().contains(dataType);
-        cy.wait(1000);
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
     }
 
     private static checkIfWarningIsShown(warningIsShown: boolean) {

ui/cypress/support/utils/connect/ConnectUtils.ts

@@ -100,10 +100,11 @@ export class ConnectUtils {
     public static addMachineDataSimulator(
         name: string,
         persist: boolean = false,
+        waitingTime: string = '1000',
     ) {
         const builder = AdapterBuilder.create('Machine_Data_Simulator')
             .setName(name)
-            .addInput('input', 'wait-time-ms', '1000');
+            .addInput('input', 'wait-time-ms', waitingTime);
 
         if (persist) {
             builder.setTimestampProperty('timestamp').setStoreInDataLake();

ui/cypress/tests/connect/editAdapter.smoke.spec.ts

@@ -76,7 +76,7 @@ describe('Test Edit Adapter', () => {
     });
 
     it('Successfully edit adapter with persistence pipeline', () => {
-        ConnectUtils.addMachineDataSimulator('simulator', true);
+        ConnectUtils.addMachineDataSimulator('simulator', true, '100');
 
         ConnectUtils.goToConnect();
 

ui/cypress/tests/connect/editAdapterValuesAndFields.spec.ts

@@ -61,7 +61,7 @@ describe('Test Edit Adapter', () => {
             .get('mat-option')
             .contains('Multiply')
             .click();
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
         cy.dataCy('sp-event-schema-next-button').click();
 
         // Fill in adapter name and close view
@@ -96,7 +96,7 @@ describe('Test Edit Adapter', () => {
             .contains('Float')
             .click();
         cy.dataCy('connect-schema-correction-value').clear();
-        cy.dataCy('sp-save-edit-property').click();
+        ConnectBtns.saveEditProperty().click();
         cy.get('[class="general-panel"]').should(
             'include.text',
             'test-property-1',