mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-03 15:02:52 +02:00
42 lines
1.2 KiB
Go
42 lines
1.2 KiB
Go
package conflicts
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
|
)
|
|
|
|
var UndoChooseHunk = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Chooses a hunk when resolving a merge conflict and then undoes the choice",
|
|
ExtraCmdArgs: "",
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.CreateMergeConflictFileMultiple(shell)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("UU file").IsSelected(),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
Content(Contains("<<<<<<< HEAD\nFirst Change")).
|
|
// explicitly asserting on the selection because sometimes the content renders
|
|
// before the selection is ready for user input
|
|
SelectedLines(
|
|
Contains("<<<<<<< HEAD"),
|
|
Contains("First Change"),
|
|
Contains("======="),
|
|
).
|
|
PressPrimaryAction().
|
|
// choosing the first hunk
|
|
Content(DoesNotContain("<<<<<<< HEAD\nFirst Change")).
|
|
Press(keys.Universal.Undo).
|
|
Content(Contains("<<<<<<< HEAD\nFirst Change"))
|
|
},
|
|
})
|