remove context in NewAPITester

HISTORY.rst

 Release history
 ===============
 
+- apitester: remove context in NewAPITester
+
 - go 1.24.1
 
 - template-varlist: fix error handling

restapi/handlers/account-template-update_test.go

@@ -10,8 +10,7 @@
 	"orus.io/orus-io/go-orusapi/database"
 
 	"orus.io/orus-io/rednerd/models"
-	"orus.io/orus-io/rednerd/testutils"
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestAccountTemplateUpdate(t *testing.T) {
@@ -14,12 +13,8 @@
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestAccountTemplateUpdate(t *testing.T) {
-	log := testutils.GetLogger(t)
-	ctx := t.Context()
-	ctx = log.WithContext(ctx)
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	tmpl := models.Template{
 		Account:    "janedoe",
 		Name:       "hello",
@@ -52,7 +47,7 @@
 
 	t.Run("Update body", func(t *testing.T) {
 		defer func() {
-			_, _ = database.Exec(tester.DB, squirrel.Delete(models.TemplateDBTable), &log)
+			_, _ = database.Exec(tester.DB, squirrel.Delete(models.TemplateDBTable), &tester.Logger)
 		}()
 
 		var responseTemplate models.Template
@@ -77,7 +72,7 @@
 
 	t.Run("Rename", func(t *testing.T) {
 		defer func() {
-			_, _ = database.Exec(tester.DB, squirrel.Delete(models.TemplateDBTable), &log)
+			_, _ = database.Exec(tester.DB, squirrel.Delete(models.TemplateDBTable), &tester.Logger)
 		}()
 
 		var responseTemplate models.Template

restapi/handlers/renderlogs_test.go

@@ -14,9 +14,7 @@
 )
 
 func TestRenderLogs(t *testing.T) {
-	ctx := t.Context()
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	now := time.Now()

restapi/handlers/user-get_test.go

@@ -3,5 +3,4 @@
 import (
 	"net/http"
 	"testing"
-	"time"
 
@@ -7,3 +6,2 @@
 
-	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
@@ -9,4 +7,3 @@
 	"github.com/stretchr/testify/require"
-	"orus.io/orus-io/go-orusapi/database"
 
 	"orus.io/orus-io/rednerd/models"
@@ -11,6 +8,5 @@
 
 	"orus.io/orus-io/rednerd/models"
-	"orus.io/orus-io/rednerd/testutils"
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
@@ -14,33 +10,4 @@
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
-func AddUserActivity(
-	t *testing.T,
-	log zerolog.Logger,
-	db *database.TestDB,
-	username string,
-	qtyCurrentMonth, qtyLastMonth int,
-) {
-	t.Helper()
-
-	renderList := make([]*models.RenderLog, 0, qtyCurrentMonth+qtyLastMonth)
-
-	for range qtyCurrentMonth {
-		rd := models.NewRenderLog(time.Now(), "text", "mjml", username)
-		rd.SetDuration(time.Second)
-		renderList = append(renderList, rd)
-	}
-
-	for range qtyLastMonth {
-		rd := models.NewRenderLog(time.Now().AddDate(0, -1, 0), "text", "mjml", username)
-		rd.SetDuration(time.Second)
-		renderList = append(renderList, rd)
-	}
-
-	for _, rlog := range renderList {
-		_, err := database.Exec(db, database.SQLInsert(rlog), &log)
-		require.NoError(t, err)
-	}
-}
-
 func TestUserGet(t *testing.T) {
@@ -46,9 +13,5 @@
 func TestUserGet(t *testing.T) {
-	log := testutils.GetLogger(t)
-	ctx := t.Context()
-	ctx = log.WithContext(ctx)
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	// login as admin and create a user
@@ -58,7 +21,7 @@
 	// adding some dummy activity for the user JohnDoe
 	qtyCurrentMonth := 4
 	qtyLastMonth := 2
-	AddUserActivity(t, log, tester.DB, "johndoe",
+	tester.AddUserActivity("johndoe",
 		qtyCurrentMonth, qtyLastMonth)
 
 	tester.Logout()

restapi/handlers/user-list_test.go

@@ -8,8 +8,7 @@
 	"github.com/stretchr/testify/require"
 
 	"orus.io/orus-io/rednerd/models"
-	"orus.io/orus-io/rednerd/testutils"
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestUserList(t *testing.T) {
@@ -12,12 +11,8 @@
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestUserList(t *testing.T) {
-	log := testutils.GetLogger(t)
-	ctx := t.Context()
-	ctx = log.WithContext(ctx)
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	// login as admin and create 10 users
@@ -27,7 +22,7 @@
 		john := "johndoe_" + strconv.Itoa(k)
 		tester.CreateUser(john, "password"+strconv.Itoa(k))
 		// adding some dummy activity for the user JohnDoe
-		AddUserActivity(t, log, tester.DB, john, 4, 2)
+		tester.AddUserActivity(john, 4, 2)
 	}
 
 	tester.Logout()

restapi/handlers/user-update_test.go

@@ -7,8 +7,7 @@
 	"github.com/stretchr/testify/require"
 
 	"orus.io/orus-io/rednerd/models"
-	"orus.io/orus-io/rednerd/testutils"
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestUserUpdate(t *testing.T) {
@@ -11,12 +10,8 @@
 	"orus.io/orus-io/rednerd/testutils/apitester"
 )
 
 func TestUserUpdate(t *testing.T) {
-	log := testutils.GetLogger(t)
-	ctx := t.Context()
-	ctx = log.WithContext(ctx)
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	// login as admin and create a user
@@ -27,7 +22,7 @@
 	// adding some dummy activity for the user JohnDoe
 	qtyCurrentMonth := 4
 	qtyLastMonth := 2
-	AddUserActivity(t, log, tester.DB, "johndoe",
+	tester.AddUserActivity("johndoe",
 		qtyCurrentMonth, qtyLastMonth)
 
 	r := tester.APITest("user_get").

tests/auth_test.go

@@ -15,7 +15,7 @@
 func TestAuthentication(t *testing.T) {
 	ctx := t.Context()
 
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	t.Run("WebToken", func(t *testing.T) {

tests/forgot_password_test.go

@@ -16,7 +16,7 @@
 func TestForgotPassword(t *testing.T) {
 	ctx := t.Context()
 
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	tester.Register(&models.Registration{

tests/register_test.go

@@ -16,7 +16,7 @@
 func TestRegister(t *testing.T) {
 	ctx := t.Context()
 
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	t.Run("register", func(t *testing.T) {

tests/render_test.go

@@ -13,9 +13,7 @@
 )
 
 func TestRender(t *testing.T) {
-	ctx := t.Context()
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	defer tester.Logout()

tests/reset-password_test.go

@@ -16,7 +16,7 @@
 func TestResetPassword(t *testing.T) {
 	ctx := t.Context()
 
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	tester.Register(&models.Registration{

tests/template_management_test.go

@@ -50,7 +50,7 @@
 	ctx := t.Context()
 	ctx = log.WithContext(ctx)
 
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	defer tester.Logout()

tests/user_management_test.go

@@ -11,9 +11,7 @@
 )
 
 func TestUserManagement(t *testing.T) {
-	ctx := t.Context()
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	tester.Debug()
 
 	defer tester.Close()

tests/varlist_test.go

@@ -10,9 +10,7 @@
 )
 
 func TestVarlist(t *testing.T) {
-	ctx := t.Context()
-
-	tester := apitester.NewAPITester(ctx, t, nil)
+	tester := apitester.NewAPITester(t, nil)
 	defer tester.Close()
 
 	defer tester.Logout()

tests/wpd_load_test.go

@@ -23,11 +23,9 @@
 func TestWPDHeavyLoad(t *testing.T) {
 	engineOptions := cmd.NewEngineOptions()
 
-	ctx := t.Context()
-
 	require.NoError(t, engineOptions.SetupEngineOptions(nil))
 	engineOptions.SetOptions(
 		"WPD", &wpd.EngineOptions{
 			WorkerPoolSize: 10,
 		})
 
@@ -28,12 +26,13 @@
 	require.NoError(t, engineOptions.SetupEngineOptions(nil))
 	engineOptions.SetOptions(
 		"WPD", &wpd.EngineOptions{
 			WorkerPoolSize: 10,
 		})
 
-	tester := apitester.NewAPITester(ctx, t, &engineOptions, func(s *restapi.Server) {
-		s.WriteTimeout = time.Minute * 5
-	})
+	tester := apitester.NewAPITester(
+		t, &engineOptions, func(s *restapi.Server) {
+			s.WriteTimeout = time.Minute * 5
+		})
 	defer tester.Close()
 
 	defer tester.Logout()

testutils/apitester/apitester.go

@@ -55,11 +55,10 @@
 // NewAPITester setup a APITester.
 // false positive on thelper that I can't figure out.
 // it should allow t *testing.T param to be second here but weirdly does not.
-func NewAPITester( //nolint:thelper
-	ctx context.Context,
+func NewAPITester(
 	t *testing.T,
 	engineOptions *cmd.EngineOptions,
 	serverOptions ...ServerOption,
 ) *APITester {
 	t.Helper()
 
@@ -60,10 +59,10 @@
 	t *testing.T,
 	engineOptions *cmd.EngineOptions,
 	serverOptions ...ServerOption,
 ) *APITester {
 	t.Helper()
 
-	testerCtx, cancel := context.WithCancel(ctx)
+	testerCtx, cancel := context.WithCancel(t.Context())
 
 	log := testutils.GetLogger(t)
 	testLog := testutils.NewTestLogger(t)

testutils/apitester/apitester_user_management.go

@@ -2,5 +2,6 @@
 
 import (
 	"net/http"
+	"time"
 
 	"github.com/stretchr/testify/require"
@@ -5,5 +6,6 @@
 
 	"github.com/stretchr/testify/require"
+	"orus.io/orus-io/go-orusapi/database"
 
 	"orus.io/orus-io/rednerd/models"
 )
@@ -66,3 +68,27 @@
 		End()
 	r.JSON(users)
 }
+
+func (tester *APITester) AddUserActivity(
+	username string,
+	qtyCurrentMonth, qtyLastMonth int,
+) {
+	renderList := make([]*models.RenderLog, 0, qtyCurrentMonth+qtyLastMonth)
+
+	for range qtyCurrentMonth {
+		rd := models.NewRenderLog(time.Now(), "text", "mjml", username)
+		rd.SetDuration(time.Second)
+		renderList = append(renderList, rd)
+	}
+
+	for range qtyLastMonth {
+		rd := models.NewRenderLog(time.Now().AddDate(0, -1, 0), "text", "mjml", username)
+		rd.SetDuration(time.Second)
+		renderList = append(renderList, rd)
+	}
+
+	for _, rlog := range renderList {
+		_, err := database.Exec(tester.DB, database.SQLInsert(rlog), &tester.Logger)
+		require.NoError(tester.t, err)
+	}
+}