mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 16:16:28 -04:00
5748d82073
Until now every keybinding config field was a plain string. That meant a user
couldn't ask for two keys to invoke a command — the config silently accepted
only one form.
Convert every string-typed field across all 13 KeybindingXxxConfig structs to
Keybinding so the union type extends to every command. Defaults wrap their
single-key value in Keybinding{...} so the generated Config.md still renders one
scalar key per binding.
The alt fields keep their separate Binding registrations for now: this commit
does not yet introduce the merge mechanism that folds them into the main field —
that comes in a follow-up. Consumers previously calling opts.GetKeys on a string
field now call opts.GetKeys on the Keybinding, or take .String() / Keys[0] where
a single value is needed.
Adds a Keybinding.String helper for rendering, schema-generator work that
inlines the Keybinding union into each consuming property, and a unit test
covering the user-facing scalar/sequence YAML forms for quit.
82 lines
2.2 KiB
Go
82 lines
2.2 KiB
Go
package submodule
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Enter = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Enter a submodule, add a commit, and then stage the change in the parent repo",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: "e",
|
|
Context: "files",
|
|
Command: "git commit --allow-empty -m \"empty commit\"",
|
|
},
|
|
}
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("first commit")
|
|
shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
|
|
shell.GitAddAll()
|
|
shell.Commit("add submodule")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
assertInParentRepo := func() {
|
|
t.Views().Status().Content(Contains("repo"))
|
|
}
|
|
assertInSubmodule := func() {
|
|
t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)"))
|
|
}
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().Focus().
|
|
Lines(
|
|
Contains("my_submodule_name").IsSelected(),
|
|
).
|
|
// enter the submodule
|
|
PressEnter()
|
|
|
|
assertInSubmodule()
|
|
|
|
t.Views().Files().IsFocused().
|
|
Press(config.Keybinding{"e"}).
|
|
Tap(func() {
|
|
t.Views().Commits().Content(Contains("empty commit"))
|
|
}).
|
|
// return to the parent repo
|
|
PressEscape()
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().IsFocused()
|
|
|
|
// we see the new commit in the submodule is ready to be staged in the parent repo
|
|
t.Views().Main().Content(Contains("> empty commit"))
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
MatchesRegexp(` M.*my_submodule_path \(submodule\)`).IsSelected(),
|
|
).
|
|
Tap(func() {
|
|
// main view also shows the new commit when we're looking at the submodule within the files view
|
|
t.Views().Main().Content(Contains("> empty commit"))
|
|
}).
|
|
PressPrimaryAction().
|
|
Press(keys.Files.CommitChanges).
|
|
Tap(func() {
|
|
t.ExpectPopup().CommitMessagePanel().Type("submodule change").Confirm()
|
|
}).
|
|
IsEmpty()
|
|
|
|
t.Views().Submodules().Focus()
|
|
|
|
// we no longer report a new commit because we've committed it in the parent repo
|
|
t.Views().Main().Content(DoesNotContain("> empty commit"))
|
|
},
|
|
})
|