diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-11-12 22:36:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 22:36:47 +0800 |
| commit | df64fa486555de6f403a795fd16c2e9e1d59e535 (patch) | |
| tree | b899e9b9e5d57409b1bf0e3afbd606b6a3900235 /services/webhook | |
| parent | 7f802631c54d2e91301158380b273b872d62bd80 (diff) | |
| download | gitea-df64fa486555de6f403a795fd16c2e9e1d59e535.tar.gz gitea-df64fa486555de6f403a795fd16c2e9e1d59e535.zip | |
Decouple unit test code from business code (#17623)
Diffstat (limited to 'services/webhook')
| -rw-r--r-- | services/webhook/main_test.go | 4 | ||||
| -rw-r--r-- | services/webhook/webhook_test.go | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 7aef4b3a51..fc58f72565 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/db" + "code.gitea.io/gitea/models/unittest" ) func TestMain(m *testing.M) { - db.MainTest(m, filepath.Join("..", "..")) + unittest.MainTest(m, filepath.Join("..", "..")) } diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index 75f19e50ce..276d1e78cd 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" webhook_model "code.gitea.io/gitea/models/webhook" api "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" @@ -27,7 +28,7 @@ func TestWebhook_GetSlackHook(t *testing.T) { } func TestPrepareWebhooks(t *testing.T) { - assert.NoError(t, db.PrepareTestDatabase()) + assert.NoError(t, unittest.PrepareTestDatabase()) repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository) hookTasks := []*webhook_model.HookTask{ @@ -43,7 +44,7 @@ func TestPrepareWebhooks(t *testing.T) { } func TestPrepareWebhooksBranchFilterMatch(t *testing.T) { - assert.NoError(t, db.PrepareTestDatabase()) + assert.NoError(t, unittest.PrepareTestDatabase()) repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) hookTasks := []*webhook_model.HookTask{ @@ -60,7 +61,7 @@ func TestPrepareWebhooksBranchFilterMatch(t *testing.T) { } func TestPrepareWebhooksBranchFilterNoMatch(t *testing.T) { - assert.NoError(t, db.PrepareTestDatabase()) + assert.NoError(t, unittest.PrepareTestDatabase()) repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository) hookTasks := []*webhook_model.HookTask{ |