diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-04-18 12:07:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 12:07:30 +0800 |
| commit | 9d64d222a8c30db5076a591981ad7cfe672ba6f1 (patch) | |
| tree | c753eb898a1ead0afbe5b6a7a28b466ab0d2b8ac /internal/route/api | |
| parent | fa497b16332c24bc4d9e788c64bda94e3c1499a7 (diff) | |
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
Diffstat (limited to 'internal/route/api')
| -rw-r--r-- | internal/route/api/v1/admin/user.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/org/org.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/user/email.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/user/user.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index e5d42a92..419296af 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -90,7 +90,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { c.Error(err, "get user salt") return } - u.EncodePasswd() + u.EncodePassword() } u.LoginName = form.LoginName diff --git a/internal/route/api/v1/org/org.go b/internal/route/api/v1/org/org.go index 94c3f6a2..7a7de50e 100644 --- a/internal/route/api/v1/org/org.go +++ b/internal/route/api/v1/org/org.go @@ -27,7 +27,7 @@ func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user * Website: apiForm.Website, Location: apiForm.Location, IsActive: true, - Type: db.USER_TYPE_ORGANIZATION, + Type: db.UserOrganization, } if err := db.CreateOrganization(org, user); err != nil { if db.IsErrUserAlreadyExist(err) || diff --git a/internal/route/api/v1/user/email.go b/internal/route/api/v1/user/email.go index 07fd4f8a..5584803e 100644 --- a/internal/route/api/v1/user/email.go +++ b/internal/route/api/v1/user/email.go @@ -46,7 +46,7 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) { if err := db.AddEmailAddresses(emails); err != nil { if db.IsErrEmailAlreadyUsed(err) { - c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("email address has been used: "+err.(db.ErrEmailAlreadyUsed).Email)) + c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("email address has been used: "+err.(db.ErrEmailAlreadyUsed).Email())) } else { c.Error(err, "add email addresses") } diff --git a/internal/route/api/v1/user/user.go b/internal/route/api/v1/user/user.go index 695d5311..c57f8fed 100644 --- a/internal/route/api/v1/user/user.go +++ b/internal/route/api/v1/user/user.go @@ -19,7 +19,7 @@ import ( func Search(c *context.APIContext) { opts := &db.SearchUserOptions{ Keyword: c.Query("q"), - Type: db.USER_TYPE_INDIVIDUAL, + Type: db.UserIndividual, PageSize: com.StrTo(c.Query("limit")).MustInt(), } if opts.PageSize == 0 { |