mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

2
pkg/gui/controllers/commits_files_controller.go
View file

@ -509,7 +509,7 @@ func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode
}
func (self *CommitFilesController) handleToggleCommitFileDirCollapsed(node *filetree.CommitFileNode) error {
self.context().CommitFileTreeViewModel.ToggleCollapsed(node.GetPath())
self.context().CommitFileTreeViewModel.ToggleCollapsed(node.GetInternalPath())
self.c.PostRefreshUpdate(self.context())

2
pkg/gui/controllers/files_controller.go
View file

@ -1078,7 +1078,7 @@ func (self *FilesController) handleToggleDirCollapsed() error {
return nil
}
self.context().FileTreeViewModel.ToggleCollapsed(node.GetPath())
self.context().FileTreeViewModel.ToggleCollapsed(node.GetInternalPath())
self.c.PostRefreshUpdate(self.c.Contexts().Files)

14
pkg/gui/filetree/build_tree.go
View file

@ -14,7 +14,7 @@ func BuildTreeFromFiles(files []*models.File) *Node[models.File] {
var curr *Node[models.File]
for _, file := range files {
splitPath := split(file.Path)
splitPath := split("./" + file.Path)
curr = root
outer:
for i := range splitPath {
@ -40,6 +40,11 @@ func BuildTreeFromFiles(files []*models.File) *Node[models.File] {
continue outer
}
if i == 0 && len(files) == 1 && len(splitPath) == 2 {
// skip the root item when there's only one file at top level; we don't need it in that case
continue outer
}
newChild := &Node[models.File]{
path: path,
File: setFile,
@ -70,7 +75,7 @@ func BuildTreeFromCommitFiles(files []*models.CommitFile) *Node[models.CommitFil
var curr *Node[models.CommitFile]
for _, file := range files {
splitPath := split(file.Path)
splitPath := split("./" + file.Path)
curr = root
outer:
for i := range splitPath {
@ -89,6 +94,11 @@ func BuildTreeFromCommitFiles(files []*models.CommitFile) *Node[models.CommitFil
}
}
if i == 0 && len(files) == 1 && len(splitPath) == 2 {
// skip the root item when there's only one file at top level; we don't need it in that case
continue outer
}
newChild := &Node[models.CommitFile]{
path: path,
File: setFile,

171
pkg/gui/filetree/build_tree_test.go
View file

@ -35,15 +35,16 @@ func TestBuildTreeFromFiles(t *testing.T) {
path: "",
Children: []*Node[models.File]{
{
path: "dir1",
path: "./dir1",
CompressionLevel: 1,
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
},
{
File: &models.File{Path: "dir1/b"},
path: "dir1/b",
path: "./dir1/b",
},
},
},
@ -64,24 +65,29 @@ func TestBuildTreeFromFiles(t *testing.T) {
path: "",
Children: []*Node[models.File]{
{
path: "dir1/dir3",
path: ".",
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir1/dir3/a"},
path: "dir1/dir3/a",
path: "./dir1/dir3",
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir1/dir3/a"},
path: "./dir1/dir3/a",
},
},
CompressionLevel: 1,
},
},
CompressionLevel: 1,
},
{
path: "dir2/dir4",
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir2/dir4/b"},
path: "dir2/dir4/b",
path: "./dir2/dir4",
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir2/dir4/b"},
path: "./dir2/dir4/b",
},
},
CompressionLevel: 1,
},
},
CompressionLevel: 1,
},
},
},
@ -100,12 +106,17 @@ func TestBuildTreeFromFiles(t *testing.T) {
path: "",
Children: []*Node[models.File]{
{
File: &models.File{Path: "a"},
path: "a",
},
{
File: &models.File{Path: "b"},
path: "b",
path: ".",
Children: []*Node[models.File]{
{
File: &models.File{Path: "a"},
path: "./a",
},
{
File: &models.File{Path: "b"},
path: "./b",
},
},
},
},
},
@ -126,20 +137,25 @@ func TestBuildTreeFromFiles(t *testing.T) {
},
expected: &Node[models.File]{
path: "",
// it is a little strange that we're not bubbling up our merge conflict
// here but we are technically still in tree mode and that's the rule
Children: []*Node[models.File]{
{
File: &models.File{Path: "a"},
path: "a",
},
{
File: &models.File{Path: "b"},
path: "b",
},
{
File: &models.File{Path: "z", HasMergeConflicts: true},
path: "z",
path: ".",
// it is a little strange that we're not bubbling up our merge conflict
// here but we are technically still in tree mode and that's the rule
Children: []*Node[models.File]{
{
File: &models.File{Path: "a"},
path: "./a",
},
{
File: &models.File{Path: "b"},
path: "./b",
},
{
File: &models.File{Path: "z", HasMergeConflicts: true},
path: "./z",
},
},
},
},
},
@ -183,12 +199,12 @@ func TestBuildFlatTreeFromFiles(t *testing.T) {
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
CompressionLevel: 0,
},
{
File: &models.File{Path: "dir1/b"},
path: "dir1/b",
path: "./dir1/b",
CompressionLevel: 0,
},
},
@ -209,12 +225,12 @@ func TestBuildFlatTreeFromFiles(t *testing.T) {
Children: []*Node[models.File]{
{
File: &models.File{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
CompressionLevel: 0,
},
{
File: &models.File{Path: "dir2/b"},
path: "dir2/b",
path: "./dir2/b",
CompressionLevel: 0,
},
},
@ -235,11 +251,11 @@ func TestBuildFlatTreeFromFiles(t *testing.T) {
Children: []*Node[models.File]{
{
File: &models.File{Path: "a"},
path: "a",
path: "./a",
},
{
File: &models.File{Path: "b"},
path: "b",
path: "./b",
},
},
},
@ -277,27 +293,27 @@ func TestBuildFlatTreeFromFiles(t *testing.T) {
Children: []*Node[models.File]{
{
File: &models.File{Path: "c1", HasMergeConflicts: true},
path: "c1",
path: "./c1",
},
{
File: &models.File{Path: "c2", HasMergeConflicts: true},
path: "c2",
path: "./c2",
},
{
File: &models.File{Path: "b1", Tracked: true},
path: "b1",
path: "./b1",
},
{
File: &models.File{Path: "b2", Tracked: true},
path: "b2",
path: "./b2",
},
{
File: &models.File{Path: "a1", Tracked: false},
path: "a1",
path: "./a1",
},
{
File: &models.File{Path: "a2", Tracked: false},
path: "a2",
path: "./a2",
},
},
},
@ -340,15 +356,16 @@ func TestBuildTreeFromCommitFiles(t *testing.T) {
path: "",
Children: []*Node[models.CommitFile]{
{
path: "dir1",
path: "./dir1",
CompressionLevel: 1,
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
},
{
File: &models.CommitFile{Path: "dir1/b"},
path: "dir1/b",
path: "./dir1/b",
},
},
},
@ -369,24 +386,29 @@ func TestBuildTreeFromCommitFiles(t *testing.T) {
path: "",
Children: []*Node[models.CommitFile]{
{
path: "dir1/dir3",
path: ".",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir1/dir3/a"},
path: "dir1/dir3/a",
path: "./dir1/dir3",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir1/dir3/a"},
path: "./dir1/dir3/a",
},
},
CompressionLevel: 1,
},
},
CompressionLevel: 1,
},
{
path: "dir2/dir4",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir2/dir4/b"},
path: "dir2/dir4/b",
path: "./dir2/dir4",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir2/dir4/b"},
path: "./dir2/dir4/b",
},
},
CompressionLevel: 1,
},
},
CompressionLevel: 1,
},
},
},
@ -405,12 +427,17 @@ func TestBuildTreeFromCommitFiles(t *testing.T) {
path: "",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "a"},
path: "a",
},
{
File: &models.CommitFile{Path: "b"},
path: "b",
path: ".",
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "a"},
path: "./a",
},
{
File: &models.CommitFile{Path: "b"},
path: "./b",
},
},
},
},
},
@ -454,12 +481,12 @@ func TestBuildFlatTreeFromCommitFiles(t *testing.T) {
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
CompressionLevel: 0,
},
{
File: &models.CommitFile{Path: "dir1/b"},
path: "dir1/b",
path: "./dir1/b",
CompressionLevel: 0,
},
},
@ -480,12 +507,12 @@ func TestBuildFlatTreeFromCommitFiles(t *testing.T) {
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "dir1/a"},
path: "dir1/a",
path: "./dir1/a",
CompressionLevel: 0,
},
{
File: &models.CommitFile{Path: "dir2/b"},
path: "dir2/b",
path: "./dir2/b",
CompressionLevel: 0,
},
},
@ -506,11 +533,11 @@ func TestBuildFlatTreeFromCommitFiles(t *testing.T) {
Children: []*Node[models.CommitFile]{
{
File: &models.CommitFile{Path: "a"},
path: "a",
path: "./a",
},
{
File: &models.CommitFile{Path: "b"},
path: "b",
path: "./b",
},
},
},

