Skip to content

Commit 040b8be

Browse files
lunnylunny
committed
Fix test
1 parent 8776f78 commit 040b8be

File tree

4 files changed

+66
-64
lines changed

4 files changed

+66
-64
lines changed

‎models/repo/main_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ func TestMain(m *testing.M) {
2222
"watch.yml",
2323
"star.yml",
2424
"topic.yml",
25+
"repo_topic.yml",
26+
"user.yml",
2527
)
2628
}

‎models/repo/repo_test.go

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/db"
11-
"code.gitea.io/gitea/models/unit"
1211
"code.gitea.io/gitea/models/unittest"
1312
user_model "code.gitea.io/gitea/models/user"
14-
"code.gitea.io/gitea/modules/markup"
1513

1614
"github.com/stretchr/testify/assert"
1715
)
@@ -45,54 +43,6 @@ func TestGetPrivateRepositoryCount(t *testing.T) {
4543
assert.Equal(t, int64(2), count)
4644
}
4745

48-
func TestMetas(t *testing.T) {
49-
assert.NoError(t, unittest.PrepareTestDatabase())
50-
51-
repo := &Repository{Name: "testRepo"}
52-
repo.Owner = &user_model.User{Name: "testOwner"}
53-
repo.OwnerName = repo.Owner.Name
54-
55-
repo.Units = nil
56-
57-
metas := repo.ComposeMetas()
58-
assert.Equal(t, "testRepo", metas["repo"])
59-
assert.Equal(t, "testOwner", metas["user"])
60-
61-
externalTracker := RepoUnit{
62-
Type: unit.TypeExternalTracker,
63-
Config: &ExternalTrackerConfig{
64-
ExternalTrackerFormat: "https://someurl.com/{user}/{repo}/{issue}",
65-
},
66-
}
67-
68-
testSuccess := func(expectedStyle string) {
69-
repo.Units = []*RepoUnit{&externalTracker}
70-
repo.RenderingMetas = nil
71-
metas := repo.ComposeMetas()
72-
assert.Equal(t, expectedStyle, metas["style"])
73-
assert.Equal(t, "testRepo", metas["repo"])
74-
assert.Equal(t, "testOwner", metas["user"])
75-
assert.Equal(t, "https://someurl.com/{user}/{repo}/{issue}", metas["format"])
76-
}
77-
78-
testSuccess(markup.IssueNameStyleNumeric)
79-
80-
externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markup.IssueNameStyleAlphanumeric
81-
testSuccess(markup.IssueNameStyleAlphanumeric)
82-
83-
externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markup.IssueNameStyleNumeric
84-
testSuccess(markup.IssueNameStyleNumeric)
85-
86-
repo, err := GetRepositoryByID(3)
87-
assert.NoError(t, err)
88-
89-
metas = repo.ComposeMetas()
90-
assert.Contains(t, metas, "org")
91-
assert.Contains(t, metas, "teams")
92-
assert.Equal(t, "user3", metas["org"])
93-
assert.Equal(t, ",owners,team1,", metas["teams"])
94-
}
95-
9646
func TestRepoAPIURL(t *testing.T) {
9747
assert.NoError(t, unittest.PrepareTestDatabase())
9848
repo := unittest.AssertExistsAndLoadBean(t, &Repository{ID: 10}).(*Repository)

‎models/repo/watch_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@ func TestIsWatching(t *testing.T) {
2626
assert.False(t, IsWatching(unittest.NonexistentID, unittest.NonexistentID))
2727
}
2828

29-
func TestWatchRepo(t *testing.T) {
30-
assert.NoError(t, unittest.PrepareTestDatabase())
31-
const repoID = 3
32-
const userID = 2
33-
34-
assert.NoError(t, WatchRepo(userID, repoID, true))
35-
unittest.AssertExistsAndLoadBean(t, &Watch{RepoID: repoID, UserID: userID})
36-
unittest.CheckConsistencyFor(t, &Repository{ID: repoID})
37-
38-
assert.NoError(t, WatchRepo(userID, repoID, false))
39-
unittest.AssertNotExistsBean(t, &Watch{RepoID: repoID, UserID: userID})
40-
unittest.CheckConsistencyFor(t, &Repository{ID: repoID})
41-
}
42-
4329
func TestGetWatchers(t *testing.T) {
4430
assert.NoError(t, unittest.PrepareTestDatabase())
4531

‎models/repo_test.go

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,74 @@ import (
1111
repo_model "code.gitea.io/gitea/models/repo"
1212
"code.gitea.io/gitea/models/unit"
1313
"code.gitea.io/gitea/models/unittest"
14+
user_model "code.gitea.io/gitea/models/user"
15+
"code.gitea.io/gitea/modules/markup"
1416

1517
"github.com/stretchr/testify/assert"
1618
)
1719

20+
func TestWatchRepo(t *testing.T) {
21+
assert.NoError(t, unittest.PrepareTestDatabase())
22+
const repoID = 3
23+
const userID = 2
24+
25+
assert.NoError(t, repo_model.WatchRepo(userID, repoID, true))
26+
unittest.AssertExistsAndLoadBean(t, &repo_model.Watch{RepoID: repoID, UserID: userID})
27+
unittest.CheckConsistencyFor(t, &repo_model.Repository{ID: repoID})
28+
29+
assert.NoError(t, repo_model.WatchRepo(userID, repoID, false))
30+
unittest.AssertNotExistsBean(t, &repo_model.Watch{RepoID: repoID, UserID: userID})
31+
unittest.CheckConsistencyFor(t, &repo_model.Repository{ID: repoID})
32+
}
33+
34+
func TestMetas(t *testing.T) {
35+
assert.NoError(t, unittest.PrepareTestDatabase())
36+
37+
repo := &repo_model.Repository{Name: "testRepo"}
38+
repo.Owner = &user_model.User{Name: "testOwner"}
39+
repo.OwnerName = repo.Owner.Name
40+
41+
repo.Units = nil
42+
43+
metas := repo.ComposeMetas()
44+
assert.Equal(t, "testRepo", metas["repo"])
45+
assert.Equal(t, "testOwner", metas["user"])
46+
47+
externalTracker := repo_model.RepoUnit{
48+
Type: unit.TypeExternalTracker,
49+
Config: &repo_model.ExternalTrackerConfig{
50+
ExternalTrackerFormat: "https://someurl.com/{user}/{repo}/{issue}",
51+
},
52+
}
53+
54+
testSuccess := func(expectedStyle string) {
55+
repo.Units = []*repo_model.RepoUnit{&externalTracker}
56+
repo.RenderingMetas = nil
57+
metas := repo.ComposeMetas()
58+
assert.Equal(t, expectedStyle, metas["style"])
59+
assert.Equal(t, "testRepo", metas["repo"])
60+
assert.Equal(t, "testOwner", metas["user"])
61+
assert.Equal(t, "https://someurl.com/{user}/{repo}/{issue}", metas["format"])
62+
}
63+
64+
testSuccess(markup.IssueNameStyleNumeric)
65+
66+
externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markup.IssueNameStyleAlphanumeric
67+
testSuccess(markup.IssueNameStyleAlphanumeric)
68+
69+
externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markup.IssueNameStyleNumeric
70+
testSuccess(markup.IssueNameStyleNumeric)
71+
72+
repo, err := repo_model.GetRepositoryByID(3)
73+
assert.NoError(t, err)
74+
75+
metas = repo.ComposeMetas()
76+
assert.Contains(t, metas, "org")
77+
assert.Contains(t, metas, "teams")
78+
assert.Equal(t, "user3", metas["org"])
79+
assert.Equal(t, ",owners,team1,", metas["teams"])
80+
}
81+
1882
func TestUpdateRepositoryVisibilityChanged(t *testing.T) {
1983
assert.NoError(t, unittest.PrepareTestDatabase())
2084

0 commit comments

Comments
 (0)