/
githubmirror
/
lazygit
Обзор
Документация
Войти
/
githubmirror
/
lazygit
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
master
pkg/integration/tests/conflicts/resolve_multiple_files.go
58 строк
1 KB
Stefan Haller
Only prompt to continue a rebase/merge if we started it
03 июл 2026, 19:28
03 июл 2026, 19:28
ad507d6
Код
Авторство
О чём код?
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.Common().PretendMergeOrRebaseStartedInLazygit() 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("merge") }, })