Skip to content

test: updated flow for GitSync #34239

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
yatinappsmith merged 10 commits into from
Jun 28, 2024
Merged

test: updated flow for GitSync #34239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da556d7
test: updated locator for GitSync
NandanAnantharamu Jun 14, 2024
d2f6d44
updated limited run file
NandanAnantharamu Jun 14, 2024
4a43d0c
updated the helper files
NandanAnantharamu Jun 14, 2024
b6cdd7a
udpated assertions
NandanAnantharamu Jun 14, 2024
224c37d
reverted limited run file
NandanAnantharamu Jun 14, 2024
de04294
fix: updated class to data-testid
albinAppsmith Jun 19, 2024
e479d16
udpated locators
NandanAnantharamu Jun 20, 2024
70ba037
Merge branch 'test/fixFlakyGitSync2' of https://github.com/appsmithor…
NandanAnantharamu Jun 20, 2024
1c30621
Merge branch 'release' into test/fixFlakyGitSync2
NandanAnantharamu Jun 27, 2024
c479658
reverted limited run file
NandanAnantharamu Jun 27, 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
7 changes: 4 additions & 3 deletions app/client/cypress/support/Pages/GitSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ export class GitSync {
public _bottomBarMergeButton = ".t--bottom-bar-merge";
private mergeCTA = "[data-testid=t--git-merge-button]";
public _mergeBranchDropdownDestination =
".t--merge-branch-dropdown-destination";
"[data-testid=t--merge-branch-dropdown-destination]";
public _mergeBranchDropdownmenu =
".t--merge-branch-dropdown-destination .rc-select-selection-search-input";
"[data-testid=t--merge-branch-dropdown-destination] .rc-select-selection-search-input";
public _dropdownmenu = ".rc-select-item-option-content";
private _openRepoButton = "[data-testid=t--git-repo-button]";
public _commitButton = ".t--commit-button";
Expand Down Expand Up @@ -371,8 +371,9 @@ export class GitSync {
this.agHelper.WaitUntilEleAppear(this._mergeBranchDropdownmenu);
this.agHelper.WaitUntilEleDisappear(this._mergeLoader);
this.assertHelper.AssertNetworkStatus("@getBranch", 200);
this.agHelper.WaitUntilEleAppear(this._mergeBranchDropdownmenu);
this.agHelper.GetNClick(this._mergeBranchDropdownmenu, 0, true);
this.agHelper.WaitUntilEleAppear(this._dropdownmenu);
this.agHelper.AssertContains(destinationBranch);
this.agHelper.GetNClickByContains(this._dropdownmenu, destinationBranch);
this.agHelper.AssertElementAbsence(this._checkMergeability, 35000);
}
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export default function Merge() {
<Space size={2} />
<Row style={{ overflow: "unset", paddingBottom: "4px" }}>
<Select
className="t--merge-branch-dropdown-destination"
data-testid="t--merge-branch-dropdown-destination"
dropdownClassName={Classes.MERGE_DROPDOWN}
dropdownMatchSelectWidth
getPopupContainer={(triggerNode) => triggerNode.parentNode}
Expand Down