From f4129a96aa1c88be355991fc1de3fe835480aed3 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 13:27:36 +0530 Subject: [PATCH 01/25] removed wait from Theme & Api helprs --- app/client/cypress/support/Pages/ApiPage.ts | 10 ++++------ .../cypress/support/Pages/AppSettings/ThemeSettings.ts | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 549d79843655..9f60334d7eca 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/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 = "", @@ -116,7 +116,8 @@ 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"); + this.agHelper.AssertElementVisibility(this._resourceUrl); + this.agHelper.GetNAssertContains(this._entityName, apiName); if (apiVerb != "GET") this.SelectAPIVerb(apiVerb); } @@ -129,7 +130,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 +145,7 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); - //this.agHelper.GetNClick(this._resourceUrl); - this.agHelper.Sleep(); + //this.agHelper.Sleep(); if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } @@ -429,7 +428,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); } diff --git a/app/client/cypress/support/Pages/AppSettings/ThemeSettings.ts b/app/client/cypress/support/Pages/AppSettings/ThemeSettings.ts index 5f6c57b06003..c91645b70f6d 100644 --- a/app/client/cypress/support/Pages/AppSettings/ThemeSettings.ts +++ b/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); From a2c76cc4f935aca3e751694f44920c89125c1bc8 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 13:34:18 +0530 Subject: [PATCH 02/25] run all --- app/client/cypress/limited-tests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 4807f105284d..babb3504e692 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,8 +1,8 @@ # 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 # 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. From 0eed8538dccf4f4548b7f11720bd358716fa723f Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 14:24:18 +0530 Subject: [PATCH 03/25] added check inside block --- app/client/cypress/support/Pages/ApiPage.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 9f60334d7eca..563f0b54e81b 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -115,9 +115,11 @@ export class ApiPage { // }); // }); // to check if Api1 = Api1 when Create Api invoked - if (apiName) this.agHelper.RenameWithInPane(apiName); + if (apiName) { + this.agHelper.RenameWithInPane(apiName); + this.agHelper.GetNAssertContains(this._entityName, apiName); + } this.agHelper.AssertElementVisibility(this._resourceUrl); - this.agHelper.GetNAssertContains(this._entityName, apiName); if (apiVerb != "GET") this.SelectAPIVerb(apiVerb); } From c3480db736f395bf3e76cea7b19a65927f5174cb Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 15:33:59 +0530 Subject: [PATCH 04/25] removed comment --- app/client/cypress/support/Pages/ApiPage.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 563f0b54e81b..c9cdfffcbd8e 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -147,7 +147,6 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); - //this.agHelper.Sleep(); if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } From 1eb4ce7a4bd16394b1da436bbfdc7610c198ee97 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 18:43:12 +0530 Subject: [PATCH 05/25] GitSyncedApps_spec fix --- .../ClientSide/Git/GitSync/GitSyncedApps_spec.js | 12 ++---------- app/client/cypress/limited-tests.txt | 3 ++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index f67471f2fa23..4e58c7dbfbd6 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/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) => { diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index babb3504e692..d736126cf2ae 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,8 +1,9 @@ # 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/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. From f0ff9debb6980b36aaf1e54a473a1f350f0c1c69 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Tue, 26 Dec 2023 18:57:41 +0530 Subject: [PATCH 06/25] CreateNewAppInNewWorkspace remove static wait --- app/client/cypress/limited-tests.txt | 5 +++-- app/client/cypress/support/Pages/ApiPage.ts | 1 + app/client/cypress/support/WorkspaceCommands.js | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index d736126cf2ae..2e96c0ea41f9 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,9 +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/Git/GitSync/GitSyncedApps_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. diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index c9cdfffcbd8e..2ada9881dfb8 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -147,6 +147,7 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); + this.agHelper.Sleep(500); //Is needed for the entered url value to be registered, else failing locally & CI if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js index 6722ee2c3e41..89b62af35a49 100644 --- a/app/client/cypress/support/WorkspaceCommands.js +++ b/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 From c0ec902785f198cf2d0648f0f9b38b71a2d2e8c8 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 13:58:50 +0530 Subject: [PATCH 07/25] run only --- app/client/cypress/limited-tests.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 2e96c0ea41f9..b810530dbb35 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,10 +1,11 @@ # 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/Git/GitSync/GitSyncedApps_spec.js +cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_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. From 588616b7a08faa13c410afa73ce3cbfad8a6553f Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 14:54:46 +0530 Subject: [PATCH 08/25] trial fix --- .../cypress/support/Pages/DataSources.ts | 22 +++++++------------ .../cypress/support/Pages/IDE/Sidebar.ts | 7 +++++- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts index 73630527f798..f2d0626830a7 100644 --- a/app/client/cypress/support/Pages/DataSources.ts +++ b/app/client/cypress/support/Pages/DataSources.ts @@ -59,7 +59,7 @@ export class DataSources { }; //Container KeyValuePair private _dsReviewSection = "[data-testid='t--ds-review-section']"; public _addNewDataSource = ".t--add-datasource-button"; - public _addNewDatasourceFromBlankScreen = + private _addNewDatasourceFromBlankScreen = ".t--add-datasource-button-blank-screen"; private _createNewPlgin = (pluginName: string) => ".t--plugin-name:contains('" + pluginName + "')"; @@ -447,20 +447,14 @@ export class DataSources { public NavigateToDSCreateNew() { AppSidebar.navigate(AppSidebarButton.Data); - Cypress._.times(2, () => { - cy.get("body").then(($body) => { - if ($body.find(this._addNewDataSource).length) { - this.agHelper.GetNClick(this._addNewDataSource, 0, true); - } else { - this.agHelper.GetNClick( - this._addNewDatasourceFromBlankScreen, - 0, - true, - ); - } - }); - this.agHelper.Sleep(); + cy.get("body").then(($body) => { + if ($body.find(this._addNewDataSource).length > 0) { + this.agHelper.GetNClick(this._addNewDataSource, 0, true); + } else { + this.agHelper.GetNClick(this._addNewDatasourceFromBlankScreen, 0, true); + } }); + this.agHelper.Sleep(); cy.get(this._newDatabases).should("be.visible"); } diff --git a/app/client/cypress/support/Pages/IDE/Sidebar.ts b/app/client/cypress/support/Pages/IDE/Sidebar.ts index 3f28f094d271..7cb6e025f69a 100644 --- a/app/client/cypress/support/Pages/IDE/Sidebar.ts +++ b/app/client/cypress/support/Pages/IDE/Sidebar.ts @@ -14,7 +14,12 @@ export class Sidebar { cy.get(this.locators.sidebar) .find(this.locators.sidebarButton(button)) .click({ force: true }) - .should("have.attr", "data-selected", willFail ? "false" : "true"); + .as("naviagteBtn"); + cy.get("@naviagteBtn").should( + "have.attr", + "data-selected", + willFail ? "false" : "true", + ); } assertVisible() { From c08c136d3593309a704d7a13b23644312c7f0ffb Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 15:58:22 +0530 Subject: [PATCH 09/25] trial fix --- app/client/cypress/support/Pages/IDE/Sidebar.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/client/cypress/support/Pages/IDE/Sidebar.ts b/app/client/cypress/support/Pages/IDE/Sidebar.ts index 7cb6e025f69a..eca5740173d9 100644 --- a/app/client/cypress/support/Pages/IDE/Sidebar.ts +++ b/app/client/cypress/support/Pages/IDE/Sidebar.ts @@ -13,9 +13,9 @@ export class Sidebar { this.assertVisible(); cy.get(this.locators.sidebar) .find(this.locators.sidebarButton(button)) - .click({ force: true }) - .as("naviagteBtn"); - cy.get("@naviagteBtn").should( + .as("navigateBtn") + .click({ force: true }); + cy.get("@navigateBtn").should( "have.attr", "data-selected", willFail ? "false" : "true", From bf0e0e2abc108b6f8d143ec1fd33e572b3673c93 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 15:59:57 +0530 Subject: [PATCH 10/25] trial fix --- app/client/cypress/support/Pages/DataSources.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts index f2d0626830a7..815e75b21912 100644 --- a/app/client/cypress/support/Pages/DataSources.ts +++ b/app/client/cypress/support/Pages/DataSources.ts @@ -454,8 +454,7 @@ export class DataSources { this.agHelper.GetNClick(this._addNewDatasourceFromBlankScreen, 0, true); } }); - this.agHelper.Sleep(); - cy.get(this._newDatabases).should("be.visible"); + this.agHelper.AssertElementVisibility(this._newDatabases); } CreateMockDB(dbName: "Users" | "Movies"): Cypress.Chainable { From 9229e4f2d032db026df29b6f98771f396ed29a6b Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 16:13:29 +0530 Subject: [PATCH 11/25] run all --- app/client/cypress/limited-tests.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index b810530dbb35..82617fa67f98 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,11 +1,11 @@ # 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/Git/GitSync/GitSyncedApps_spec.js -cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js +#cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +#cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_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. From c4fc56e0aff4692a0d04bf316fa1d823c63204c5 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 16:42:55 +0530 Subject: [PATCH 12/25] /GitDiscardChange/DiscardChanges_spec.js fix --- app/client/cypress/support/Pages/EditorNavigation.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/support/Pages/EditorNavigation.ts b/app/client/cypress/support/Pages/EditorNavigation.ts index e29230ea5add..c116cf8690df 100644 --- a/app/client/cypress/support/Pages/EditorNavigation.ts +++ b/app/client/cypress/support/Pages/EditorNavigation.ts @@ -43,7 +43,8 @@ class EditorNavigation { .should("be.visible") .click() .parents(datasource.datasourceCard) - .should("have.attr", "data-selected", "true"); + .as("dsCard"); + cy.get("@dsCard").should("have.attr", "data-selected", "true"); } NavigateToWidget( From 8884c4462955d205c6c321447e438ca63a8fff45 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 17:15:38 +0530 Subject: [PATCH 13/25] run limit --- app/client/cypress/limited-tests.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 82617fa67f98..727be89c829f 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,11 +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/Git/GitSync/GitSyncedApps_spec.js -#cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js - +cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_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. From 5fa1d63805f66061292b831e9d3123012e70e64b Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Wed, 27 Dec 2023 18:25:30 +0530 Subject: [PATCH 14/25] run all --- .../Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js | 2 +- app/client/cypress/limited-tests.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index 4e58c7dbfbd6..9a7df1b62aab 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js @@ -38,7 +38,7 @@ const mainBranch = "master"; let datasourceName; let repoName; -describe("Git sync apps", { tags: ["@tag.Git"] }, function () { +describe.skip("Git sync apps", { tags: ["@tag.Git"] }, function () { it("1. Generate postgreSQL crud page , connect to git, clone the page, rename page with special character in it", () => { homePage.NavigateToHome(); homePage.CreateNewApplication(); diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 727be89c829f..ae13c1c42c12 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,10 +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/Git/GitSync/GitSyncedApps_spec.js -cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js +#cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +#cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_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. From 0f6be3099b7d65b41be65d7b03bac3ae06720b06 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 05:25:35 +0530 Subject: [PATCH 15/25] eslint check remove --- app/client/cypress/support/WorkspaceCommands.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js index 89b62af35a49..40ae083bbc03 100644 --- a/app/client/cypress/support/WorkspaceCommands.js +++ b/app/client/cypress/support/WorkspaceCommands.js @@ -267,7 +267,6 @@ Cypress.Commands.add("CreateNewAppInNewWorkspace", () => { } }); homePageTS.CreateNewWorkspace("", toNavigateToHome); //Creating a new workspace for every test, since we are deleting the workspace in the end of the test - //agHelper.Sleep(2000); //for workspace to open cy.get("@workspaceName").then((workspaceName) => { localStorage.setItem("workspaceName", workspaceName); homePageTS.CreateAppInWorkspace(localStorage.getItem("workspaceName")); @@ -281,7 +280,6 @@ Cypress.Commands.add("CreateNewAppInNewWorkspace", () => { localStorage.setItem("applicationId", applicationId); localStorage.setItem("appName", appName); - // eslint-disable-next-line cypress/no-unnecessary-waiting agHelper.AssertElementAbsence("#loading", Cypress.config().pageLoadTimeout); cy.url().then((url) => { From ccf62506b06e8924cbcaf8aaa07cbb5462544e3b Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 05:33:36 +0530 Subject: [PATCH 16/25] removed wait --- app/client/cypress/support/WorkspaceCommands.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js index 17e09e620383..03a9856f716d 100644 --- a/app/client/cypress/support/WorkspaceCommands.js +++ b/app/client/cypress/support/WorkspaceCommands.js @@ -289,7 +289,6 @@ Cypress.Commands.add("CreateNewAppInNewWorkspace", () => { cy.url().then((url) => { if (url.indexOf("/applications") > -1) { homePageTS.EditAppFromAppHover(appName); - agHelper.Sleep(2000); //for app to open } }); }); From f7600f3fc1f80773f2bd83cc621d4d853a811a4c Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 06:51:10 +0530 Subject: [PATCH 17/25] EnterURL() added 1 sec wait --- app/client/cypress/support/Pages/ApiPage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 2ada9881dfb8..975b986bae69 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -147,7 +147,7 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); - this.agHelper.Sleep(500); //Is needed for the entered url value to be registered, else failing locally & CI + this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } From d9f7562c642f0e8b4b5c31dcb1cb6c639e57cb26 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 06:59:09 +0530 Subject: [PATCH 18/25] another trial --- .../e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts | 4 ---- app/client/cypress/support/Pages/AggregateHelper.ts | 1 + app/client/cypress/support/Pages/ApiPage.ts | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts index 000e57b7f3b4..ac965c41c5d7 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts @@ -23,10 +23,6 @@ import { } from "../../../../support/Pages/EditorNavigation"; describe("API Bugs", { tags: ["@tag.Datasource"] }, function () { - before(() => { - agHelper.RefreshPage(); - }); - it("1. Bug 14037, 25432: User gets an error even when table widget is added from the API page successfully", function () { // Case where api returns array response apiPage.CreateAndFillApi( diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 3e7267a0ab18..cda96de63cea 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1196,6 +1196,7 @@ export class AggregateHelper { const { apiOrQuery, directInput, inputFieldName, propFieldName } = options; if (propFieldName && directInput && !inputFieldName) { this.UpdateCodeInput(propFieldName, valueToEnter, apiOrQuery); + this.GetNClick(propFieldName); } else if (inputFieldName && !propFieldName && !directInput) { this.UpdateCodeInput( this.locator._inputFieldByName(inputFieldName), diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 975b986bae69..a8f3525c8030 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -147,7 +147,7 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); - this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI + //this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } From a6acf2ee0a3d339ddd2365ffe1e099f9c68f5aa0 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 07:43:36 +0530 Subject: [PATCH 19/25] revert --- .../Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts | 2 +- .../ClientSide/Templates/ForkTemplateToGitConnectedApp.js | 2 +- app/client/cypress/support/Pages/AggregateHelper.ts | 1 - app/client/cypress/support/Pages/ApiPage.ts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index 3882701471f1..f6263af69c7d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -17,7 +17,7 @@ import EditorNavigation, { PageLeftPane, } from "../../../../../../support/Pages/EditorNavigation"; -describe( +describe.skip( "Import and validate older app (app created in older versions of Appsmith) from Gitea", { tags: ["@tag.Git"] }, function () { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js index 3c48d67a719c..d9f74d9d7892 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js @@ -10,7 +10,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; import PageList from "../../../../support/Pages/PageList"; import { PageLeftPane } from "../../../../support/Pages/EditorNavigation"; -describe( +describe.skip( "Fork a template to the current app", { tags: ["@tag.Templates", "@tag.excludeForAirgap"] }, () => { diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index cda96de63cea..3e7267a0ab18 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1196,7 +1196,6 @@ export class AggregateHelper { const { apiOrQuery, directInput, inputFieldName, propFieldName } = options; if (propFieldName && directInput && !inputFieldName) { this.UpdateCodeInput(propFieldName, valueToEnter, apiOrQuery); - this.GetNClick(propFieldName); } else if (inputFieldName && !propFieldName && !directInput) { this.UpdateCodeInput( this.locator._inputFieldByName(inputFieldName), diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index a8f3525c8030..975b986bae69 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -147,7 +147,7 @@ export class ApiPage { inputFieldName: "", apiOrQuery: "api", }); - //this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI + this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI if (evaluatedValue) { this.agHelper.VerifyEvaluatedValue(evaluatedValue); } From 3bc5e4f29945735966f0846fde19aa794a6eb7f7 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 14:32:12 +0530 Subject: [PATCH 20/25] BugTests/ApiBugs_Spec.ts fix --- .../Regression/ClientSide/BugTests/ApiBugs_Spec.ts | 3 +++ app/client/cypress/support/Pages/AggregateHelper.ts | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts index ac965c41c5d7..f94ffec29ac5 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts @@ -49,6 +49,9 @@ describe("API Bugs", { tags: ["@tag.Datasource"] }, function () { const apiUrl = `http://host.docker.internal:5001/v1/{{true ? 'mock-api' : 'mock-apis'}}?records=10`; apiPage.CreateAndFillApi(apiUrl, "BindingExpressions"); + agHelper.VerifyEvaluatedValue( + dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl, + ); apiPage.RunAPI(); agHelper.AssertElementAbsence( locators._specificToast( diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 3e7267a0ab18..59b911730148 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1447,21 +1447,20 @@ export class AggregateHelper { // this should only be used when we want to verify the evaluated value of dynamic bindings for example {{Api1.data}} or {{"asa"}} // and should not be called for plain strings public VerifyEvaluatedValue(currentValue: string) { - this.Sleep(3000); - cy.get(this.locator._evaluatedCurrentValue) + this.GetElement(this.locator._evaluatedCurrentValue) .first() .should("be.visible") .should("not.have.text", "undefined"); - cy.get(this.locator._evaluatedCurrentValue) + this.GetElement(this.locator._evaluatedCurrentValue) .first() .click({ force: true }) .then(($text) => { if ($text.text()) expect($text.text()).to.eq(currentValue); }) - .trigger("mouseout") - .then(() => { - cy.wait(2000); - }); + .trigger("mouseout"); + // .then(() => { + // cy.wait(2000); + // }); } public UploadFile(fixtureName: string, toClickUpload = true, index = 0) { From ebca66dd714644b7fe064db80210a5d6da1f4420 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 14:49:27 +0530 Subject: [PATCH 21/25] /Dropdown/Dropdown_onOptionChange_spec.js fix --- .../Dropdown/Dropdown_onOptionChange_spec.js | 34 +++---------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js index de0e3fdc6039..c36b920de856 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js @@ -7,7 +7,6 @@ import EditorNavigation, { const commonlocators = require("../../../../../locators/commonlocators.json"); const formWidgetsPage = require("../../../../../locators/FormWidgets.json"); const widgetLocators = require("../../../../../locators/Widgets.json"); -const datasource = require("../../../../../locators/DatasourcesEditor.json"); import { agHelper, locators, @@ -91,34 +90,11 @@ describe( it("3. Dropdown-Call-Query Validation", function () { //creating a query and calling it from the onOptionChangeAction of the Dropdown widget. - // Creating a mock query - // cy.CreateMockQuery("Query1"); - let postgresDatasourceName; - - cy.startRoutesForDatasource(); - cy.NavigateToDatasourceEditor(); - cy.get(datasource.PostgreSQL).click(); - cy.generateUUID().then((uid) => { - postgresDatasourceName = uid; - - cy.get(".t--edit-datasource-name").click(); - cy.get(".t--edit-datasource-name input") - .clear() - .type(postgresDatasourceName, { force: true }) - .should("have.value", postgresDatasourceName) - .blur(); - - // cy.wait("@saveDatasource").should( - // "have.nested.property", - // "response.body.responseMeta.status", - // 201, - // ); - cy.fillPostgresDatasourceForm(); - cy.saveDatasource(); - dataSources.CreateQueryForDS(postgresDatasourceName); - }); - - cy.CreateMockQuery("Query1"); + // Creating a query + dataSources.CreateDataSource("Postgres"); + dataSources.CreateQueryAfterDSSaved( + 'SELECT * FROM public."astronauts" LIMIT 10;', + ); // Going to HomePage where the button widget is located and opeing it's property pane. cy.get("[data-guided-tour-id='explorer-entity-Page1']").click({ force: true, From 2310f7b54d003a9e827f5d47fc145b5399eea956 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 15:38:02 +0530 Subject: [PATCH 22/25] ApiTests/API_Search_spec.js flaky fix --- .../Regression/ServerSide/ApiTests/API_Search_spec.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js index 6d2a2de2536a..a54e7fe4fd05 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js @@ -60,14 +60,11 @@ describe( cy.get(ApiEditor.tableResponseTab).click(); cy.checkIfApiPaneIsVisible(); }); + it("3. Bug 14242: Appsmith crash when create an API pointing to Github hosted json", function () { - cy.generateUUID().then((uid) => { - APIName = uid; - cy.CreateAPI(APIName); - }); - cy.enterDatasource(testUrl3); - cy.SaveAndRunAPI(); - cy.ResponseStatusCheck("200"); + apiPage.CreateAndFillApi(testUrl3); + apiPage.RunAPI(); + apiPage.ResponseStatusCheck("200 OK"); }); }, ); From 155ea886349b63a8cfce8bab941bcd0a10955b60 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 15:47:46 +0530 Subject: [PATCH 23/25] Dropdown/Dropdown_onOptionChange_spec.js fix --- .../ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js index c36b920de856..4cb503234c93 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js @@ -93,7 +93,7 @@ describe( // Creating a query dataSources.CreateDataSource("Postgres"); dataSources.CreateQueryAfterDSSaved( - 'SELECT * FROM public."astronauts" LIMIT 10;', + 'SELECT * FROM public."country" LIMIT 10;', ); // Going to HomePage where the button widget is located and opeing it's property pane. cy.get("[data-guided-tour-id='explorer-entity-Page1']").click({ From cb6d11dfb3eac17c629627e755e1b20042382ac3 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Thu, 4 Jan 2024 16:58:27 +0530 Subject: [PATCH 24/25] CreateAndFillApi() --- app/client/cypress/support/Pages/AggregateHelper.ts | 10 +++++----- app/client/cypress/support/Pages/ApiPage.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index 59b911730148..dad4ce0a180c 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1283,7 +1283,7 @@ export class AggregateHelper { this.Sleep(200); } }); - this.Sleep(); //for value set to settle + this.Sleep(); //for value set to register } public UpdateFieldInput(selector: string, value: string) { @@ -1291,7 +1291,7 @@ export class AggregateHelper { .find("input") .invoke("attr", "value", value) .trigger("input"); - this.Sleep(); //for value set to settle + this.Sleep(); //for value set to register } public ValidateFieldInputValue(selector: string, value: string) { @@ -1302,7 +1302,7 @@ export class AggregateHelper { .then((inputValue) => { expect(inputValue).to.equal(value); }); - this.Sleep(); //for value set to settle + this.Sleep(); //for value set to register } public UpdateTextArea(selector: string, value: string) { @@ -1311,7 +1311,7 @@ export class AggregateHelper { .first() .invoke("val", value) .trigger("input"); - this.Sleep(500); //for value set to settle + this.Sleep(500); //for value set to register } public TypeIntoTextArea(selector: string, value: string) { @@ -1319,7 +1319,7 @@ export class AggregateHelper { .find("textarea") .first() .type(value, { delay: 0, force: true, parseSpecialCharSequences: false }); - this.Sleep(500); //for value set to settle + this.Sleep(500); //for value set to register } public UpdateInputValue(selector: string, value: string, force = false) { diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 975b986bae69..11d010bdae4a 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -132,6 +132,7 @@ export class ApiPage { ) { this.CreateApi(apiName, apiVerb, aftDSSaved); this.EnterURL(url); + this.agHelper.Sleep(); //Is needed for the entered url value to be registered, else failing locally & CI this.AssertRunButtonDisability(); if (queryTimeout != 10000) this.SetAPITimeout(queryTimeout); } From d02920e4655dfbcb866c80c1e7e8551926d7ff09 Mon Sep 17 00:00:00 2001 From: Aishwarya UR Date: Fri, 5 Jan 2024 10:35:58 +0530 Subject: [PATCH 25/25] revert --- .../Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts | 2 +- .../Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js | 2 +- .../ClientSide/Templates/ForkTemplateToGitConnectedApp.js | 2 +- app/client/cypress/limited-tests.txt | 6 ++---- app/client/cypress/support/Pages/AggregateHelper.ts | 3 --- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index f6263af69c7d..3882701471f1 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -17,7 +17,7 @@ import EditorNavigation, { PageLeftPane, } from "../../../../../../support/Pages/EditorNavigation"; -describe.skip( +describe( "Import and validate older app (app created in older versions of Appsmith) from Gitea", { tags: ["@tag.Git"] }, function () { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index 9a7df1b62aab..4e58c7dbfbd6 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js @@ -38,7 +38,7 @@ const mainBranch = "master"; let datasourceName; let repoName; -describe.skip("Git sync apps", { tags: ["@tag.Git"] }, function () { +describe("Git sync apps", { tags: ["@tag.Git"] }, function () { it("1. Generate postgreSQL crud page , connect to git, clone the page, rename page with special character in it", () => { homePage.NavigateToHome(); homePage.CreateNewApplication(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js index d9f74d9d7892..3c48d67a719c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js @@ -10,7 +10,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; import PageList from "../../../../support/Pages/PageList"; import { PageLeftPane } from "../../../../support/Pages/EditorNavigation"; -describe.skip( +describe( "Fork a template to the current app", { tags: ["@tag.Templates", "@tag.excludeForAirgap"] }, () => { diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index ae13c1c42c12..4807f105284d 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,10 +1,8 @@ # 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/Git/GitSync/GitSyncedApps_spec.js -#cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_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. diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index dad4ce0a180c..d4661b9dd132 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -1458,9 +1458,6 @@ export class AggregateHelper { if ($text.text()) expect($text.text()).to.eq(currentValue); }) .trigger("mouseout"); - // .then(() => { - // cy.wait(2000); - // }); } public UploadFile(fixtureName: string, toClickUpload = true, index = 0) {