Skip to content

Commit 865a4a8

Browse files
committed
fix tests
1 parent a13e13d commit 865a4a8

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

services/repository/files/tree_test.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
package files
55

66
import (
7+
"html/template"
78
"testing"
89

910
"code.gitea.io/gitea/models/unittest"
11+
"code.gitea.io/gitea/modules/fileicon"
1012
"code.gitea.io/gitea/modules/git"
1113
api "code.gitea.io/gitea/modules/structs"
1214
"code.gitea.io/gitea/services/contexttest"
@@ -62,40 +64,51 @@ func TestGetTreeViewNodes(t *testing.T) {
6264
contexttest.LoadGitRepo(t, ctx)
6365
defer ctx.Repo.GitRepo.Close()
6466

65-
treeNodes, err := GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "")
67+
renderedIconPool := fileicon.NewRenderedIconPool()
68+
mockIconForFile := func(id string) template.HTML {
69+
return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
70+
}
71+
mockIconForFolder := func(id string) template.HTML {
72+
return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
73+
}
74+
treeNodes, err := GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "", "")
6675
assert.NoError(t, err)
6776
assert.Equal(t, []*TreeViewNode{
6877
{
6978
EntryName: "docs",
7079
EntryMode: "tree",
7180
FullPath: "docs",
81+
EntryIcon: mockIconForFolder(`svg-mfi-folder-docs`),
7282
},
7383
}, treeNodes)
7484

75-
treeNodes, err = GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "docs/README.md")
85+
treeNodes, err = GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "", "docs/README.md")
7686
assert.NoError(t, err)
7787
assert.Equal(t, []*TreeViewNode{
7888
{
7989
EntryName: "docs",
8090
EntryMode: "tree",
8191
FullPath: "docs",
92+
EntryIcon: mockIconForFolder(`svg-mfi-folder-docs`),
8293
Children: []*TreeViewNode{
8394
{
8495
EntryName: "README.md",
8596
EntryMode: "blob",
8697
FullPath: "docs/README.md",
98+
EntryIcon: mockIconForFile(`svg-mfi-readme`),
8799
},
88100
},
89101
},
90102
}, treeNodes)
91103

92-
treeNodes, err = GetTreeViewNodes(ctx, ctx.Repo.Commit, "docs", "README.md")
104+
treeNodes, err = GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "docs", "README.md")
93105
assert.NoError(t, err)
94106
assert.Equal(t, []*TreeViewNode{
95107
{
96108
EntryName: "README.md",
97109
EntryMode: "blob",
98110
FullPath: "docs/README.md",
111+
EntryIcon: mockIconForFile(`svg-mfi-readme`),
99112
},
100113
}, treeNodes)
101114
}

web_src/js/components/ViewFileTree.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ViewFileTreeItem from './ViewFileTreeItem.vue';
33
import {onMounted, ref} from 'vue';
44
import {pathEscapeSegments} from '../utils/url.ts';
55
import {GET} from '../modules/fetch.ts';
6-
import {createElementFromHTML} from "../utils/dom.ts";
6+
import {createElementFromHTML} from '../utils/dom.ts';
77
88
const elRoot = ref<HTMLElement | null>(null);
99

0 commit comments

Comments
 (0)