@@ -7,36 +7,52 @@ package repo
7
7
import (
8
8
"io/ioutil"
9
9
"net/http"
10
- "path/filepath"
11
10
"testing"
12
11
12
+ "code.gitea.io/git"
13
13
"code.gitea.io/gitea/models"
14
14
"code.gitea.io/gitea/modules/auth"
15
15
"code.gitea.io/gitea/modules/test"
16
16
17
- "github.com/Unknwon/com"
18
17
"github.com/stretchr/testify/assert"
19
18
)
20
19
21
20
const content = "Wiki contents for unit tests"
22
21
const message = "Wiki commit message for unit tests"
23
22
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
26
36
}
27
37
28
38
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 )
30
46
assert .NoError (t , err )
31
47
return string (bytes )
32
48
}
33
49
34
50
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 ))
36
52
}
37
53
38
54
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 ))
40
56
}
41
57
42
58
func assertPagesMetas (t * testing.T , expectedNames []string , metas interface {}) {
0 commit comments