mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-10 04:07:18 +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
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
// Rewording the first commit is tricky because you can't rebase from its parent commit,
|
|
// hence having a specific test for this
|
|
|
|
var RewordFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Rewords the first commit, just to show that it's possible",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(2)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit 02"),
|
|
Contains("commit 01"),
|
|
).
|
|
NavigateToLine(Contains("commit 01")).
|
|
Press(keys.Commits.RenameCommit).
|
|
Tap(func() {
|
|
t.ExpectPopup().CommitMessagePanel().
|
|
Title(Equals("Reword commit")).
|
|
InitialText(Equals("commit 01")).
|
|
Clear().
|
|
Type("renamed 01").
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("commit 02"),
|
|
Contains("renamed 01"),
|
|
)
|
|
},
|
|
})
|