finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Decouple unit test, remove intermediate unittestbridge package (#17662)

Browse source 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
wxiaoguang 2021-11-16 16:53:21 +08:00 • committed by GitHub
parent 23bd7b1211
commit 81926d61db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
151 changed files with 1719 additions and 1781 deletions
Download patch file Download diff file Expand all files Collapse all files

5
routers/api/v1/repo/hook_test.go
View file

@ -8,7 +8,6 @@ import (
"net/http"
"testing"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/models/webhook"
"code.gitea.io/gitea/modules/context"
@ -28,8 +27,8 @@ func TestTestHook(t *testing.T) {
TestHook(&context.APIContext{Context: ctx, Org: nil})
assert.EqualValues(t, http.StatusNoContent, ctx.Resp.Status())
db.AssertExistsAndLoadBean(t, &webhook.HookTask{
unittest.AssertExistsAndLoadBean(t, &webhook.HookTask{
RepoID: 1,
HookID: 1,
}, db.Cond("is_delivered=?", false))
}, unittest.Cond("is_delivered=?", false))
}

9
routers/api/v1/repo/repo_test.go
View file

@ -9,7 +9,6 @@ import (
"testing"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/context"
api "code.gitea.io/gitea/modules/structs"
@ -61,9 +60,9 @@ func TestRepoEdit(t *testing.T) {
Edit(apiCtx)
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
db.AssertExistsAndLoadBean(t, &models.Repository{
unittest.AssertExistsAndLoadBean(t, &models.Repository{
ID: 1,
}, db.Cond("name = ? AND is_archived = 1", *opts.Name))
}, unittest.Cond("name = ? AND is_archived = 1", *opts.Name))
}
func TestRepoEditNameChange(t *testing.T) {
@ -83,7 +82,7 @@ func TestRepoEditNameChange(t *testing.T) {
Edit(apiCtx)
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
db.AssertExistsAndLoadBean(t, &models.Repository{
unittest.AssertExistsAndLoadBean(t, &models.Repository{
ID: 1,
}, db.Cond("name = ?", opts.Name))
}, unittest.Cond("name = ?", opts.Name))
}