Skip to content

Commit 85f9018

Browse files
ethantkoeniglafriks
authored andcommitted
Improve wiki test (#3493) (#3511)
1 parent c0675ef commit 85f9018

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

routers/repo/wiki_test.go

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,52 @@ package repo
77
import (
88
"io/ioutil"
99
"net/http"
10-
"path/filepath"
1110
"testing"
1211

12+
"code.gitea.io/git"
1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/auth"
1515
"code.gitea.io/gitea/modules/test"
1616

17-
"github.com/Unknwon/com"
1817
"github.com/stretchr/testify/assert"
1918
)
2019

2120
const content = "Wiki contents for unit tests"
2221
const message = "Wiki commit message for unit tests"
2322

24-
func wikiPath(repo *models.Repository, wikiName string) string {
25-
return filepath.Join(repo.LocalWikiPath(), models.WikiNameToFilename(wikiName))
23+
func wikiEntry(t *testing.T, repo *models.Repository, wikiName string) *git.TreeEntry {
24+
wikiRepo, err := git.OpenRepository(repo.WikiPath())
25+
assert.NoError(t, err)
26+
commit, err := wikiRepo.GetBranchCommit("master")
27+
assert.NoError(t, err)
28+
entries, err := commit.ListEntries()
29+
assert.NoError(t, err)
30+
for _, entry := range entries {
31+
if entry.Name() == models.WikiNameToFilename(wikiName) {
32+
return entry
33+
}
34+
}
35+
return nil
2636
}
2737

2838
func wikiContent(t *testing.T, repo *models.Repository, wikiName string) string {
29-
bytes, err := ioutil.ReadFile(wikiPath(repo, wikiName))
39+
entry := wikiEntry(t, repo, wikiName)
40+
if !assert.NotNil(t, entry) {
41+
return ""
42+
}
43+
reader, err := entry.Blob().Data()
44+
assert.NoError(t, err)
45+
bytes, err := ioutil.ReadAll(reader)
3046
assert.NoError(t, err)
3147
return string(bytes)
3248
}
3349

3450
func assertWikiExists(t *testing.T, repo *models.Repository, wikiName string) {
35-
assert.True(t, com.IsExist(wikiPath(repo, wikiName)))
51+
assert.NotNil(t, wikiEntry(t, repo, wikiName))
3652
}
3753

3854
func assertWikiNotExists(t *testing.T, repo *models.Repository, wikiName string) {
39-
assert.False(t, com.IsExist(wikiPath(repo, wikiName)))
55+
assert.Nil(t, wikiEntry(t, repo, wikiName))
4056
}
4157

4258
func assertPagesMetas(t *testing.T, expectedNames []string, metas interface{}) {

0 commit comments

Comments
 (0)