From 9d64d222a8c30db5076a591981ad7cfe672ba6f1 Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 18 Apr 2020 12:07:30 +0800 Subject: db: add tests for users (#6116) * Add new methods * Use Users.Create to replace previous hack * Reduce side effect * Do not clear tables when test failed * test_users_Authenticate * Rename constant * test_users_Create * test_users_GetByEmail * test_users_GetByID * test_users_GetByUsername --- internal/route/admin/orgs.go | 2 +- internal/route/admin/users.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/route/admin') diff --git a/internal/route/admin/orgs.go b/internal/route/admin/orgs.go index a3762484..e2fd4be5 100644 --- a/internal/route/admin/orgs.go +++ b/internal/route/admin/orgs.go @@ -21,7 +21,7 @@ func Organizations(c *context.Context) { c.Data["PageIsAdminOrganizations"] = true route.RenderUserSearch(c, &route.UserSearchOptions{ - Type: db.USER_TYPE_ORGANIZATION, + Type: db.UserOrganization, Counter: db.CountOrganizations, Ranger: db.Organizations, PageSize: conf.UI.Admin.OrgPagingNum, diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go index e48dbe7e..9f71cd1c 100644 --- a/internal/route/admin/users.go +++ b/internal/route/admin/users.go @@ -30,7 +30,7 @@ func Users(c *context.Context) { c.Data["PageIsAdminUsers"] = true route.RenderUserSearch(c, &route.UserSearchOptions{ - Type: db.USER_TYPE_INDIVIDUAL, + Type: db.UserIndividual, Counter: db.CountUsers, Ranger: db.ListUsers, PageSize: conf.UI.Admin.UserPagingNum, @@ -196,7 +196,7 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) { c.Error(err, "get user salt") return } - u.EncodePasswd() + u.EncodePassword() } u.LoginName = f.LoginName -- cgit v1.2.3