sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Add a root item ("/") if files at top level have changed

Browse Source
This commit is contained in:
Stefan Haller
2025-03-01 07:25:26 +01:00
parent 0b42cfb568
commit 26459523f5
61 changed files with 663 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/integration/tests/commit/commit.go
View File

@ -21,19 +21,23 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("?? myfile").IsSelected(),
Equals("?? myfile2"),
Equals("▼ /").IsSelected(),
Equals(" ?? myfile"),
Equals(" ?? myfile2"),
).
SelectNextItem().
PressPrimaryAction(). // stage file
Lines(
Equals("A myfile").IsSelected(),
Equals("?? myfile2"),
Equals("▼ /"),
Equals(" A myfile").IsSelected(),
Equals(" ?? myfile2"),
).
SelectNextItem().
PressPrimaryAction(). // stage other file
Lines(
Equals("A myfile"),
Equals("A myfile2").IsSelected(),
Equals("▼ /"),
Equals(" A myfile"),
Equals(" A myfile2").IsSelected(),
).
Press(keys.Files.CommitChanges)
@ -54,8 +58,9 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A myfile"),
Equals("A myfile2"),
Equals("▼ /"),
Equals(" A myfile"),
Equals(" A myfile2"),
)
},
})

9
pkg/integration/tests/commit/commit_switch_to_editor.go
View File

@ -25,6 +25,12 @@ var CommitSwitchToEditor = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ /").IsSelected(),
Equals(" ?? file1"),
Equals(" ?? file2"),
).
SelectNextItem().
PressPrimaryAction(). // stage one of the files
Press(keys.Files.CommitChanges)
@ -45,6 +51,9 @@ var CommitSwitchToEditor = NewIntegrationTest(NewIntegrationTestArgs{
// Now check that the preserved commit message was cleared:
t.Views().Files().
Focus().
Lines(
Equals("?? file2"),
).
PressPrimaryAction(). // stage the other file
Press(keys.Files.CommitChanges)

26
pkg/integration/tests/commit/discard_old_file_changes.go
View File

@ -43,13 +43,14 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ▼ subd1"),
Equals(" A subfile0"),
Equals(" A d1_file0"),
Equals("▼ dir2"),
Equals(" A d2_file1"),
Equals(" A d2_file2"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" ▼ subd1"),
Equals(" A subfile0"),
Equals(" A d1_file0"),
Equals(" ▼ dir2"),
Equals(" A d2_file1"),
Equals(" A d2_file2"),
).
NavigateToLine(Contains("d1_file0")).
Press(keys.Universal.Remove)
@ -62,11 +63,12 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1/subd1"),
Equals(" A subfile0"),
Equals("▼ dir2"),
Equals(" A d2_file1").IsSelected(),
Equals(" A d2_file2"),
Equals("▼ /"),
Equals(" ▼ dir1/subd1"),
Equals(" A subfile0"),
Equals(" ▼ dir2"),
Equals(" A d2_file1").IsSelected(),
Equals(" A d2_file2"),
).
PressEscape()

6
pkg/integration/tests/commit/reword.go
View File

@ -20,6 +20,12 @@ var Reword = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ /").IsSelected(),
Contains("myfile"),
Contains("myfile2"),
).
SelectNextItem().
PressPrimaryAction().
Press(keys.Files.CommitChanges)

7
pkg/integration/tests/commit/staged.go
View File

@ -21,7 +21,12 @@ var Staged = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
SelectedLine(Contains("myfile")).
Lines(
Equals("▼ /").IsSelected(),
Contains("myfile"),
Contains("myfile2"),
).
SelectNextItem().
PressPrimaryAction(). // stage the file
PressEnter()

7
pkg/integration/tests/commit/staged_without_hooks.go
View File

@ -22,7 +22,12 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
// stage the file
t.Views().Files().
IsFocused().
SelectedLine(Contains("myfile")).
Lines(
Equals("▼ /").IsSelected(),
Contains("myfile"),
Contains("myfile2"),
).
SelectNextItem().
PressPrimaryAction().
PressEnter()

7
pkg/integration/tests/commit/unstaged.go
View File

@ -21,7 +21,12 @@ var Unstaged = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
SelectedLine(Contains("myfile")).
Lines(
Equals("▼ /").IsSelected(),
Contains("myfile"),
Contains("myfile2"),
).
SelectNextItem().
PressEnter()
t.Views().Staging().