From df31f8def28d5125db101d799ba797218ee5dfba Mon Sep 17 00:00:00 2001 From: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:54:27 +0530 Subject: [PATCH] test: Cypress | CI Stabilize (#27622) ## Description - This PR does flaky fox for: - QueryPane/S3_2_spec.ts fix - Datasources/Oracle_Spec.ts fix - ClientSide/Widgets/Radio/Radio2_spec.ts - ServerSide/Datasources/Firestore_Basic_Spec.ts #### Type of change - Script update (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 --- app/client/cypress.config.ts | 3 +-- .../ClientSide/Widgets/Radio/Radio2_spec.ts | 9 ++++++--- .../Regression/ServerSide/Datasources/Oracle_Spec.ts | 12 +++--------- .../e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts | 1 + app/client/cypress/support/Pages/DataSources.ts | 3 +-- app/client/cypress_ci.config.ts | 3 +-- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/client/cypress.config.ts b/app/client/cypress.config.ts index 7cd1cc0aa5..d9c93b1f95 100644 --- a/app/client/cypress.config.ts +++ b/app/client/cypress.config.ts @@ -6,8 +6,7 @@ export default defineConfig({ requestTimeout: 60000, responseTimeout: 60000, pageLoadTimeout: 60000, - videoUploadOnPasses: false, - videoCompression: false, + video: true, numTestsKeptInMemory: 5, experimentalMemoryManagement: true, reporterOptions: { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts index 27be1968f1..f2f4fc4bab 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts @@ -310,7 +310,7 @@ describe("Radio Widget test cases", function () { .GetWidgetCSSHeight( locators._widgetInDeployed(draggableWidgets.RADIO_GROUP), ) - .then((currentHeight) => { + .then((currentHeight: any) => { const updatedHeight = parseInt(currentHeight?.split("px")[0]); expect(updatedHeight).to.be.greaterThan(130); }); @@ -319,6 +319,9 @@ describe("Radio Widget test cases", function () { agHelper.GetElement("@eleWidth").then((currentWidth) => { expect(currentWidth).to.be.greaterThan(420); }); + }); + + it("6. Validate general section in radio group - Part2", function () { //Disable - should throw error for non boolean values deployMode.NavigateBacktoEditor(); entityExplorer.SelectEntityByName("RadioGroup1", "Widgets"); @@ -365,7 +368,7 @@ describe("Radio Widget test cases", function () { }); }); - it("6. Validate set property methods for Radio group", () => { + it("7. Validate set property methods for Radio group", () => { deployMode.NavigateBacktoEditor(); //JS Object jsEditor.CreateJSObject( @@ -373,7 +376,7 @@ describe("Radio Widget test cases", function () { myVar1: [{ label:'test', value:'test'}], - myFun1 () { + myFun1 () { RadioGroup1.setData(this.myVar1); RadioGroup1.isVisible? RadioGroup1.setDisabled(true):RadioGroup1.setVisibility(false) } diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts index 69e3e3800d..65e9252418 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts @@ -171,15 +171,9 @@ describe("Validate Oracle DS", () => { agHelper.RenameWithInPane("CreateAircraft"); dataSources.EnterQuery(query); dataSources.RunQuery(); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dataSourceName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dataSourceName, - action: "Refresh", - }); - agHelper.AssertElementVisibility( - entityExplorer._entityNameInExplorer(guid.toUpperCase()), - ); + + dataSources.AssertTableInVirtuosoList(dataSourceName, guid.toUpperCase()); + query = `INSERT INTO ${guid} ( aircraft_id, aircraft_type, 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 794fa6abd8..e2bedabbcd 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 @@ -435,6 +435,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", it("6. Verify Adding Suggested widget with specific name functionality - S3 ", () => { entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE); + agHelper.Sleep(2500); //allowing sometime for widget to settle down dataSources.NavigateFromActiveDS(datasourceName, true); agHelper.GetObjectName().then(($queryName) => { entityExplorer.SelectEntityByName($queryName, "Queries/JS"); diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts index d7a8f3c826..0daa344b0f 100644 --- a/app/client/cypress/support/Pages/DataSources.ts +++ b/app/client/cypress/support/Pages/DataSources.ts @@ -283,8 +283,7 @@ export class DataSources { _stagingTab = "[data-testid='t--ds-data-filter-Staging']"; _graphQlDsFromRightPane = (dsName: string) => "//div/span[text() ='" + dsName + "']"; - _imgFireStoreLogo = - "img[src='https://assets.appsmith.com/logo/firestore.svg']"; + _imgFireStoreLogo = "//img[contains(@src, 'firestore.svg')]"; private _dsVirtuosoElement = (dsName: string) => `[data-testid='t--entity-item-${dsName}'] + div .t--schema-virtuoso-container`; private _dsVirtuosoList = `[data-test-id="virtuoso-item-list"]`; diff --git a/app/client/cypress_ci.config.ts b/app/client/cypress_ci.config.ts index bea3a6acde..d54d3bb449 100644 --- a/app/client/cypress_ci.config.ts +++ b/app/client/cypress_ci.config.ts @@ -5,8 +5,7 @@ export default defineConfig({ requestTimeout: 60000, responseTimeout: 60000, pageLoadTimeout: 60000, - videoUploadOnPasses: false, - videoCompression: false, + video: true, numTestsKeptInMemory: 5, experimentalMemoryManagement: true, reporterOptions: {