From 78c451e6e70f7c2cebeff5237bb654a9c1385a28 Mon Sep 17 00:00:00 2001
From: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:47:38 +0530
Subject: [PATCH] test: Cypress | CI Stabilize (#28609)

## Description
**Flaky fixes below specs:**
- QueryPane/S3_2_spec.ts
- QueryPane/GoogleSheets_spec.ts
- Widgets/TreeSelect/Single_Select_Tree_spec.ts
- ClientSide/Widgets/Select/Select3_Spec.ts

#### Type of change
- Script fix (non-breaking change which fixes an issue)

## Testing
#### How Has This Been Tested?
- [X] Cypress CI runs

## Checklist:
#### QA activity:
- [X] Added `Test Plan Approved` label after Cypress tests were reviewed
---
 .../ClientSide/Widgets/Select/Select3_Spec.ts |  1 +
 .../TreeSelect/Single_Select_Tree_spec.ts     | 19 ++++++++++++-------
 .../ServerSide/QueryPane/GoogleSheets_spec.ts |  1 +
 .../ServerSide/QueryPane/S3_2_spec.ts         |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
index 3f719923d2..52ad40d03c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select3_Spec.ts
@@ -68,6 +68,7 @@ describe("Select widget tests", function () {
       true,
     );
     agHelper.GetNClick(locators._selectOptionValue("Ulf Merbold"), 0, true);
+    agHelper.Sleep(); //for the new value to be set
     agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
       expect($selectedValue).to.eq("Ulf Merbold");
     });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
index 7a27a3b0fa..bb9e523234 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Single_Select_Tree_spec.ts
@@ -2,13 +2,18 @@ import formWidgetsPage from "../../../../../locators/FormWidgets.json";
 import publish from "../../../../../locators/publishWidgetspage.json";
 import commonlocators from "../../../../../locators/commonlocators.json";
 import widgetsPage from "../../../../../locators/Widgets.json";
-import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+import {
+  agHelper,
+  deployMode,
+  propPane,
+} from "../../../../../support/Objects/ObjectsCore";
 
 const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
 
 describe("Single Select Widget Functionality", function () {
   before(() => {
-    _.agHelper.AddDsl("TreeSelectDsl");
+    agHelper.AddDsl("TreeSelectDsl");
   });
 
   it("1. Check isDirty meta property", function () {
@@ -19,7 +24,7 @@ describe("Single Select Widget Functionality", function () {
     );
     // Change defaultText
     cy.openPropertyPane("singleselecttreewidget");
-    cy.updateCodeInput(".t--property-control-defaultselectedvalue", "GREEN");
+    propPane.UpdatePropertyFieldValue("Default selected value", "GREEN");
     // Check if isDirty is reset to false
     cy.get(".t--widget-textwidget").should("contain", "false");
     // Interact with UI
@@ -72,21 +77,21 @@ describe("Single Select Widget Functionality", function () {
 
   it("5. To Unchecked Visible Widget", function () {
     cy.togglebarDisable(commonlocators.visibleCheckbox);
-    _.deployMode.DeployApp();
+    deployMode.DeployApp();
     cy.get(
       publish.singleselecttreewidget + " " + ".rc-tree-select-single",
     ).should("not.exist");
-    _.deployMode.NavigateBacktoEditor();
+    deployMode.NavigateBacktoEditor();
   });
 
   it("6. To Check Visible Widget", function () {
     cy.openPropertyPane("singleselecttreewidget");
     cy.togglebar(commonlocators.visibleCheckbox);
-    _.deployMode.DeployApp();
+    deployMode.DeployApp();
     cy.get(
       publish.singleselecttreewidget + " " + ".rc-tree-select-single",
     ).should("be.visible");
-    _.deployMode.NavigateBacktoEditor();
+    deployMode.NavigateBacktoEditor();
   });
 
   it("7. To Check Option Not Found", function () {
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
index bfa843839a..ca04e767d3 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
@@ -36,6 +36,7 @@ describe(
     it("2. Bug # 25004 - Verify Google Sheets documentation opens", function () {
       dataSources.NavigateToDSCreateNew();
       dataSources.CreatePlugIn(pluginName);
+      agHelper.Sleep(); //for plugin page to settle
       deployMode.StubWindowNAssert(
         locators._learnMore,
         "querying-google-sheets#create-queries",
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
index 30ad1019c3..ca9f57b295 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts
@@ -442,6 +442,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications",
       dataSources.ValidateNSelectDropdown("Commands", "List files in bucket");
       agHelper.UpdateCodeInput(formControls.s3BucketName, bucketName);
       dataSources.RunQuery();
+      agHelper.Sleep(); //for CI runs
       agHelper.ScrollIntoView("." + dataSources._addSuggestedExisting);
       dataSources.AddSuggestedWidget(
         Widgets.Table,