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

earl-warren · earl-warren · commit 8cbd00592d9c · 2024-02-05T15:06:51.000+01:00
See https://codeberg.org/forgejo/forgejo/pulls/2295
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
@@ -286,8 +286,7 @@ func createUser(ctx context.Context, t testing.TB, user *user_model.User) func()
 	assert.NoError(t, db.Insert(ctx, user))
 
 	if len(user.Email) > 0 {
-		changePrimaryEmail := true
-		assert.NoError(t, user_model.UpdateUser(ctx, user, changePrimaryEmail))
+		assert.NoError(t, user_service.ReplacePrimaryEmailAddress(ctx, user, user.Email))
 	}
 
 	return func() {

Original file line number	Diff line number	Diff line change
`@@ -286,8 +286,7 @@ func createUser(ctx context.Context, t testing.TB, user *user_model.User) func()`
`286`	`286`	`assert.NoError(t, db.Insert(ctx, user))`
`287`	`287`
`288`	`288`	`if len(user.Email) > 0 {`
`289`		`- changePrimaryEmail := true`
`290`		`- assert.NoError(t, user_model.UpdateUser(ctx, user, changePrimaryEmail))`
	`289`	`+ assert.NoError(t, user_service.ReplacePrimaryEmailAddress(ctx, user, user.Email))`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`return func() {`