sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

migrate more tests

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-22 22:25:18 +11:00
parent eabe7f462a
commit 1034962c7e
369 changed files with 499 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/integration/components/actions.go
View File

@ -17,3 +17,17 @@ func (self *Actions) ContinueMerge() {
func (self *Actions) ContinueRebase() {
self.ContinueMerge()
}
func (self *Actions) AcknowledgeConflicts() {
self.t.ExpectPopup().Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
}
func (self *Actions) ContinueOnConflictsResolved() {
self.t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
}