Skip to content

Commit 87ed579

Browse files
committed
Fix test
1 parent a125a58 commit 87ed579

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

services/repository/files/tree.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
427427
if lastDirEntry.IsRegular() {
428428
// path.Dir cannot correctly handle .xxx file
429429
dir, _ = path.Split(treePath)
430+
dir = strings.TrimRight(dir, "/")
430431
if dir == "" {
431432
lastDirEntry = rootEntry
432433
} else {

services/repository/files/tree_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,15 @@ func Test_GetTreeInformation(t *testing.T) {
139139
treeList, err = GetTreeInformation(ctx2, ctx2.Repo.Repository, "", refName)
140140
assert.NoError(t, err)
141141
assert.Len(t, treeList, 2)
142-
assert.EqualValues(t, "README.md", treeList[0].Name)
143-
assert.EqualValues(t, "README.md", treeList[0].Path)
144-
assert.True(t, treeList[0].IsFile)
142+
143+
assert.EqualValues(t, "doc", treeList[0].Name)
144+
assert.EqualValues(t, "doc", treeList[0].Path)
145+
assert.False(t, treeList[0].IsFile)
145146
assert.Empty(t, treeList[0].Children)
146147

147-
assert.EqualValues(t, "doc", treeList[1].Name)
148-
assert.EqualValues(t, "doc", treeList[1].Path)
149-
assert.False(t, treeList[1].IsFile)
148+
assert.EqualValues(t, "README.md", treeList[1].Name)
149+
assert.EqualValues(t, "README.md", treeList[1].Path)
150+
assert.True(t, treeList[1].IsFile)
150151
assert.Empty(t, treeList[1].Children)
151152

152153
treeList, err = GetTreeInformation(ctx2, ctx2.Repo.Repository, "doc", refName)

0 commit comments

Comments
 (0)