14
pkg/gui/filetree/node.go
View file

@ -20,7 +20,7 @@ type Node[T any] struct {
Children []*Node[T]
// path of the file/directory
// private; use GetPath() to access
// private; use either GetPath() or GetInternalPath() to access
path string
// rather than render a tree as:
@ -47,7 +47,19 @@ func (self *Node[T]) GetFile() *T {
return self.File
}
// This returns the logical path from the user's point of view. It is the
// relative path from the root of the repository.
// Use this for display, or when you want to perform some action on the path
// (e.g. a git command).
func (self *Node[T]) GetPath() string {
return strings.TrimPrefix(self.path, "./")
}
// This returns the internal path from the tree's point of view. It's the same
// as GetPath(), but prefixed with "./" for the root item.
// Use this when interacting with the tree itself, e.g. when calling
// ToggleCollapsed.
func (self *Node[T]) GetInternalPath() string {
return self.path
}

20
pkg/gui/presentation/files.go
View file

@ -91,11 +91,11 @@ func renderAux[T any](
arr := []string{}
if !isRoot {
isCollapsed := collapsedPaths.IsCollapsed(node.GetPath())
isCollapsed := collapsedPaths.IsCollapsed(node.GetInternalPath())
arr = append(arr, renderLine(node, treeDepth, visualDepth, isCollapsed))
}
if collapsedPaths.IsCollapsed(node.GetPath()) {
if collapsedPaths.IsCollapsed(node.GetInternalPath()) {
return arr
}
@ -293,7 +293,13 @@ func getColorForChangeStatus(changeStatus string) style.TextStyle {
}
func fileNameAtDepth(node *filetree.Node[models.File], depth int) string {
splitName := split(node.GetPath())
splitName := split(node.GetInternalPath())
if depth == 0 && splitName[0] == "." {
if len(splitName) == 1 {
return "/"
}
depth = 1
}
name := join(splitName[depth:])
if node.File != nil && node.File.IsRename() {
@ -314,7 +320,13 @@ func fileNameAtDepth(node *filetree.Node[models.File], depth int) string {
}
func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) string {
splitName := split(node.GetPath())
splitName := split(node.GetInternalPath())
if depth == 0 && splitName[0] == "." {
if len(splitName) == 1 {
return "/"
}
depth = 1
}
name := join(splitName[depth:])
return name

39
pkg/gui/presentation/files_test.go
View file

@ -48,10 +48,11 @@ func TestRenderFileTree(t *testing.T) {
},
showLineChanges: true,
expected: []string{
" M test +1 -1",
" M test2 +1",
" M test3 -1",
" M test4",
"▼ /",
" M test +1 -1",
" M test2 +1",
" M test3 -1",
" M test4",
},
},
{
@ -66,16 +67,17 @@ func TestRenderFileTree(t *testing.T) {
},
expected: toStringSlice(
`
▶ dir1
▼ dir2
▼ /
▶ dir1
▼ dir2
M file3
M file4
M file5
M file1
▼ dir2
M file3
M file4
M file5
M file1
`,
),
collapsedPaths: []string{"dir1"},
collapsedPaths: []string{"./dir1"},
},
}
@ -127,16 +129,17 @@ func TestRenderCommitFileTree(t *testing.T) {
},
expected: toStringSlice(
`
▶ dir1
▼ dir2
▼ /
▶ dir1
▼ dir2
D file3
M file4
M file5
M file1
▼ dir2
D file3
M file4
M file5
M file1
`,
),
collapsedPaths: []string{"dir1"},
collapsedPaths: []string{"./dir1"},
},
}

5
pkg/integration/tests/branch/reset_to_upstream.go
View file

@ -72,8 +72,9 @@ var ResetToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Contains("hard commit"),
)
t.Views().Files().Lines(
Equals("A file-1"),
Equals("A file-2"),
Equals("▼ /"),
Equals(" A file-1"),
Equals(" A file-2"),
)
// hard reset

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().

