Add test ban

Author: leighmacdonald

internal/test/appeal_test.go

@@ -1,7 +1,6 @@
 package test_test
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
@@ -13,38 +12,21 @@ import (
 
 func TestAppeal(t *testing.T) {
 	router := testRouter()
-	target := getUser()
-	targetAuth := loginUser(target)
+
+	targetAuth := loginUser(testTarget)
 
 	mod := getModerator()
 	modAuth := loginUser(mod)
 
-	// Create a valid ban_id
-	bannedPerson, errBan := banSteamUC.Ban(context.Background(), mod, domain.System, domain.RequestBanSteamCreate{
-		SourceIDField:  domain.SourceIDField{SourceID: mod.SteamID.String()},
-		TargetIDField:  domain.TargetIDField{TargetID: target.SteamID.String()},
-		Duration:       "1d",
-		BanType:        domain.Banned,
-		Reason:         domain.Cheating,
-		ReasonText:     "",
-		Note:           "notes",
-		ReportID:       0,
-		DemoName:       "demo-test.dem",
-		DemoTick:       100,
-		IncludeFriends: true,
-		EvadeOk:        true,
-	})
-	require.NoError(t, errBan)
-
 	// Check for no messages
 	var banMessages []domain.BanAppealMessage
-	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", bannedPerson.BanID), nil, http.StatusOK, targetAuth, &banMessages)
+	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", testBan.BanID), nil, http.StatusOK, targetAuth, &banMessages)
 	require.Empty(t, banMessages)
 
 	// Create a message
 	newMessage := domain.RequestMessageBodyMD{BodyMD: stringutil.SecureRandomString(100)}
 	var createdMessage domain.BanAppealMessage
-	testEndpointWithReceiver(t, router, http.MethodPost, fmt.Sprintf("/api/bans/%d/messages", bannedPerson.BanID), newMessage, http.StatusCreated, targetAuth, &createdMessage)
+	testEndpointWithReceiver(t, router, http.MethodPost, fmt.Sprintf("/api/bans/%d/messages", testBan.BanID), newMessage, http.StatusCreated, targetAuth, &createdMessage)
 	require.Equal(t, newMessage.BodyMD, createdMessage.MessageMD)
 
 	// Try and create a message as non target user or mod
@@ -57,7 +39,7 @@ func TestAppeal(t *testing.T) {
 	require.NotEmpty(t, appeals)
 
 	// Get messages
-	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", bannedPerson.BanID), nil, http.StatusOK, modAuth, &banMessages)
+	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", testBan.BanID), nil, http.StatusOK, modAuth, &banMessages)
 	require.NotEmpty(t, banMessages)
 
 	// Edit the message
@@ -70,7 +52,7 @@ func TestAppeal(t *testing.T) {
 	testEndpoint(t, router, http.MethodDelete, fmt.Sprintf("/api/bans/message/%d", createdMessage.BanMessageID), nil, http.StatusOK, modAuth)
 
 	// Confirm delete
-	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", bannedPerson.BanID), nil, http.StatusOK, modAuth, &banMessages)
+	testEndpointWithReceiver(t, router, http.MethodGet, fmt.Sprintf("/api/bans/%d/messages", testBan.BanID), nil, http.StatusOK, modAuth, &banMessages)
 	require.Empty(t, banMessages)
 }
 

internal/test/bans_steam_test.go

@@ -20,7 +20,7 @@ func TestBansSteam(t *testing.T) {
 	// Ensure no bans exist
 	var bansEmpty []domain.BanSteam
 	testEndpointWithReceiver(t, router, http.MethodGet, "/api/bans/steam", nil, http.StatusOK, modCreds, &bansEmpty)
-	require.Empty(t, bansEmpty)
+	require.Len(t, bansEmpty, 1)
 
 	// Create a ban
 	banReq := domain.RequestBanSteamCreate{
@@ -55,7 +55,7 @@ func TestBansSteam(t *testing.T) {
 	// Ensure it's in the ban collection
 	var bans []domain.BanSteam
 	testEndpointWithReceiver(t, router, http.MethodGet, "/api/bans/steam", nil, http.StatusOK, modCreds, &bans)
-	require.NotEmpty(t, bans)
+	require.Len(t, bans, 2)
 
 	updateReq := ban.RequestBanSteamUpdate{
 		TargetID:       fetchedBan.TargetID,

internal/test/main_test.go

@@ -54,6 +54,8 @@ import (
 var (
 	dbContainer    *postgresContainer
 	testServer     domain.Server
+	testBan        domain.BannedSteamPerson
+	testTarget     domain.Person
 	configUC       domain.ConfigUsecase
 	wikiUC         domain.WikiUsecase
 	personUC       domain.PersonUsecase
@@ -176,6 +178,32 @@ func TestMain(m *testing.M) {
 
 	testServer = server
 
+	mod := getModerator()
+	target := getUser()
+
+	// Create a valid ban_id
+	bannedPerson, errBan := banSteamUC.Ban(context.Background(), mod, domain.System, domain.RequestBanSteamCreate{
+		SourceIDField:  domain.SourceIDField{SourceID: mod.SteamID.String()},
+		TargetIDField:  domain.TargetIDField{TargetID: target.SteamID.String()},
+		Duration:       "1d",
+		BanType:        domain.Banned,
+		Reason:         domain.Cheating,
+		ReasonText:     "",
+		Note:           "notes",
+		ReportID:       0,
+		DemoName:       "demo-test.dem",
+		DemoTick:       100,
+		IncludeFriends: true,
+		EvadeOk:        true,
+	})
+
+	if errBan != nil {
+		panic(errBan)
+	}
+
+	testBan = bannedPerson
+	testTarget = target
+
 	m.Run()
 }