mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-19 17:02:18 +03:00
57 lines
1.3 KiB
Go
57 lines
1.3 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 ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Ensures that upon resolving conflicts for one file, the next file is selected",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.CreateMergeConflictFiles(shell)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Equals("▼ /").IsSelected(),
|
|
Equals(" UU file1"),
|
|
Equals(" UU file2"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("<<<<<<< HEAD"),
|
|
Contains("First Change"),
|
|
Contains("======="),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Equals("UU file2").IsSelected(),
|
|
).
|
|
PressEnter()
|
|
|
|
// coincidentally these files have the same conflict
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("<<<<<<< HEAD"),
|
|
Contains("First Change"),
|
|
Contains("======="),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Common().ContinueOnConflictsResolved()
|
|
},
|
|
})
|