12
pkg/integration/tests/conflicts/filter.go
View file

@ -18,8 +18,9 @@ var Filter = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("UU file1").IsSelected(),
Equals("UU file2"),
Equals("▼ /").IsSelected(),
Equals(" UU file1"),
Equals(" UU file2"),
).
Press(keys.Files.OpenStatusFilter).
Tap(func() {
@ -29,10 +30,11 @@ var Filter = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("UU file1").IsSelected(),
Equals("UU file2"),
Equals("▼ /").IsSelected(),
Equals(" UU file1"),
Equals(" UU file2"),
// now we see the non-merge conflict file
Equals("A file3"),
Equals(" A file3"),
)
},
})

6
pkg/integration/tests/conflicts/resolve_multiple_files.go
View file

@ -18,9 +18,11 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("UU file1").IsSelected(),
Equals("UU file2"),
Equals("▼ /").IsSelected(),
Equals(" UU file1"),
Equals(" UU file2"),
).
SelectNextItem().
PressEnter()
t.Views().MergeConflicts().

11
pkg/integration/tests/conflicts/resolve_no_auto_stage.go
View file

@ -20,9 +20,11 @@ var ResolveNoAutoStage = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("UU file1").IsSelected(),
Equals("UU file2"),
Equals("▼ /").IsSelected(),
Equals(" UU file1"),
Equals(" UU file2"),
).
SelectNextItem().
PressEnter()
t.Views().MergeConflicts().
@ -38,8 +40,9 @@ var ResolveNoAutoStage = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
// Resolving the conflict didn't auto-stage it
Lines(
Equals("UU file1").IsSelected(),
Equals("UU file2"),
Equals("▼ /"),
Equals(" UU file1").IsSelected(),
Equals(" UU file2"),
).
// So do that manually
PressPrimaryAction().

1
pkg/integration/tests/custom_commands/custom_commands_submenu.go
View file

@ -68,6 +68,7 @@ var CustomCommandsSubmenu = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("▼ /"),
Contains("myfile-commits"),
Contains("myfile-files"),
)

21
pkg/integration/tests/file/collapse_expand.go
View file

@ -21,26 +21,27 @@ var CollapseExpand = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" ?? file-one"),
Equals("▼ dir2"),
Equals(" ?? file-two"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" ?? file-one"),
Equals(" ▼ dir2"),
Equals(" ?? file-two"),
)
t.Views().Files().
Press(keys.Files.CollapseAll).
Lines(
Equals("▶ dir"),
Equals("▶ dir2"),
Equals("▶ /"),
)
t.Views().Files().
Press(keys.Files.ExpandAll).
Lines(
Equals("▼ dir").IsSelected(),
Equals(" ?? file-one"),
Equals("▼ dir2"),
Equals(" ?? file-two"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" ?? file-one"),
Equals(" ▼ dir2"),
Equals(" ?? file-two"),
)
},
})

79
pkg/integration/tests/file/discard_range_select.go
View file

@ -29,33 +29,35 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ?? file-1a"),
Equals(" ?? file-1b"),
Equals("▼ dir2"),
Equals(" ?? file-2a"),
Equals(" M file-2b"),
Equals("▼ dir3"),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals("?? file-a"),
Equals("?? file-b"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ?? file-1b"),
Equals(" ▼ dir2"),
Equals(" ?? file-2a"),
Equals(" M file-2b"),
Equals(" ▼ dir3"),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
).
NavigateToLine(Contains("file-1b")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file-2a")).
Lines(
Equals("▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ?? file-1b").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" ?? file-2a").IsSelected(),
Equals(" M file-2b"),
Equals("▼ dir3"),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals("?? file-a"),
Equals("?? file-b"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ?? file-1b").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" ?? file-2a").IsSelected(),
Equals(" M file-2b"),
Equals(" ▼ dir3"),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
).
// Discard
Press(keys.Universal.Remove).
@ -66,24 +68,26 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("▼ dir1"),
Equals(" ?? file-1a"),
Equals("▼ dir3").IsSelected(),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals("?? file-a"),
Equals("?? file-b"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ▼ dir3").IsSelected(),
Equals(" ?? file-3a"),
Equals(" M file-3b"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
).
// Verify you can discard collapsed directories in range select
PressEnter().
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file-a")).
Lines(
Equals("▼ dir1"),
Equals(" ?? file-1a"),
Equals("▶ dir3").IsSelected(),
Equals("?? file-a").IsSelected(),
Equals("?? file-b"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ▶ dir3").IsSelected(),
Equals(" ?? file-a").IsSelected(),
Equals(" ?? file-b"),
).
Press(keys.Universal.Remove).
Tap(func() {
@ -93,9 +97,10 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("▼ dir1"),
Equals(" ?? file-1a"),
Equals("?? file-b").IsSelected(),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-1a"),
Equals(" ?? file-b").IsSelected(),
)
},
})

19
pkg/integration/tests/file/discard_staged_changes.go
View file

@ -24,16 +24,18 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals(" M file2").IsSelected(),
Equals("?? file3"),
Equals(" M fileToRemove"),
Equals("▼ /").IsSelected(),
Equals(" M file2"),
Equals(" ?? file3"),
Equals(" M fileToRemove"),
).
NavigateToLine(Contains(`fileToRemove`)).
PressPrimaryAction().
Lines(
Equals(" M file2"),
Equals("?? file3"),
Equals("M fileToRemove").IsSelected(),
Equals("▼ /"),
Equals(" M file2"),
Equals(" ?? file3"),
Equals(" M fileToRemove").IsSelected(),
).
Press(keys.Files.ViewResetOptions)
@ -42,8 +44,9 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
// staged file has been removed
t.Views().Files().
Lines(
Equals(" M file2"),
Equals("?? file3").IsSelected(),
Equals("▼ /"),
Equals(" M file2"),
Equals(" ?? file3").IsSelected(),
)
// the file should have the same content that it originally had, given that that was committed already

