Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test: fix failing gitsync tests (#34214)

Browse Source 
RCA:
Test was failing because of hard wait
Also the dropdown element which was being clicked was failing

Solution:
Removed hard waits and replaced with intercept
Updated locator and better method to fix tests

EE PR: https://github.com/appsmithorg/appsmith-ee/pull/4413

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Updated the method for merging changes to the master branch in Git
sync tests for improved reliability.
  
- **Tests**
- Revised Cypress test configurations and spec names for better
organization and clarity.
- Enhanced the `CheckMergeConflicts` method to improve test accuracy and
reliability by including element visibility checks and network status
assertions.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
NandanAnantharamu 2024-06-13 14:05:22 +05:30 committed by GitHub
parent f73b9a47d7
commit 1a0889e035
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
View File

@ -400,8 +400,7 @@ describe("Git sync apps", { tags: ["@tag.Git"] }, function () {
cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit"); cy.get(gitSyncLocators.commitCommentInput).type("Initial Commit");
cy.get(gitSyncLocators.commitButton).click(); cy.get(gitSyncLocators.commitButton).click();
cy.get(gitSyncLocators.closeGitSyncModal).click(); cy.get(gitSyncLocators.closeGitSyncModal).click();
cy.merge(mainBranch); gitSync.MergeToMaster();
agHelper.GetNClick(gitSyncLocators.closeGitSyncModal);
cy.latestDeployPreview(); cy.latestDeployPreview();
// verify page is hidden on deploy mode // verify page is hidden on deploy mode
agHelper.AssertContains("Child_Page Copy", "not.exist"); agHelper.AssertContains("Child_Page Copy", "not.exist");

11
app/client/cypress/support/Pages/GitSync.ts
View File

@ -37,6 +37,8 @@ export class GitSync {
private mergeCTA = "[data-testid=t--git-merge-button]"; private mergeCTA = "[data-testid=t--git-merge-button]";
public _mergeBranchDropdownDestination = public _mergeBranchDropdownDestination =
".t--merge-branch-dropdown-destination"; ".t--merge-branch-dropdown-destination";
public _mergeBranchDropdownmenu =
".t--merge-branch-dropdown-destination .rc-select-selection-search-input";
public _dropdownmenu = ".rc-select-item-option-content"; public _dropdownmenu = ".rc-select-item-option-content";
private _openRepoButton = "[data-testid=t--git-repo-button]"; private _openRepoButton = "[data-testid=t--git-repo-button]";
public _commitButton = ".t--commit-button"; public _commitButton = ".t--commit-button";
@ -380,11 +382,12 @@ export class GitSync {
CheckMergeConflicts(destinationBranch: string) { CheckMergeConflicts(destinationBranch: string) {
this.agHelper.AssertElementExist(this._bottomBarPull); this.agHelper.AssertElementExist(this._bottomBarPull);
this.agHelper.GetNClick(this._bottomBarMergeButton); this.agHelper.GetNClick(this._bottomBarMergeButton);
cy.wait(2000); this.agHelper.WaitUntilEleAppear(this._mergeBranchDropdownmenu);
this.agHelper.GetNClick(this._mergeBranchDropdownDestination); this.agHelper.WaitUntilEleDisappear(this._mergeLoader);
// cy.get(commonLocators.dropdownmenu).contains(destinationBranch).click(); this.assertHelper.AssertNetworkStatus("@getBranch", 200);
this.agHelper.GetNClick(this._mergeBranchDropdownmenu, 0, true);
this.agHelper.WaitUntilEleAppear(this._dropdownmenu);
this.agHelper.GetNClickByContains(this._dropdownmenu, destinationBranch); this.agHelper.GetNClickByContains(this._dropdownmenu, destinationBranch);
this.agHelper.AssertElementAbsence(this._checkMergeability, 35000); this.agHelper.AssertElementAbsence(this._checkMergeability, 35000);
} }