mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-21 12:16:54 +02:00
85a6a42bff
In most real-world scenarios, name and path are usually the same. They don't have to be though, and it's important to make sure we use the right one when passing arguments to git commands, so change the tests to have different name and path.
86 lines
2.3 KiB
Go
86 lines
2.3 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.UserConfig.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() {
|
|
if t.Git().Version().IsAtLeast(2, 22, 0) {
|
|
t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)"))
|
|
} else {
|
|
t.Views().Status().Content(Contains("my_submodule_path"))
|
|
}
|
|
}
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().Focus().
|
|
Lines(
|
|
Contains("my_submodule_name").IsSelected(),
|
|
).
|
|
// enter the submodule
|
|
PressEnter()
|
|
|
|
assertInSubmodule()
|
|
|
|
t.Views().Files().IsFocused().
|
|
Press("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"))
|
|
},
|
|
})
|