21
pkg/integration/tests/file/discard_unstaged_dir_changes.go
View file

@ -30,13 +30,15 @@ var DiscardUnstagedDirChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" ▼ subdir"),
Equals(" ?? unstaged-file-one"),
Equals(" MM file-one"),
Equals(" ?? unstaged-file-two"),
Equals("?? unstaged-file-three"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" ▼ subdir"),
Equals(" ?? unstaged-file-one"),
Equals(" MM file-one"),
Equals(" ?? unstaged-file-two"),
Equals(" ?? unstaged-file-three"),
).
SelectNextItem().
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
@ -45,10 +47,11 @@ var DiscardUnstagedDirChanges = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M file-one"),
Equals("▼ /"),
Equals(" ▼ dir").IsSelected(),
Equals(" M file-one"),
// this guy remains untouched because it wasn't inside the 'dir' directory
Equals("?? unstaged-file-three"),
Equals(" ?? unstaged-file-three"),
)
t.FileSystem().FileContent("dir/file-one", Equals("original content\nnew content\n"))

21
pkg/integration/tests/file/discard_unstaged_file_changes.go
View file

@ -26,9 +26,11 @@ var DiscardUnstagedFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("MM file-one").IsSelected(),
Equals("AM file-two"),
Equals("▼ /").IsSelected(),
Equals(" MM file-one"),
Equals(" AM file-two"),
).
SelectNextItem().
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().
@ -37,13 +39,15 @@ var DiscardUnstagedFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("M file-one").IsSelected(),
Equals("AM file-two"),
Equals("▼ /"),
Equals(" M file-one").IsSelected(),
Equals(" AM file-two"),
).
SelectNextItem().
Lines(
Equals("M file-one"),
Equals("AM file-two").IsSelected(),
Equals("▼ /"),
Equals(" M file-one"),
Equals(" AM file-two").IsSelected(),
).
Press(keys.Universal.Remove).
Tap(func() {
@ -53,8 +57,9 @@ var DiscardUnstagedFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("M file-one"),
Equals("A file-two").IsSelected(),
Equals("▼ /"),
Equals(" M file-one"),
Equals(" A file-two").IsSelected(),
)
t.FileSystem().FileContent("file-one", Equals("original content\nnew content\n"))

47
pkg/integration/tests/file/discard_unstaged_range_select.go
View file

@ -26,27 +26,29 @@ var DiscardUnstagedRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals("▼ dir2"),
Equals(" A file-c"),
Equals(" M file-d"),
Equals("?? file-e"),
Equals("?? file-f"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals(" ▼ dir2"),
Equals(" A file-c"),
Equals(" M file-d"),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
NavigateToLine(Contains("file-b")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file-c")).
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" A file-c").IsSelected(),
Equals(" M file-d"),
Equals("?? file-e"),
Equals("?? file-f"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" A file-c").IsSelected(),
Equals(" M file-d"),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
// Discard
Press(keys.Universal.Remove).
@ -60,14 +62,15 @@ var DiscardUnstagedRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
// file-c is still there because it contained no unstaged changes
// file-d is gone because it was selected via dir2 and contained only unstaged changes
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals("▼ dir2"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ▼ dir2"),
// Re-selecting file-c because it's where the selected line index
// was before performing the action.
Equals(" A file-c").IsSelected(),
Equals("?? file-e"),
Equals("?? file-f"),
Equals(" A file-c").IsSelected(),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
)
},
})

8
pkg/integration/tests/file/discard_various_changes.go
View file

