From 1fa64b155b8db6bb9f4bb052550d071ee58c8a4e Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Mon, 5 Jun 2023 11:43:31 +0200
Subject: [PATCH] [TESTS] createUser via the user model helper for integration
 tests

(cherry picked from commit c1d14c5fffeb823385b2984cfcdb3e195bfb151d)
(cherry picked from commit 6af2eb3660a7aa0cf0c9e7353257c183f64480f6)
(cherry picked from commit 293e880821a048a270a6c02e66595b35de592031)
---
 tests/integration/integration_test.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index 4d9ecf3faf..7cc7a45018 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -24,6 +24,7 @@ import (
 
 	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/models/unittest"
+	user_model "code.gitea.io/gitea/models/user"
 	gitea_context "code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/json"
@@ -33,6 +34,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers"
+	user_service "code.gitea.io/gitea/services/user"
 	"code.gitea.io/gitea/tests"
 
 	"github.com/PuerkitoBio/goquery"
@@ -239,6 +241,21 @@ func getUserToken(t testing.TB, userName string, scope ...auth.AccessTokenScope)
 	return getTokenForLoggedInUser(t, loginUser(t, userName), scope...)
 }
 
+func createUser(t testing.TB, userName, email, password string) func() {
+	u := &user_model.User{
+		Name:               userName,
+		Email:              email,
+		Passwd:             password,
+		MustChangePassword: false,
+		LoginType:          auth.Plain,
+	}
+
+	assert.NoError(t, user_model.CreateUser(u, &user_model.CreateUserOverwriteOptions{}))
+	return func() {
+		assert.NoError(t, user_service.DeleteUser(context.Background(), u, true))
+	}
+}
+
 func loginUser(t testing.TB, userName string) *TestSession {
 	t.Helper()