refactor: ✅ Only delete old test users once at preload

bunfig.toml

@@ -1,2 +1,5 @@
 [install.scopes]
 "@jsr" = "https://npm.jsr.io"
+
+[test]
+preload = ["./tests/setup.ts"]

drizzle/db.ts

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/node-postgres";
 import { migrate } from "drizzle-orm/postgres-js/migrator";
-import { LogLevel, type LogManager, type MultiLogManager } from "log-manager";
+import { LogLevel, LogManager, type MultiLogManager } from "log-manager";
 import { Client } from "pg";
 import { config } from "~/packages/config-manager";
 import * as schema from "./schema";
@@ -14,7 +14,7 @@ export const client = new Client({
 });
 
 export const setupDatabase = async (
-    logger: LogManager | MultiLogManager,
+    logger: LogManager | MultiLogManager = new LogManager(Bun.stdout),
     info = true,
 ) => {
     try {

server/api/api/auth/login/index.test.ts

@@ -4,15 +4,9 @@ import { eq } from "drizzle-orm";
 import { db } from "~drizzle/db";
 import { Applications } from "~drizzle/schema";
 import { config } from "~packages/config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, deleteUsers, passwords } = await getTestUsers(1);
 
 // Create application

server/api/api/auth/reset/index.test.ts

@@ -4,15 +4,9 @@ import { eq } from "drizzle-orm";
 import { db } from "~drizzle/db";
 import { Applications } from "~drizzle/schema";
 import { config } from "~packages/config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, deleteUsers, passwords } = await getTestUsers(1);
 const token = randomBytes(32).toString("hex");
 const newPassword = randomBytes(16).toString("hex");

server/api/api/v1/accounts/:id/block.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Relationship as APIRelationship } from "~types/mastodon/relationship";
 import { meta } from "./block";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 
 afterAll(async () => {

server/api/api/v1/accounts/:id/follow.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Relationship as APIRelationship } from "~types/mastodon/relationship";
 import { meta } from "./follow";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 
 afterAll(async () => {

server/api/api/v1/accounts/:id/followers.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./followers";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 
 afterAll(async () => {

server/api/api/v1/accounts/:id/following.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./following";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 
 afterAll(async () => {

server/api/api/v1/accounts/:id/index.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[0])).toReversed();
 

server/api/api/v1/accounts/:id/mute.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Relationship as APIRelationship } from "~types/mastodon/relationship";
 import { meta } from "./mute";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 
 afterAll(async () => {

server/api/api/v1/accounts/:id/statuses.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Status as APIStatus } from "~types/mastodon/status";
 import { meta } from "./statuses";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[1])).toReversed();
 const timeline2 = (await getTestStatuses(40, users[2])).toReversed();

server/api/api/v1/accounts/:id/unmute.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Relationship as APIRelationship } from "~types/mastodon/relationship";
 import { meta } from "./unmute";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 
 afterAll(async () => {

server/api/api/v1/accounts/index.test.ts

@@ -11,12 +11,7 @@ import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import { db } from "~drizzle/db";
 import { Users } from "~drizzle/schema";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./index";
 

server/api/api/v1/accounts/lookup/index.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 
 afterAll(async () => {

server/api/api/v1/accounts/search/index.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 
 afterAll(async () => {

server/api/api/v1/markers/index.test.ts

@@ -1,15 +1,8 @@
-import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(1);
 const timeline = await getTestStatuses(10, users[0]);
 

server/api/api/v1/mutes/index.test.ts

@@ -1,14 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(3);
 
 afterAll(async () => {

server/api/api/v1/notifications/:id/dismiss.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Notification as APINotification } from "~types/mastodon/notification";
 import { meta } from "./dismiss";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 let notifications: APINotification[] = [];
 

server/api/api/v1/notifications/:id/index.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Notification as APINotification } from "~types/mastodon/notification";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 let notifications: APINotification[] = [];
 

server/api/api/v1/notifications/clear/index.test.ts

@@ -1,15 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Notification as APINotification } from "~types/mastodon/notification";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 let notifications: APINotification[] = [];
 

server/api/api/v1/notifications/destroy_multiple/index.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Notification as APINotification } from "~types/mastodon/notification";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 const statuses = await getTestStatuses(40, users[0]);
 let notifications: APINotification[] = [];

server/api/api/v1/notifications/index.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Notification as APINotification } from "~types/mastodon/notification";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const getFormData = (object: Record<string, string | number | boolean>) =>
     Object.keys(object).reduce((formData, key) => {
         formData.append(key, String(object[key]));

server/api/api/v1/sso/:id/index.test.ts

@@ -1,14 +1,8 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "~packages/config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { deleteUsers, tokens } = await getTestUsers(1);
 
 afterAll(async () => {

server/api/api/v1/sso/index.test.ts

@@ -1,14 +1,8 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "~packages/config-manager";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { deleteUsers, tokens } = await getTestUsers(1);
 
 afterAll(async () => {

server/api/api/v1/statuses/:id/favourited_by.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./favourited_by";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[0])).toReversed();
 

server/api/api/v1/statuses/:id/reblogged_by.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Account as APIAccount } from "~types/mastodon/account";
 import { meta } from "./reblogged_by";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[0])).toReversed();
 

server/api/api/v1/statuses/index.test.ts

@@ -3,16 +3,10 @@ import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import { db } from "~drizzle/db";
 import { Emojis } from "~drizzle/schema";
-import {
+import { getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Status as APIStatus } from "~types/mastodon/status";
 import { meta } from "./index";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 
 afterAll(async () => {

server/api/api/v1/timelines/home.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Status as APIStatus } from "~types/mastodon/status";
 import { meta } from "./home";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[0])).toReversed();
 

server/api/api/v1/timelines/public.test.ts

@@ -1,16 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "config-manager";
-import {
+import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils";
-    deleteOldTestUsers,
-    getTestStatuses,
-    getTestUsers,
-    sendTestRequest,
-} from "~tests/utils";
 import type { Status as APIStatus } from "~types/mastodon/status";
 import { meta } from "./public";
 
-await deleteOldTestUsers();
-
 const { users, tokens, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(40, users[0])).toReversed();
 

tests/setup.ts

@@ -0,0 +1,5 @@
+import { setupDatabase } from "~drizzle/db";
+import { deleteOldTestUsers } from "./utils";
+
+await setupDatabase();
+await deleteOldTestUsers();