mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
e90a3dc666
When rerendering a view at the end of a refresh, we call HandleFocus only if the view has the focus. This is so that we rerender the main view for the new selection. What was missing here is to update the view selection from the list selection if the view doesn't have the focus, so that the selection is painted properly. Normally this is not relevant because you don't see the selection if another side panel has the focus; however, you do see it as an inactive selection when e.g. a popup is shown, in which case it does matter. This will become more important when we introduce section headers for commits, because in that case the view selection needs to change when the working copy state changes from normal to rebasing or vice versa, even if the list selection stays the same. The changed test submodule/reset.go shows how this was wrong before: when entering the submodule again after resetting, there is a refresh which keeps the same branch selected as before (master); however, since the branches panel is not focused, the view didn't notice and kept thinking that the detached head is selected (which it isn't, you can tell by running the test in sandbox mode and focusing the branches panel at the end: you'll see that master is selected). So the change in this commit fixes that.
129 lines
3.4 KiB
Go
129 lines
3.4 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.GetUserConfig().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_name", "my_submodule_path")
|
|
shell.GitAddAll()
|
|
shell.Commit("add submodule")
|
|
|
|
shell.CreateFile("other_file", "")
|
|
},
|
|
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("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_path contains modified content"))
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
Equals("▼ /"),
|
|
Equals(" M my_submodule_path (submodule)"),
|
|
Equals(" ?? other_file").IsSelected(),
|
|
).
|
|
// Verify we can't reset a submodule and file change at the same time.
|
|
Press(keys.Universal.ToggleRangeSelect).
|
|
SelectPreviousItem().
|
|
Lines(
|
|
Equals("▼ /"),
|
|
Equals(" M my_submodule_path (submodule)").IsSelected(),
|
|
Equals(" ?? other_file").IsSelected(),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: Multiselection not supported for submodules"))
|
|
}).
|
|
Press(keys.Universal.ToggleRangeSelect).
|
|
Lines(
|
|
Equals("▼ /"),
|
|
Equals(" M my_submodule_path (submodule)").IsSelected(),
|
|
Equals(" ?? other_file"),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("my_submodule_path")).
|
|
Select(Contains("Stash uncommitted submodule changes and update")).
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Equals("?? other_file").IsSelected(),
|
|
)
|
|
|
|
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"),
|
|
Contains("master").IsSelected(),
|
|
)
|
|
|
|
// 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"))
|
|
},
|
|
})
|