chore: fixing issue with delete and switch

appsmithorg · Dec 31, 2024 · 70a84fa · 70a84fa
1 parent fc00587
commit 70a84fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DeleteBranch_spec.js
@@ -57,7 +57,7 @@ describe(
     });
 
     it("2. Create child branch, merge data from child branch, delete child branch verify the data should reflect in master ", () => {
-      cy.switchGitBranch("master");
+      gitSync.SwitchGitBranch("master");
       gitSync.CreateGitBranch("", true);
       cy.wait(1000);
       PageLeftPane.switchSegment(PagePaneSegment.UI);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
@@ -127,7 +127,7 @@ describe(
 
     // rename entities
     it("3. makes branch specific resource updates", function () {
-      cy.switchGitBranch(childBranchKey);
+      gitSync.SwitchGitBranch(childBranchKey);
       EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
       entityExplorer.RenameEntityFromExplorer(
         "ParentPage1",
@@ -142,11 +142,12 @@ describe(
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
       entityExplorer.RenameEntityFromExplorer("ParentApi1", "ParentApiRenamed");
 
-      cy.switchGitBranch(parentBranchKey);
-
-      PageList.assertAbsence("ParentPageRenamed");
-      PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      PageLeftPane.assertAbsence("ParentApiRenamed");
+      gitSync.SwitchGitBranch(parentBranchKey);
+      cy.wait("@gitCheckoutAPI").then(() => {
+        PageList.assertAbsence("ParentPageRenamed");
+        PageLeftPane.switchSegment(PagePaneSegment.Queries);
+        PageLeftPane.assertAbsence("ParentApiRenamed");
+      });
     });
 
     it("4. enables switching branch from the URL", () => {