From f473da619717d73d51e9f21d38912b2109e4e11d Mon Sep 17 00:00:00 2001 From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com> Date: Thu, 30 May 2024 10:09:04 +0530 Subject: [PATCH] test: remove startRoutesForDatasource from commands (#33688) Removed startRoutesForDatasource from Commands file and replaced with StartDataSourceRoutes from support/Pages/DataSources --- .../Binding/JSObject_Postgress_Table_spec.js | 2 +- .../CopyQuery_RenameDatasource_spec.js | 8 +------- .../ExplorerTests/Query_Datasource_spec.js | 2 +- .../ClientSide/OtherUIFeatures/GlobalSearch_spec.js | 2 +- .../Regression/ServerSide/GenerateCRUD/S3_Spec.js | 2 +- .../ServerSide/Params/ExecutionParams_spec.js | 2 +- .../QueryPane/AddWidgetTableAndBind_spec.js | 2 +- .../ServerSide/QueryPane/AddWidget_spec.js | 2 +- .../ServerSide/QueryPane/EmptyDataSource_spec.js | 2 +- .../Regression/ServerSide/QueryPane/S3_1_spec.js | 13 +------------ .../ServerSide/QueryPane/SwitchDatasource_spec.js | 2 +- .../Datasources/ElasticSearchDatasource_spec.js | 2 +- .../e2e/Sanity/Datasources/MySQLNoiseTest_spec.js | 2 +- .../cypress/e2e/Sanity/Datasources/MySQL_spec.js | 2 +- .../Sanity/Datasources/PostgresDatasource_spec.js | 2 +- .../Datasources/RedshiftDataSourceStub_spec.js | 2 +- .../e2e/Sanity/Datasources/SMTPDatasource_spec.js | 2 +- 17 files changed, 17 insertions(+), 34 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js index 5322bdf440..16fe89c8c6 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObject_Postgress_Table_spec.js @@ -13,7 +13,7 @@ describe( { tags: ["@tag.Binding"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + _.dataSources.StartDataSourceRoutes(); }); it("1. Create a query and populate response by choosing addWidget and validate in Table Widget & Bug 7413", () => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js index 40727f264d..e38696d624 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js @@ -19,15 +19,9 @@ describe( { tags: ["@tag.IDE"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); - // afterEach(function() { - // if (this.currentTest.state === "failed") { - // Cypress.runner.stop(); - // } - // }); - it("1. Create a query with dataSource in explorer, Create new Page", function () { cy.Createpage(pageid); EditorNavigation.SelectEntityByName("Page1", EntityType.Page); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js index 1968885bfa..4b12f33681 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js @@ -26,7 +26,7 @@ describe( }); beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create a page/moveQuery/rename/delete in explorer", function () { diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js index 1831273697..80ed386deb 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js @@ -19,7 +19,7 @@ describe("GlobalSearch", function () { }); beforeEach(() => { - cy.startRoutesForDatasource(); + _.dataSources.StartDataSourceRoutes(); }); it("1. Shows And Hides Using Keyboard Shortcuts", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js index 7023f81a57..ab6851b324 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js @@ -21,7 +21,7 @@ describe( let datasourceName; beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); cy.startInterceptRoutesForS3(); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js b/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js index f526610dae..25326fee04 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/Params/ExecutionParams_spec.js @@ -20,7 +20,7 @@ describe( agHelper.AddDsl("executionParamsDsl"); }); beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create a postgres datasource", function () { cy.NavigateToDatasourceEditor(); diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js index 70eb8d0330..db112e9af8 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidgetTableAndBind_spec.js @@ -22,7 +22,7 @@ describe( }); beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create a PostgresDataSource", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js index bed7890c6d..bd9f2a07af 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/AddWidget_spec.js @@ -11,7 +11,7 @@ describe( { tags: ["@tag.Datasource"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); cy.createPostgresDatasource(); cy.get("@saveDatasource").then((httpResponse) => { datasourceName = httpResponse.response.body.data.name; diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js index 89a387b62a..8a3eb744ef 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/EmptyDataSource_spec.js @@ -9,7 +9,7 @@ describe( { tags: ["@tag.Datasource"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create a empty datasource", function () { diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js index e3eb0f80d8..f3a4aa0f19 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js @@ -28,20 +28,9 @@ describe( }); beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); - // afterEach(function() { - // if (this.currentTest.state === "failed") { - // Cypress.runner.stop(); - // } - // }); - - // afterEach(() => { - // if (queryName) - // cy.actionContextMenuByEntityName(queryName); - // }); - before("Creates a new Amazon S3 datasource", function () { dataSources.CreateDataSource("S3"); cy.get("@dsName").then((dsName) => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js index 500f162d26..1165a9b6f9 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js @@ -2,7 +2,7 @@ import { dataSources, agHelper } from "../../../../support/Objects/ObjectsCore"; describe("Switch datasource", { tags: ["@tag.Datasource"] }, function () { let dsName_1, dsName_2, MongoDB; beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create postgres datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js index 7a95ee2f39..151311f959 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/ElasticSearchDatasource_spec.js @@ -9,7 +9,7 @@ describe( { tags: ["@tag.Datasource", "@tag.Sanity"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create elastic search datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js index 85e103863f..f1a4d43fb6 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js @@ -16,7 +16,7 @@ describe( beforeEach(() => { agHelper.AddDsl("noiseDsl"); - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Verify after killing MySQL session, app should not crash", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js index aae11a813a..97e5986301 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js @@ -8,7 +8,7 @@ describe( { tags: ["@tag.Datasource", "@tag.Sanity"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create, test, save then delete a MySQL datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js index d9140f5ad0..e127ee675f 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js @@ -7,7 +7,7 @@ describe( { tags: ["@tag.Datasource", "@tag.Sanity"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create, test, save then delete a postgres datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js index 1a757cbb02..2febce52d1 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js @@ -8,7 +8,7 @@ describe( { tags: ["@tag.Datasource", "@tag.Sanity"] }, function () { beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); it("1. Create, test, save then delete a Redshift datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js index 190def6fe0..e6da42b6a9 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js @@ -10,7 +10,7 @@ describe( function () { let SMTPDatasourceName; beforeEach(() => { - cy.startRoutesForDatasource(); + dataSources.StartDataSourceRoutes(); }); before(() => { agHelper.AddDsl("SMTPTestdsl");