mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
55 lines
1.3 KiB
Go
55 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(
|
|
Contains("UU").Contains("file1").IsSelected(),
|
|
Contains("UU").Contains("file2"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("<<<<<<< HEAD"),
|
|
Contains("First Change"),
|
|
Contains("======="),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("UU").Contains("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()
|
|
},
|
|
})
|