diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-09-19 19:49:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 19:49:59 +0800 |
| commit | a4bfef265d9e512830350635a0489c2cdcd6508f (patch) | |
| tree | 1e3c2ec94276dfcb2f8ba73a2ac075ba39c4a34a /services/webhook | |
| parent | 462306e263db5a809dbe2cdf62e99307aeff28de (diff) | |
| download | gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.tar.gz gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.zip | |
Move db related basic functions to models/db (#17075)
* Move db related basic functions to models/db
* Fix lint
* Fix lint
* Fix test
* Fix lint
* Fix lint
* revert unnecessary change
* Fix test
* Fix wrong replace string
* Use *Context
* Correct committer spelling and fix wrong replaced words
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'services/webhook')
| -rw-r--r-- | services/webhook/main_test.go | 4 | ||||
| -rw-r--r-- | services/webhook/webhook_test.go | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 6cb0cffe49..7aef4b3a51 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" ) func TestMain(m *testing.M) { - models.MainTest(m, filepath.Join("..", "..")) + db.MainTest(m, filepath.Join("..", "..")) } diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index 10c32a9485..095b30713c 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -8,6 +8,7 @@ import ( "testing" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" api "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" ) @@ -25,52 +26,52 @@ func TestWebhook_GetSlackHook(t *testing.T) { } func TestPrepareWebhooks(t *testing.T) { - assert.NoError(t, models.PrepareTestDatabase()) + assert.NoError(t, db.PrepareTestDatabase()) - repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository) + repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository) hookTasks := []*models.HookTask{ {RepoID: repo.ID, HookID: 1, EventType: models.HookEventPush}, } for _, hookTask := range hookTasks { - models.AssertNotExistsBean(t, hookTask) + db.AssertNotExistsBean(t, hookTask) } assert.NoError(t, PrepareWebhooks(repo, models.HookEventPush, &api.PushPayload{Commits: []*api.PayloadCommit{{}}})) for _, hookTask := range hookTasks { - models.AssertExistsAndLoadBean(t, hookTask) + db.AssertExistsAndLoadBean(t, hookTask) } } func TestPrepareWebhooksBranchFilterMatch(t *testing.T) { - assert.NoError(t, models.PrepareTestDatabase()) + assert.NoError(t, db.PrepareTestDatabase()) - repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) + repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) hookTasks := []*models.HookTask{ {RepoID: repo.ID, HookID: 4, EventType: models.HookEventPush}, } for _, hookTask := range hookTasks { - models.AssertNotExistsBean(t, hookTask) + db.AssertNotExistsBean(t, hookTask) } // this test also ensures that * doesn't handle / in any special way (like shell would) assert.NoError(t, PrepareWebhooks(repo, models.HookEventPush, &api.PushPayload{Ref: "refs/heads/feature/7791", Commits: []*api.PayloadCommit{{}}})) for _, hookTask := range hookTasks { - models.AssertExistsAndLoadBean(t, hookTask) + db.AssertExistsAndLoadBean(t, hookTask) } } func TestPrepareWebhooksBranchFilterNoMatch(t *testing.T) { - assert.NoError(t, models.PrepareTestDatabase()) + assert.NoError(t, db.PrepareTestDatabase()) - repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) + repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) hookTasks := []*models.HookTask{ {RepoID: repo.ID, HookID: 4, EventType: models.HookEventPush}, } for _, hookTask := range hookTasks { - models.AssertNotExistsBean(t, hookTask) + db.AssertNotExistsBean(t, hookTask) } assert.NoError(t, PrepareWebhooks(repo, models.HookEventPush, &api.PushPayload{Ref: "refs/heads/fix_weird_bug"})) for _, hookTask := range hookTasks { - models.AssertNotExistsBean(t, hookTask) + db.AssertNotExistsBean(t, hookTask) } } |