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
41 lines
1.1 KiB
Go
41 lines
1.1 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var CheckoutByName = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Try to checkout branch by name. Verify that it also works on the branch with the special name @.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(3).
|
|
NewBranch("@").
|
|
Checkout("master").
|
|
EmptyCommit("blah")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("master").IsSelected(),
|
|
Contains("@"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Branches.CheckoutBranchByName).
|
|
Tap(func() {
|
|
t.ExpectPopup().Prompt().Title(Equals("Branch name:")).Type("new-branch").Confirm()
|
|
|
|
t.ExpectPopup().Alert().Title(Equals("Branch not found")).Content(Equals("Branch not found. Create a new branch named new-branch?")).Confirm()
|
|
}).
|
|
Lines(
|
|
MatchesRegexp(`\*.*new-branch`).IsSelected(),
|
|
Contains("master"),
|
|
Contains("@"),
|
|
)
|
|
},
|
|
})
|