mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
33 lines
756 B
Go
33 lines
756 B
Go
package components
|
|
|
|
// for running common actions
|
|
type Actions struct {
|
|
t *TestDriver
|
|
}
|
|
|
|
func (self *Actions) ContinueMerge() {
|
|
self.t.Views().current().Press(self.t.keys.Universal.CreateRebaseOptionsMenu)
|
|
|
|
self.t.ExpectPopup().Menu().
|
|
Title(Equals("Rebase Options")).
|
|
Select(Contains("continue")).
|
|
Confirm()
|
|
}
|
|
|
|
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()
|
|
}
|