ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 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

22
pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
View File

@@ -49,21 +49,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
})
func handleConflictsFromSwap(t *TestDriver) {
continueMerge := func() {
t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
}
acceptConflicts := func() {
t.ExpectPopup().Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
}
acceptConflicts()
t.Actions().AcknowledgeConflicts()
t.Views().Files().
IsFocused().
@@ -84,9 +70,9 @@ func handleConflictsFromSwap(t *TestDriver) {
SelectNextItem().
PressPrimaryAction() // pick "three"
continueMerge()
t.Actions().ContinueOnConflictsResolved()
acceptConflicts()
t.Actions().AcknowledgeConflicts()
t.Views().Files().
IsFocused().
@@ -107,7 +93,7 @@ func handleConflictsFromSwap(t *TestDriver) {
SelectNextItem().
PressPrimaryAction() // pick "two"
continueMerge()
t.Actions().ContinueOnConflictsResolved()
t.Views().Commits().
Focus().