From 635002e5b558a61f7ec3a88a24e73ea0a8047e62 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Tue, 1 Oct 2024 13:26:52 +0530 Subject: [PATCH 1/7] Fix shareapp case --- .../e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts | 2 ++ app/client/cypress/limited-tests.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts index 54ea1884ee16..20aa1d244d3d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts @@ -9,6 +9,7 @@ import { } from "../../../../support/Objects/ObjectsCore"; import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO"; +import gitSyncLocators from "../../../../locators/gitSyncLocators"; const appNavigationLocators = require("../../../../locators/AppNavigation.json"); describe( @@ -113,6 +114,7 @@ describe( agHelper.AssertElementExist(homePage._appEditIcon); agHelper.GetNClick(homePage._appEditIcon, 0, true); agHelper.AssertElementAbsence(locators._loading); + agHelper.AssertElementVisibility(gitSyncLocators.connectGitBottomBar); agHelper.GetNClick(inviteModal.locators._shareButton, 0, true); agHelper.GetNClick(homePage._sharePublicToggle, 0, true); agHelper.GetNClick(locators._dialogCloseButton, 0, true); diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 31c0c0253fef..cf81be5e001c 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # 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/Workspace/ShareAppTests_Spec.ts # For running all specs - uncomment below: #cypress/e2e/**/**/* From 96fa34826cefddb98c2290a48958c78aeed600eb Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Tue, 1 Oct 2024 16:41:03 +0530 Subject: [PATCH 2/7] reverted change --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index cf81be5e001c..31c0c0253fef 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* From 565dc304f384fa4558bb644b44b6b42bc851c37a Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 3 Oct 2024 18:43:28 +0530 Subject: [PATCH 3/7] PR comment fix --- .../e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts | 2 +- app/client/cypress/limited-tests.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts index 20aa1d244d3d..c413ba18365c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts @@ -114,7 +114,7 @@ describe( agHelper.AssertElementExist(homePage._appEditIcon); agHelper.GetNClick(homePage._appEditIcon, 0, true); agHelper.AssertElementAbsence(locators._loading); - agHelper.AssertElementVisibility(gitSyncLocators.connectGitBottomBar); + assertHelper.AssertNetworkStatus("@getConsolidatedData", 200, true); agHelper.GetNClick(inviteModal.locators._shareButton, 0, true); agHelper.GetNClick(homePage._sharePublicToggle, 0, true); agHelper.GetNClick(locators._dialogCloseButton, 0, true); diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 31c0c0253fef..cf81be5e001c 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # 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/Workspace/ShareAppTests_Spec.ts # For running all specs - uncomment below: #cypress/e2e/**/**/* From fa8307dd6f341606be172c55f723b563617256b4 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 3 Oct 2024 19:25:08 +0530 Subject: [PATCH 4/7] reverted the limited file --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index cf81be5e001c..31c0c0253fef 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* From 80a671873a16ac2b88b07d2cd24bc468d2fba9d9 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 3 Oct 2024 22:11:35 +0530 Subject: [PATCH 5/7] Running again --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 31c0c0253fef..cf81be5e001c 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # 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/Workspace/ShareAppTests_Spec.ts # For running all specs - uncomment below: #cypress/e2e/**/**/* From 2cd12f02c85cf06f32c8fda86d55d4177b74f0fb Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Fri, 4 Oct 2024 11:10:58 +0530 Subject: [PATCH 6/7] reverted the changes --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index cf81be5e001c..31c0c0253fef 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* From 80be7e10eac4227b33702435f679e21173f12ef8 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Fri, 4 Oct 2024 11:14:38 +0530 Subject: [PATCH 7/7] Unused import delete --- .../e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts index c413ba18365c..9510055ae678 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts @@ -9,7 +9,6 @@ import { } from "../../../../support/Objects/ObjectsCore"; import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO"; -import gitSyncLocators from "../../../../locators/gitSyncLocators"; const appNavigationLocators = require("../../../../locators/AppNavigation.json"); describe(