@ -21,11 +21,17 @@ var DiscardVariousChanges = NewIntegrationTest(NewIntegrationTestArgs{
label string
}
t.Views().Files().
IsFocused().
TopLines(
Equals("▼ /").IsSelected(),
)
discardOneByOne := func(files []statusFile) {
for _, file := range files {
t.Views().Files().
IsFocused().
SelectedLine(Contains(file.status + " " + file.label)).
NavigateToLine(Contains(file.status + " " + file.label)).
Press(keys.Universal.Remove)
t.ExpectPopup().Menu().

39
pkg/integration/tests/file/discard_various_changes_range_select.go
View file

@ -19,14 +19,16 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs
t.Views().Files().
IsFocused().
Lines(
Equals("UA added-them-changed-us.txt").IsSelected(),
Equals("AA both-added.txt"),
Equals("DD both-deleted.txt"),
Equals("UU both-modded.txt"),
Equals("AU changed-them-added-us.txt"),
Equals("UD deleted-them.txt"),
Equals("DU deleted-us.txt"),
Equals("▼ /").IsSelected(),
Equals(" UA added-them-changed-us.txt"),
Equals(" AA both-added.txt"),
Equals(" DD both-deleted.txt"),
Equals(" UU both-modded.txt"),
Equals(" AU changed-them-added-us.txt"),
Equals(" UD deleted-them.txt"),
Equals(" DU deleted-us.txt"),
).
SelectNextItem().
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("deleted-us.txt")).
Press(keys.Universal.Remove).
@ -42,17 +44,18 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs
Cancel()
}).
Lines(
Equals("AM added-changed.txt").IsSelected(),
Equals("MD change-delete.txt"),
Equals("D delete-change.txt"),
Equals("D deleted-staged.txt"),
Equals(" D deleted.txt"),
Equals("MM double-modded.txt"),
Equals("M modded-staged.txt"),
Equals(" M modded.txt"),
Equals("A new-staged.txt"),
Equals("?? new.txt"),
Equals("R renamed.txt → renamed2.txt"),
Equals("▼ /").IsSelected(),
Equals(" AM added-changed.txt"),
Equals(" MD change-delete.txt"),
Equals(" D delete-change.txt"),
Equals(" D deleted-staged.txt"),
Equals(" D deleted.txt"),
Equals(" MM double-modded.txt"),
Equals(" M modded-staged.txt"),
Equals(" M modded.txt"),
Equals(" A new-staged.txt"),
Equals(" ?? new.txt"),
Equals(" R renamed.txt → renamed2.txt"),
).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("renamed.txt")).

8
pkg/integration/tests/file/gitignore.go
View file

@ -20,10 +20,12 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("?? .gitignore").IsSelected(),
Equals("?? toExclude"),
Equals("?? toIgnore"),
Equals("▼ /").IsSelected(),
Equals(" ?? .gitignore"),
Equals(" ?? toExclude"),
Equals(" ?? toIgnore"),
).
SelectNextItem().
Press(keys.Files.IgnoreFile).
// ensure we can't exclude the .gitignore file
Tap(func() {

2
pkg/integration/tests/file/remember_commit_message_after_fail.go
View file

@ -31,6 +31,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ /"),
Contains("bad"),
Contains("one"),
).
@ -40,6 +41,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("Git command failed")).Confirm()
}).
NavigateToLine(Contains("bad")).
Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail
Tap(func() {
t.ExpectPopup().Menu().

5
pkg/integration/tests/file/rename_similarity_threshold_change.go
View file

@ -21,8 +21,9 @@ var RenameSimilarityThresholdChange = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("D original"),
Equals("A renamed"),
Equals("▼ /"),
Equals(" D original"),
Equals(" A renamed"),
).
Press(keys.Universal.DecreaseRenameSimilarityThreshold).
Tap(func() {

26
pkg/integration/tests/file/stage_children_range_select.go
View file

@ -21,12 +21,13 @@ var StageChildrenRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ baz").IsSelected(),
Equals(" ?? file"),
Equals("▼ bazbam"),
Equals(" ?? file"),
Equals("?? foo"),
Equals("?? foobar"),
Equals("▼ /").IsSelected(),
Equals(" ▼ baz"),
Equals(" ?? file"),
Equals(" ▼ bazbam"),
Equals(" ?? file"),
Equals(" ?? foo"),
Equals(" ?? foobar"),
).
// Select everything
Press(keys.Universal.ToggleRangeSelect).
@ -34,12 +35,13 @@ var StageChildrenRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
// Stage
PressPrimaryAction().
Lines(
Equals("▼ baz").IsSelected(),
Equals(" A file").IsSelected(),
Equals("▼ bazbam").IsSelected(),
Equals(" A file").IsSelected(),
Equals("A foo").IsSelected(),
Equals("A foobar").IsSelected(),
Equals("▼ /").IsSelected(),
Equals(" ▼ baz").IsSelected(),
Equals(" A file").IsSelected(),
Equals(" ▼ bazbam").IsSelected(),
Equals(" A file").IsSelected(),
Equals(" A foo").IsSelected(),
Equals(" A foobar").IsSelected(),
)
},
})

21
pkg/integration/tests/file/stage_deleted_range_select.go
View file

@ -23,28 +23,33 @@ var StageDeletedRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals(" D file-a").IsSelected(),
Equals(" D file-b"),
Equals("▼ /").IsSelected(),
Equals(" D file-a"),
Equals(" D file-b"),
).
SelectNextItem().
// Stage a single deleted file
PressPrimaryAction().
Lines(
Equals("D file-a").IsSelected(),
Equals(" D file-b"),
Equals("▼ /"),
Equals(" D file-a").IsSelected(),
Equals(" D file-b"),
).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file-b")).
// Stage both files while a deleted file is already staged
PressPrimaryAction().
Lines(
Equals("D file-a").IsSelected(),
Equals("D file-b").IsSelected(),
Equals("▼ /"),
Equals(" D file-a").IsSelected(),
Equals(" D file-b").IsSelected(),
).
// Unstage; back to everything being unstaged
PressPrimaryAction().
Lines(
Equals(" D file-a").IsSelected(),
Equals(" D file-b").IsSelected(),
Equals("▼ /"),
Equals(" D file-a").IsSelected(),
Equals(" D file-b").IsSelected(),
)
},
})

94
pkg/integration/tests/file/stage_range_select.go
View file

