mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
d772c9f1d4
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE. Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything is in 'Sentence case' there's no need for the distinction. I've got a couple lower case things I've kept: namely, things that show up in parentheses.
105 lines
2.7 KiB
Go
105 lines
2.7 KiB
Go
package submodule
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Reset = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Enter a submodule, create a commit and stage some changes, then reset the submodule from back in the parent repo. This test captures functionality around getting a dirty submodule out of your files panel.",
|
|
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\" && echo \"my_file content\" > my_file",
|
|
},
|
|
}
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("first commit")
|
|
shell.CloneIntoSubmodule("my_submodule")
|
|
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"))
|
|
}
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().Focus().
|
|
Lines(
|
|
Contains("my_submodule").IsSelected(),
|
|
).
|
|
// enter the submodule
|
|
PressEnter()
|
|
|
|
assertInSubmodule()
|
|
|
|
t.Views().Status().Content(Contains("my_submodule"))
|
|
|
|
t.Views().Files().IsFocused().
|
|
Press("e").
|
|
Tap(func() {
|
|
t.Views().Commits().Content(Contains("empty commit"))
|
|
t.Views().Files().Content(Contains("my_file"))
|
|
}).
|
|
Lines(
|
|
Contains("my_file").IsSelected(),
|
|
).
|
|
// stage my_file
|
|
PressPrimaryAction().
|
|
// return to the parent repo
|
|
PressEscape()
|
|
|
|
assertInParentRepo()
|
|
|
|
t.Views().Submodules().IsFocused()
|
|
|
|
t.Views().Main().Content(Contains("Submodule my_submodule contains modified content"))
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("Stash uncommitted submodule changes and update")).Confirm()
|
|
}).
|
|
IsEmpty()
|
|
|
|
t.Views().Submodules().Focus().
|
|
PressEnter()
|
|
|
|
assertInSubmodule()
|
|
|
|
// submodule has been hard reset to the commit the parent repo specifies
|
|
t.Views().Branches().Lines(
|
|
Contains("HEAD detached").IsSelected(),
|
|
Contains("master"),
|
|
)
|
|
|
|
// empty commit is gone
|
|
t.Views().Commits().Lines(
|
|
Contains("first commit").IsSelected(),
|
|
)
|
|
|
|
// the staged change has been stashed
|
|
t.Views().Files().IsEmpty()
|
|
|
|
t.Views().Stash().Focus().
|
|
Lines(
|
|
Contains("WIP on master").IsSelected(),
|
|
)
|
|
|
|
t.Views().Main().Content(Contains("my_file content"))
|
|
},
|
|
})
|