1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
package submodule
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var ResetFolder = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Reset submodule changes located in a nested folder.",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(cfg *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.EmptyCommit("first commit")
shell.CreateDir("dir")
shell.CloneIntoSubmodule("submodule1", "dir/submodule1")
shell.CloneIntoSubmodule("submodule2", "dir/submodule2")
shell.GitAddAll()
shell.Commit("add submodules")
shell.CreateFile("dir/submodule1/file", "")
shell.CreateFile("dir/submodule2/file", "")
shell.CreateFile("dir/file", "")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Files().Focus().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" ?? file"),
Equals(" M submodule1 (submodule)"),
Equals(" M submodule2 (submodule)"),
).
// Verify we cannot reset the entire folder (has nested file and submodule changes).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectToast(Contains("Disabled: Multiselection not supported for submodules"))
}).
// Verify we cannot reset submodule + file or submodule + submodule via range select.
SelectNextItem().
Press(keys.Universal.ToggleRangeSelect).
SelectNextItem().
Lines(
Equals("▼ dir"),
Equals(" ?? file").IsSelected(),
Equals(" M submodule1 (submodule)").IsSelected(),
Equals(" M submodule2 (submodule)"),
).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectToast(Contains("Disabled: Multiselection not supported for submodules"))
}).
Press(keys.Universal.ToggleRangeSelect).
Press(keys.Universal.ToggleRangeSelect).
SelectNextItem().
Lines(
Equals("▼ dir"),
Equals(" ?? file"),
Equals(" M submodule1 (submodule)").IsSelected(),
Equals(" M submodule2 (submodule)").IsSelected(),
).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectToast(Contains("Disabled: Multiselection not supported for submodules"))
}).
// Reset the file change.
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file")).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Discard changes")).
Select(Contains("Discard all changes")).
Confirm()
}).
NavigateToLine(Contains("▼ dir")).
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M submodule1 (submodule)"),
Equals(" M submodule2 (submodule)"),
).
// Verify we still cannot reset the entire folder (has two submodule changes).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectToast(Contains("Disabled: Multiselection not supported for submodules"))
}).
// Reset one of the submodule changes.
SelectNextItem().
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("dir/submodule1")).
Select(Contains("Stash uncommitted submodule changes and update")).
Confirm()
}).
NavigateToLine(Contains("▼ dir")).
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M submodule2 (submodule)"),
).
// Now we can reset the folder (equivalent to resetting just the nested submodule change).
// Range selecting both the folder and submodule change is allowed.
Press(keys.Universal.ToggleRangeSelect).
SelectNextItem().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M submodule2 (submodule)").IsSelected(),
).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("dir/submodule2")).
Select(Contains("Stash uncommitted submodule changes and update")).
Cancel()
}).
// Or just selecting the folder itself.
NavigateToLine(Contains("▼ dir")).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("dir/submodule2")).
Select(Contains("Stash uncommitted submodule changes and update")).
Confirm()
}).
IsEmpty()
},
})
|