@ -26,14 +26,15 @@ var StageRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals("▼ dir2"),
Equals(" ?? file-c"),
Equals(" M file-d"),
Equals("?? file-e"),
Equals("?? file-f"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals(" ▼ dir2"),
Equals(" ?? file-c"),
Equals(" M file-d"),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
NavigateToLine(Contains("file-b")).
Press(keys.Universal.ToggleRangeSelect).
@ -41,27 +42,29 @@ var StageRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
// Stage
PressPrimaryAction().
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" A file-b").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" A file-c").IsSelected(),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" A file-b").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" A file-c").IsSelected(),
// Staged because dir2 was part of the selection when he hit space
Equals(" M file-d"),
Equals("?? file-e"),
Equals("?? file-f"),
Equals(" M file-d"),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
// Unstage; back to everything being unstaged
PressPrimaryAction().
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" ?? file-c").IsSelected(),
Equals(" M file-d"),
Equals("?? file-e"),
Equals("?? file-f"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" ?? file-c").IsSelected(),
Equals(" M file-d"),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("dir2")).
@ -69,38 +72,41 @@ var StageRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
// Collapse the directory
PressEnter().
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals("▶ dir2").IsSelected(),
Equals("?? file-e"),
Equals("?? file-f"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals(" ▶ dir2").IsSelected(),
Equals(" ?? file-e"),
Equals(" ?? file-f"),
).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file-e")).
// Stage
PressPrimaryAction().
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals("▶ dir2").IsSelected(),
Equals("A file-e").IsSelected(),
Equals("?? file-f"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals(" ▶ dir2").IsSelected(),
Equals(" A file-e").IsSelected(),
Equals(" ?? file-f"),
).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("dir2")).
// Expand the directory again to verify it's been staged
PressEnter().
Lines(
Equals("▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals("▼ dir2").IsSelected(),
Equals(" A file-c"),
Equals(" M file-d"),
Equals("A file-e"),
Equals("?? file-f"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ?? file-a"),
Equals(" ?? file-b"),
Equals(" ▼ dir2").IsSelected(),
Equals(" A file-c"),
Equals(" M file-d"),
Equals(" A file-e"),
Equals(" ?? file-f"),
)
},
})

15
pkg/integration/tests/filter_and_search/filter_by_file_status.go
View file

@ -29,8 +29,9 @@ var FilterByFileStatus = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Focus().
Lines(
Equals("A file-staged-but-untracked").IsSelected(),
Equals(" M file-tracked"),
Equals("▼ /").IsSelected(),
Equals(" A file-staged-but-untracked"),
Equals(" M file-tracked"),
).
Press(keys.Files.OpenStatusFilter).
Tap(func() {
@ -50,8 +51,9 @@ var FilterByFileStatus = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("A file-staged-but-untracked").IsSelected(),
Equals(" M file-tracked"),
Equals("▼ /").IsSelected(),
Equals(" A file-staged-but-untracked"),
Equals(" M file-tracked"),
).
Press(keys.Files.OpenStatusFilter).
Tap(func() {
@ -61,8 +63,9 @@ var FilterByFileStatus = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
Equals("A file-staged-but-untracked").IsSelected(),
Equals(" M file-tracked"),
Equals("▼ /").IsSelected(),
Equals(" A file-staged-but-untracked"),
Equals(" M file-tracked"),
)
},
})

28
pkg/integration/tests/filter_and_search/nested_filter.go
View file

@ -61,15 +61,17 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A apple").IsSelected(),
Equals("A grape"),
Equals("A orange"),
Equals("▼ /").IsSelected(),
Equals(" A apple"),
Equals(" A grape"),
Equals(" A orange"),
).
FilterOrSearch("grape").
Lines(
Equals("A apple"),
Equals("A grape").IsSelected(),
Equals("A orange"),
Equals("▼ /"),
Equals(" A apple"),
Equals(" A grape").IsSelected(),
Equals(" A orange"),
).
PressEnter()
@ -87,9 +89,10 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A apple"),
Equals("A grape").IsSelected(),
Equals("A orange"),
Equals("▼ /"),
Equals(" A apple"),
Equals(" A grape").IsSelected(),
Equals(" A orange"),
).
Tap(func() {
t.Views().Search().IsVisible().Content(Contains("matches for 'grape'"))
@ -100,9 +103,10 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Search().IsInvisible()
}).
Lines(
Equals("A apple"),
Equals("A grape").IsSelected(),
Equals("A orange"),
Equals("▼ /"),
Equals(" A apple"),
Equals(" A grape").IsSelected(),
Equals(" A orange"),
).
// escape to sub-commits view
PressEscape()

15
pkg/integration/tests/filter_and_search/nested_filter_transient.go
View file

@ -69,13 +69,15 @@ var NestedFilterTransient = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A file-one").IsSelected(),
Equals("A file-two"),
Equals("▼ /").IsSelected(),
Equals(" A file-one"),
Equals(" A file-two"),
).
FilterOrSearch("two").
Lines(
Equals("A file-one"),
Equals("A file-two").IsSelected(),
Equals("▼ /"),
Equals(" A file-one"),
Equals(" A file-two").IsSelected(),
)
t.Views().Branches().
@ -96,8 +98,9 @@ var NestedFilterTransient = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
// the search on the commit-files context has been cancelled
Lines(
Equals("A file-one").IsSelected(),
Equals("A file-two"),
Equals("▼ /").IsSelected(),
Equals(" A file-one"),
Equals(" A file-two"),
).
Tap(func() {
t.Views().Search().IsInvisible()

1
pkg/integration/tests/filter_by_path/shared.go
View file

@ -40,6 +40,7 @@ func postFilterTest(t *TestDriver) {
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ /"),
Contains(`filterFile`),
Contains(`otherFile`),
)

6
pkg/integration/tests/patch_building/apply_in_reverse.go
View file

@ -26,9 +26,11 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A file1").IsSelected(),
Equals("A file2"),
Equals("▼ /").IsSelected(),
Equals(" A file1"),
Equals(" A file2"),
).
SelectNextItem().
PressPrimaryAction()
t.Views().Information().Content(Contains("Building patch"))

14
pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
View file

@ -34,9 +34,11 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("M file1").IsSelected(),
Equals("M file2"),
Equals("▼ /").IsSelected(),
Equals(" M file1"),
Equals(" M file2"),
).
SelectNextItem().
// Add both files to the patch; the first will conflict, the second won't
PressPrimaryAction().
Tap(func() {
@ -81,9 +83,11 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Focus().
Lines(
Equals("M file1").IsSelected(),
Equals("M file2"),
)
Equals("▼ /").IsSelected(),
Equals(" M file1"),
Equals(" M file2"),
).
SelectNextItem()
t.Views().Main().
ContainsLines(

13
pkg/integration/tests/patch_building/move_range_to_index.go
View file

@ -31,10 +31,12 @@ var MoveRangeToIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("M file1").IsSelected(),
Equals("A file2"),
Equals("A file3"),
Equals("▼ /").IsSelected(),
Equals(" M file1"),
Equals(" A file2"),
Equals(" A file3"),
).
SelectNextItem().
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file2")).
PressPrimaryAction()
@ -55,8 +57,9 @@ var MoveRangeToIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Focus().
Lines(
Equals("M file1").IsSelected(),
Equals("A file2"),
Equals("▼ /").IsSelected(),
Equals(" M file1"),
Equals(" A file2"),
)
t.Views().Main().

11
pkg/integration/tests/patch_building/move_to_earlier_commit.go
View file

@ -66,11 +66,12 @@ var MoveToEarlierCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals("A unrelated-file"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals(" A unrelated-file"),
).
PressEscape()

11
pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go
View file

@ -66,11 +66,12 @@ var MoveToEarlierCommitNoKeepEmpty = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals("A unrelated-file"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals(" A unrelated-file"),
).
PressEscape()
},

