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
108 lines
2.4 KiB
Go
108 lines
2.4 KiB
Go
package commit
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Search = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Search for a commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("one")
|
|
shell.EmptyCommit("two")
|
|
shell.EmptyCommit("three")
|
|
shell.EmptyCommit("four")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.StartSearch).
|
|
Tap(func() {
|
|
t.ExpectSearch().
|
|
Type("two").
|
|
Confirm()
|
|
|
|
t.Views().Search().Content(Contains("matches for 'two' (1 of 1)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.StartSearch).
|
|
Tap(func() {
|
|
t.ExpectSearch().
|
|
Type("o").
|
|
Confirm()
|
|
|
|
t.Views().Search().Content(Contains("matches for 'o' (2 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press("n").
|
|
Tap(func() {
|
|
t.Views().Search().Content(Contains("matches for 'o' (3 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one").IsSelected(),
|
|
).
|
|
Press("n").
|
|
Tap(func() {
|
|
t.Views().Search().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press("n").
|
|
Tap(func() {
|
|
t.Views().Search().Content(Contains("matches for 'o' (2 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press("N").
|
|
Tap(func() {
|
|
t.Views().Search().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press("N").
|
|
Tap(func() {
|
|
t.Views().Search().Content(Contains("matches for 'o' (3 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one").IsSelected(),
|
|
)
|
|
},
|
|
})
|