thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[TESTS] createUser via the user model helper for integration tests (squash)

Browse source
This commit is contained in:
Earl Warren 2023-06-27 11:48:13 +02:00
parent 801f7d600d
commit 6ff2383952
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/integration/integration_test.go
View file

@ -23,6 +23,7 @@ import (
"time" "time"
"code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
gitea_context "code.gitea.io/gitea/modules/context" gitea_context "code.gitea.io/gitea/modules/context"
@ -241,18 +242,19 @@ func getUserToken(t testing.TB, userName string, scope ...auth.AccessTokenScope)
return getTokenForLoggedInUser(t, loginUser(t, userName), scope...) return getTokenForLoggedInUser(t, loginUser(t, userName), scope...)
} }
func createUser(t testing.TB, userName, email, password string) func() { func createUser(ctx context.Context, t testing.TB, user *user_model.User) func() {
u := &user_model.User{ user.MustChangePassword = false
Name: userName, user.LowerName = strings.ToLower(user.Name)
Email: email,
Passwd: password, assert.NoError(t, db.Insert(ctx, user))
MustChangePassword: false,
LoginType: auth.Plain, if len(user.Email) > 0 {
changePrimaryEmail := true
assert.NoError(t, user_model.UpdateUser(ctx, user, changePrimaryEmail))
} }
assert.NoError(t, user_model.CreateUser(u, &user_model.CreateUserOverwriteOptions{}))
return func() { return func() {
assert.NoError(t, user_service.DeleteUser(context.Background(), u, true)) assert.NoError(t, user_service.DeleteUser(ctx, user, true))
} }
} }