Skip to content

chore: Adding missing function in cypress git sync helper and syncing the common file across the two repositories. #33368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trishaanand merged 2 commits into from
May 13, 2024
Merged

chore: Adding missing function in cypress git sync helper and syncing the common file across the two repositories. #33368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105e338
chore: Adding missing function in cypress git sync helper and syncing…
trishaanand May 13, 2024
25ec052
Running prettier check
trishaanand May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/client/cypress/support/Pages/GitSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ export class GitSync {
_checkMergeability = "//span[contains(text(), 'Checking mergeability')]";
public _branchListItem = "[data-testid=t--branch-list-item]";
public _bottomBarMergeButton = ".t--bottom-bar-merge";
private mergeCTA = "[data-testid=t--git-merge-button]";
public _mergeBranchDropdownDestination =
".t--merge-branch-dropdown-destination";
public _dropdownmenu = ".rc-select-item-option-content";
private _openRepoButton = "[data-testid=t--git-repo-button]";
public _commitButton = ".t--commit-button";
private _commitCommentInput = ".t--commit-comment-input textarea";
public _commitCommentInput = ".t--commit-comment-input textarea";

public _discardChanges = ".t--discard-button";
public _discardCallout = "[data-testid='t--discard-callout']";
Expand Down Expand Up @@ -389,6 +390,18 @@ export class GitSync {
this.agHelper.AssertElementAbsence(this._checkMergeability, 35000);
}

MergeToMaster() {
this.CheckMergeConflicts("master");
this.agHelper.AssertElementEnabledDisabled(this.mergeCTA, 0, false);
this.agHelper.GetNClick(this.mergeCTA);
this.assertHelper.AssertNetworkStatus("@mergeBranch");
this.agHelper.AssertContains(
Cypress.env("MESSAGES").MERGED_SUCCESSFULLY(),
"be.visible",
);
this.CloseGitSyncModal();
}
Comment on lines +393 to +403
Copy link
Contributor

@coderabbitai coderabbitai bot May 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MergeToMaster method is well-implemented. Consider adding error handling to manage potential failures during the merge process.

MergeToMaster() {
  try {
    this.CheckMergeConflicts("master");
    this.agHelper.AssertElementEnabledDisabled(this.mergeCTA, 0, false);
    this.agHelper.GetNClick(this.mergeCTA);
    this.assertHelper.AssertNetworkStatus("@mergeBranch");
    this.agHelper.AssertContains(
      Cypress.env("MESSAGES").MERGED_SUCCESSFULLY(),
      "be.visible",
    );
  } catch (error) {
    console.error('Failed to merge to master:', error);
    // Handle error appropriately
  }
  this.CloseGitSyncModal();
}


OpenRepositoryAndVerify() {
this.agHelper.GetNClick(this._openRepoButton);
}
Expand Down