4
pkg/integration/tests/patch_building/move_to_index.go
View file

@ -26,9 +26,11 @@ var MoveToIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("file1").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("file1"),
Contains("file2"),
).
SelectNextItem().
PressPrimaryAction()
t.Views().Information().Content(Contains("Building patch"))

11
pkg/integration/tests/patch_building/move_to_later_commit.go
View file

@ -66,11 +66,12 @@ var MoveToLaterCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir").IsSelected(),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals("A unrelated-file"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir"),
Equals(" M file1"),
Equals(" D file2"),
Equals(" A file3"),
Equals(" A unrelated-file"),
).
PressEscape()

4
pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go
View file

@ -67,9 +67,11 @@ var MoveToLaterCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("file1").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("file1"),
Contains("unrelated-file"),
).
SelectNextItem().
Tap(func() {
t.Views().Main().
Content(Contains("+1st line\n 2nd line"))

4
pkg/integration/tests/patch_building/remove_from_commit.go
View file

@ -26,9 +26,11 @@ var RemoveFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("file1").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("file1"),
Contains("file2"),
).
SelectNextItem().
PressPrimaryAction()
t.Views().Information().Content(Contains("Building patch"))

7
pkg/integration/tests/patch_building/select_all_files.go
View file

@ -27,9 +27,10 @@ var SelectAllFiles = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("A file1").IsSelected(),
Equals("A file2"),
Equals("A file3"),
Equals("▼ /").IsSelected(),
Equals(" A file1"),
Equals(" A file2"),
Equals(" A file3"),
).
Press(keys.Files.ToggleStagedAll)

4
pkg/integration/tests/patch_building/specific_selection.go
View file

@ -33,10 +33,12 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("direct-file").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("direct-file"),
Contains("hunk-file"),
Contains("line-file"),
).
SelectNextItem().
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("Building patch"))

85
pkg/integration/tests/patch_building/toggle_range.go
View file

@ -34,28 +34,30 @@ var ToggleRange = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" A file1-a"),
Equals(" A file2-a"),
Equals(" A file3-a"),
Equals("▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" A file1-a"),
Equals(" A file2-a"),
Equals(" A file3-a"),
Equals(" ▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
).
NavigateToLine(Contains("file1-a")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("file3-a")).
PressPrimaryAction().
Lines(
Equals("▼ dir1"),
Equals(" ● file1-a").IsSelected(),
Equals(" ● file2-a").IsSelected(),
Equals(" ● file3-a").IsSelected(),
Equals("▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ● file1-a").IsSelected(),
Equals(" ● file2-a").IsSelected(),
Equals(" ● file3-a").IsSelected(),
Equals(" ▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
).
PressEscape().
NavigateToLine(Contains("file3-b")).
@ -69,39 +71,42 @@ var ToggleRange = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1"),
Equals(" ● file1-a"),
Equals(" ● file2-a"),
Equals(" ● file3-a"),
Equals("▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" ◐ file3-b").IsSelected(),
Equals("▼ /"),
Equals(" ▼ dir1"),
Equals(" ● file1-a"),
Equals(" ● file2-a"),
Equals(" ● file3-a"),
Equals(" ▼ dir2"),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" ◐ file3-b").IsSelected(),
).
NavigateToLine(Contains("dir1")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("dir2")).
PressPrimaryAction().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ● file1-a").IsSelected(),
Equals(" ● file2-a").IsSelected(),
Equals(" ● file3-a").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" ● file1-b"),
Equals(" ● file2-b"),
Equals(" ● file3-b"),
Equals("▼ /"),
Equals(" ▼ dir1").IsSelected(),
Equals(" ● file1-a").IsSelected(),
Equals(" ● file2-a").IsSelected(),
Equals(" ● file3-a").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" ● file1-b"),
Equals(" ● file2-b"),
Equals(" ● file3-b"),
).
PressPrimaryAction().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" A file1-a").IsSelected(),
Equals(" A file2-a").IsSelected(),
Equals(" A file3-a").IsSelected(),
Equals("▼ dir2").IsSelected(),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
Equals("▼ /"),
Equals(" ▼ dir1").IsSelected(),
Equals(" A file1-a").IsSelected(),
Equals(" A file2-a").IsSelected(),
Equals(" A file3-a").IsSelected(),
Equals(" ▼ dir2").IsSelected(),
Equals(" A file1-b"),
Equals(" A file2-b"),
Equals(" A file3-b"),
)
},
})

4
pkg/integration/tests/reflog/patch.go
View file

@ -48,9 +48,11 @@ var Patch = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("file1").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("file1"),
Contains("file2"),
).
SelectNextItem().
PressPrimaryAction()
t.Views().Information().Content(Contains("Building patch"))

8
pkg/integration/tests/staging/discard_all_changes.go
View file

