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 revert merge test

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-19 14:47:07 +11:00
parent 88c76868ba
commit b5e325b0a4
43 changed files with 68 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/integration/components/menu_driver.go
View File

@ -36,6 +36,18 @@ func (self *MenuDriver) Select(option *matcher) *MenuDriver {
return self
}
func (self *MenuDriver) Lines(matchers ...*matcher) *MenuDriver {
self.getViewDriver().Lines(matchers...)
return self
}
func (self *MenuDriver) TopLines(matchers ...*matcher) *MenuDriver {
self.getViewDriver().TopLines(matchers...)
return self
}
func (self *MenuDriver) checkNecessaryChecksCompleted() {
if !self.hasCheckedTitle {
self.t.Fail("You must check the title of a menu popup by calling Title() before calling Confirm()/Cancel().")

4
pkg/integration/components/shell.go
View File

@ -116,6 +116,10 @@ func (self *Shell) Merge(name string) *Shell {
return self.RunCommand("git merge --commit --no-ff " + name)
}
func (self *Shell) ContinueMerge() *Shell {
return self.RunCommand("git -c core.editor=true merge --continue")
}
func (self *Shell) GitAdd(path string) *Shell {
return self.RunCommand(fmt.Sprintf("git add \"%s\"", path))
}