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

Add a test for stopping at an "edit" command that conflicts

Browse Source 
This test is almost identical to swap_in_rebase_with_conflict.go, except that it
sets the commit that will conflict to "edit".

This test is interesting because there's special code needed to determine
whether an "edit" command conflicted or not, i.e. whether to show the "confl"
entry. In this case we do. We have lots of other tests already that have "edit"
commands that don't conflict, so that's covered already.
This commit is contained in:
Stefan Haller
2023-03-10 18:56:07 +01:00
parent 3928d0ebda
commit 1998d0724f
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/integration/tests/test_list.go
View File

@@ -121,6 +121,7 @@ var tests = []*components.IntegrationTest{
interactive_rebase.SquashDownSecondCommit,
interactive_rebase.SquashFixupsAboveFirstCommit,
interactive_rebase.SwapInRebaseWithConflict,
interactive_rebase.SwapInRebaseWithConflictAndEdit,
interactive_rebase.SwapWithConflict,
misc.ConfirmOnQuit,
misc.InitialOpen,