@ -22,9 +22,11 @@ var DiscardAllChanges = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsFocused().
Lines(
Equals(" M file1").IsSelected(),
Equals(" M file2"),
Equals("▼ /").IsSelected(),
Equals(" M file1"),
Equals(" M file2"),
).
SelectNextItem().
PressEnter()
t.Views().Staging().
@ -44,7 +46,7 @@ var DiscardAllChanges = NewIntegrationTest(NewIntegrationTestArgs{
// because there are no more changes in file1 we switch to file2
t.Views().Files().
Lines(
Equals(" M file2").IsSelected(),
Equals(" M file2"),
)
}).
// assert we are still in the staging panel, but now looking at the changes of the other file

4
pkg/integration/tests/stash/apply_patch.go
View file

@ -30,9 +30,11 @@ var ApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("myfile").IsSelected(),
Equals("▼ /").IsSelected(),
Contains("myfile"),
Contains("myfile2"),
).
SelectNextItem().
PressPrimaryAction()
t.Views().Information().Content(Contains("Building patch"))

10
pkg/integration/tests/stash/stash_and_keep_index.go
View file

@ -23,8 +23,9 @@ var StashAndKeepIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("M file-staged"),
Equals(" M file-unstaged"),
Equals("▼ /"),
Equals(" M file-staged"),
Equals(" M file-unstaged"),
).
Press(keys.Files.ViewStashOptions)
@ -49,8 +50,9 @@ var StashAndKeepIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("M file-staged"),
Equals("M file-unstaged"),
Equals("▼ /"),
Equals(" M file-staged"),
Equals(" M file-unstaged"),
)
},
})

5
pkg/integration/tests/stash/stash_including_untracked_files.go
View file

@ -22,8 +22,9 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("A file_1"),
Equals("?? file_2"),
Equals("▼ /"),
Equals(" A file_1"),
Equals(" ?? file_2"),
).
Press(keys.Files.ViewStashOptions)

5
pkg/integration/tests/stash/stash_staged.go
View file

@ -23,8 +23,9 @@ var StashStaged = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("M file-staged"),
Equals(" M file-unstaged"),
Equals("▼ /"),
Equals(" M file-staged"),
Equals(" M file-unstaged"),
).
Press(keys.Files.ViewStashOptions)

5
pkg/integration/tests/stash/stash_unstaged.go
View file

@ -23,8 +23,9 @@ var StashUnstaged = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("M file-staged"),
Equals(" M file-unstaged"),
Equals("▼ /"),
Equals(" M file-staged"),
Equals(" M file-unstaged"),
).
Press(keys.Files.ViewStashOptions)

6
pkg/integration/tests/submodule/add.go
View file

@ -44,9 +44,11 @@ var Add = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().Focus().
Lines(
Equals("A .gitmodules").IsSelected(),
Equals("A my_submodule_path (submodule)"),
Equals("▼ /").IsSelected(),
Equals(" A .gitmodules"),
Equals(" A my_submodule_path (submodule)"),
).
SelectNextItem().
Tap(func() {
t.Views().Main().Content(
Contains("[submodule \"my_submodule\"]").

8
pkg/integration/tests/submodule/remove.go
View file

@ -35,9 +35,11 @@ var Remove = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().Focus().
Lines(
Equals("M .gitmodules").IsSelected(),
Equals("D my_submodule_path"),
)
Equals("▼ /").IsSelected(),
Equals(" M .gitmodules"),
Equals(" D my_submodule_path"),
).
SelectNextItem()
t.Views().Main().Content(
Contains("-[submodule \"my_submodule_name\"]").

7
pkg/integration/tests/submodule/remove_nested.go
View file

@ -39,9 +39,10 @@ var RemoveNested = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().IsFocused().
Lines(
Equals("▼ modules").IsSelected(),
Equals(" D innerSubPath"),
Equals("M .gitmodules"),
Equals("▼ /").IsSelected(),
Equals(" ▼ modules"),
Equals(" D innerSubPath"),
Equals(" M .gitmodules"),
).
NavigateToLine(Contains(".gitmodules"))

15
pkg/integration/tests/submodule/reset.go
View file

@ -71,15 +71,17 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().Focus().
Lines(
Equals(" M my_submodule_path (submodule)"),
Equals("?? other_file").IsSelected(),
Equals("▼ /"),
Equals(" M my_submodule_path (submodule)"),
Equals(" ?? other_file").IsSelected(),
).
// Verify we can't use range select on submodules
Press(keys.Universal.ToggleRangeSelect).
SelectPreviousItem().
Lines(
Equals(" M my_submodule_path (submodule)").IsSelected(),
Equals("?? other_file").IsSelected(),
Equals("▼ /"),
Equals(" M my_submodule_path (submodule)").IsSelected(),
Equals(" ?? other_file").IsSelected(),
).
Press(keys.Universal.Remove).
Tap(func() {
@ -87,8 +89,9 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
}).
Press(keys.Universal.ToggleRangeSelect).
Lines(
Equals(" M my_submodule_path (submodule)").IsSelected(),
Equals("?? other_file"),
Equals("▼ /"),
Equals(" M my_submodule_path (submodule)").IsSelected(),
Equals(" ?? other_file"),
).
Press(keys.Universal.Remove).
Tap(func() {

10
pkg/integration/tests/undo/undo_commit.go
View file

@ -57,8 +57,9 @@ var UndoCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
Lines(
Equals("A file"),
Equals(" M other-file"),
Equals("▼ /"),
Equals(" A file"),
Equals(" M other-file"),
)
t.Views().Commits().Focus().
@ -84,8 +85,9 @@ var UndoCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().Focus().
Lines(
Equals("A file"),
Equals(" M other-file").IsSelected(),
Equals("▼ /"),
Equals(" A file"),
Equals(" M other-file").IsSelected(),
).
Press(keys.Universal.PrevItem).
Press(keys.Universal.Remove).