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 /routers/web/admin | |
| parent | 7f802631c54d2e91301158380b273b872d62bd80 (diff) | |
| download | gitea-df64fa486555de6f403a795fd16c2e9e1d59e535.tar.gz gitea-df64fa486555de6f403a795fd16c2e9e1d59e535.zip | |
Decouple unit test code from business code (#17623)
Diffstat (limited to 'routers/web/admin')
| -rw-r--r-- | routers/web/admin/main_test.go | 4 | ||||
| -rw-r--r-- | routers/web/admin/users_test.go | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/routers/web/admin/main_test.go b/routers/web/admin/main_test.go index cfdefdb1b4..e41d8fea75 100644 --- a/routers/web/admin/main_test.go +++ b/routers/web/admin/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/routers/web/admin/users_test.go b/routers/web/admin/users_test.go index 022d8f662c..62b35ea286 100644 --- a/routers/web/admin/users_test.go +++ b/routers/web/admin/users_test.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" @@ -20,7 +21,7 @@ import ( func TestNewUserPost_MustChangePassword(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "admin/users/new") u := db.AssertExistsAndLoadBean(t, &models.User{ @@ -57,7 +58,7 @@ func TestNewUserPost_MustChangePassword(t *testing.T) { } func TestNewUserPost_MustChangePasswordFalse(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "admin/users/new") u := db.AssertExistsAndLoadBean(t, &models.User{ @@ -94,7 +95,7 @@ func TestNewUserPost_MustChangePasswordFalse(t *testing.T) { } func TestNewUserPost_InvalidEmail(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "admin/users/new") u := db.AssertExistsAndLoadBean(t, &models.User{ @@ -124,7 +125,7 @@ func TestNewUserPost_InvalidEmail(t *testing.T) { } func TestNewUserPost_VisibilityDefaultPublic(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "admin/users/new") u := db.AssertExistsAndLoadBean(t, &models.User{ @@ -162,7 +163,7 @@ func TestNewUserPost_VisibilityDefaultPublic(t *testing.T) { } func TestNewUserPost_VisibilityPrivate(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "admin/users/new") u := db.AssertExistsAndLoadBean(t, &models.User{ |