test: Cypress | Replace static waits from Helpers + Flaky fixes

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js

@@ -9,7 +9,6 @@ const explorer = require("../../../../../locators/explorerlocators.json");
 const apiwidget = require("../../../../../locators/apiWidgetslocator.json");
 const dynamicInputLocators = require("../../../../../locators/DynamicInput.json");
 import gitSyncLocators from "../../../../../locators/gitSyncLocators";
-import ApiEditor from "../../../../../locators/ApiEditor";
 import homePageLocators from "../../../../../locators/HomePage";
 import datasource from "../../../../../locators/DatasourcesEditor.json";
 
@@ -135,17 +134,10 @@ describe("Git sync apps", { tags: ["@tag.Git"] }, function () {
       apiPage.RunAPI();
       apiPage.ResponseStatusCheck("200 OK");
       // curl import
-      dataSources.NavigateToDSCreateNew();
-      cy.get(ApiEditor.curlImage).click({ force: true });
-      cy.get("textarea").type(
-        'curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST ' +
+      dataSources.FillCurlNImport(
+        `curl -d \'{"name":"morpheus","job":"leader"}\' -H Content-Type:application/json -X POST '` +
           datasourceFormData["echoApiUrl"],
-        {
-          force: true,
-          parseSpecialCharSequences: false,
-        },
       );
-      cy.importCurl();
       cy.RunAPI();
       apiPage.ResponseStatusCheck("200 OK");
       cy.get("@curlImport").then((response) => {

app/client/cypress/limited-tests.txt

@@ -1,8 +1,10 @@
 # To run only limited tests - give the spec names in below format:
-cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+#cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+#cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
+
 
 
 # For running all specs - uncomment below:
-#cypress/e2e/**/**/*
+cypress/e2e/**/**/*
 
 #ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.

app/client/cypress/support/Pages/ApiPage.ts

@@ -77,7 +77,6 @@ export class ApiPage {
   private _paginationTypeLabels = ".t--apiFormPaginationType label";
   _saveAsDS = ".t--store-as-datasource";
   _responseStatus = ".t--response-status-code";
-  private _importedDataButton = ".t--show-imported-datas";
   public _responseTabHeader = "[data-testid=t--tab-headers]";
   public _autoGeneratedHeaderInfoIcon = (key: string) =>
     `.t--auto-generated-${key}-info`;
@@ -87,6 +86,7 @@ export class ApiPage {
   public _editorDS = ".t--datasource-editor";
   public _addMoreHeaderFieldButton = ".t--addApiHeader";
   public jsonBody = `.t--apiFormPostBody`;
+  private _entityName = ".t--entity-name";
 
   CreateApi(
     apiName = "",
@@ -115,8 +115,11 @@ export class ApiPage {
     //         });
     // }); // to check if Api1 = Api1 when Create Api invoked
 
-    if (apiName) this.agHelper.RenameWithInPane(apiName);
-    cy.get(this._resourceUrl).should("be.visible");
+    if (apiName) {
+      this.agHelper.RenameWithInPane(apiName);
+      this.agHelper.GetNAssertContains(this._entityName, apiName);
+    }
+    this.agHelper.AssertElementVisibility(this._resourceUrl);
     if (apiVerb != "GET") this.SelectAPIVerb(apiVerb);
   }
 
@@ -129,7 +132,6 @@ export class ApiPage {
   ) {
     this.CreateApi(apiName, apiVerb, aftDSSaved);
     this.EnterURL(url);
-    this.agHelper.Sleep(2000); // Added because api name edit takes some time to reflect in api sidebar after the call passes.
     this.AssertRunButtonDisability();
     if (queryTimeout != 10000) this.SetAPITimeout(queryTimeout);
   }
@@ -145,8 +147,7 @@ export class ApiPage {
       inputFieldName: "",
       apiOrQuery: "api",
     });
-    //this.agHelper.GetNClick(this._resourceUrl);
-    this.agHelper.Sleep();
+    this.agHelper.Sleep(500); //Is needed for the entered url value to be registered, else failing locally & CI
     if (evaluatedValue) {
       this.agHelper.VerifyEvaluatedValue(evaluatedValue);
     }
@@ -429,7 +430,6 @@ export class ApiPage {
     this.CreateGraphqlApi(apiName);
     this.EnterURL(url);
     this.agHelper.AssertAutoSave();
-    //this.agHelper.Sleep(2000);// Added because api name edit takes some time to reflect in api sidebar after the call passes.
     this.AssertRunButtonDisability();
     if (queryTimeout != 10000) this.SetAPITimeout(queryTimeout);
   }

app/client/cypress/support/Pages/AppSettings/ThemeSettings.ts

@@ -38,7 +38,7 @@ export class ThemeSettings {
       type == "Primary"
         ? this.locators._colorRingPrimary
         : this.locators._colorRingBackground;
-    this.agHelper.Sleep(200); //for themes to complete opening
+    this.agHelper.AssertContains("Theme settings");
     this.agHelper.GetNClick(colorType);
     if (typeof colorIndex == "number") {
       this.agHelper.GetNClick(this.locators._colorPickerV2Popover);

app/client/cypress/support/WorkspaceCommands.js

@@ -282,8 +282,7 @@ Cypress.Commands.add("CreateNewAppInNewWorkspace", () => {
     localStorage.setItem("appName", appName);
 
     // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(4000);
-    cy.get("#loading").should("not.exist");
+    agHelper.AssertElementAbsence("#loading", Cypress.config().pageLoadTimeout);
 
     cy.url().then((url) => {
       if (url.indexOf("/applications") > -1) {
@@ -292,7 +291,7 @@ Cypress.Commands.add("CreateNewAppInNewWorkspace", () => {
       }
     });
   });
-  cy.get("#sidebar").should("be.visible");
+  agHelper.AssertElementVisibility("#sidebar");
   assertHelper.AssertNetworkResponseData("@getPluginForm"); //for auth rest api
   assertHelper.AssertNetworkResponseData("@getPluginForm"); //for graphql