refactor: 🚚 Move testing to its own sub-package

benchmarks/timeline.ts

@@ -1,8 +1,12 @@
 import type { Status } from "@versia/client/schemas";
+import {
+    fakeRequest,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 import { bench, run } from "mitata";
 import type { z } from "zod";
 import { configureLoggers } from "@/loggers";
-import { fakeRequest, getTestStatuses, getTestUsers } from "~/tests/utils";
 
 await configureLoggers(true);
 

bun.lock

@@ -19,6 +19,7 @@
         "@scalar/hono-api-reference": "catalog:",
         "@sentry/bun": "catalog:",
         "@versia-server/config": "workspace:*",
+        "@versia-server/tests": "workspace:*",
         "@versia/client": "workspace:*",
         "@versia/kit": "workspace:*",
         "@versia/sdk": "workspace:*",
@@ -168,6 +169,17 @@
         "zod": "catalog:",
       },
     },
+    "packages/tests": {
+      "name": "@versia-server/tests",
+      "version": "0.0.1",
+      "dependencies": {
+        "@versia-server/config": "workspace:*",
+        "@versia/client": "workspace:*",
+        "@versia/kit": "workspace:*",
+        "altcha-lib": "catalog:",
+        "drizzle-orm": "catalog:",
+      },
+    },
     "packages/worker": {
       "name": "@versia-server/worker",
       "version": "0.9.0-alpha.0",
@@ -693,6 +705,8 @@
 
     "@versia-server/config": ["@versia-server/config@workspace:packages/config"],
 
+    "@versia-server/tests": ["@versia-server/tests@workspace:packages/tests"],
+
     "@versia-server/worker": ["@versia-server/worker@workspace:packages/worker"],
 
     "@versia/client": ["@versia/client@workspace:packages/client"],

bunfig.toml

@@ -2,4 +2,4 @@
 "@jsr" = "https://npm.jsr.io"
 
 [test]
-preload = ["./tests/setup.ts"]
+preload = ["./packages/tests/setup.ts"]

classes/media/preprocessors/blurhash.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
+import { mockModule } from "@versia-server/tests";
 import sharp from "sharp";
-import { mockModule } from "~/tests/utils.ts";
 import { calculateBlurhash } from "./blurhash.ts";
 
 describe("BlurhashPreprocessor", () => {

package.json

@@ -121,7 +121,9 @@
         "check": "bunx tsc -p .",
         "test": "bun test",
         "run-api": "bun run packages/api/build.ts && cd dist && ln -s ../config config && bun run packages/api/index.js",
-        "run-worker": "bun run packages/worker/build.ts && cd dist && ln -s ../config config && bun run packages/worker/index.js"
+        "run-worker": "bun run packages/worker/build.ts && cd dist && ln -s ../config config && bun run packages/worker/index.js",
+        "dev": "bun run --hot packages/api/index.ts",
+        "worker:dev": "bun run --hot packages/worker/index.ts"
     },
     "trustedDependencies": [
         "@biomejs/biome",
@@ -166,6 +168,7 @@
         "@versia/client": "workspace:*",
         "@versia/kit": "workspace:*",
         "@versia/sdk": "workspace:*",
+        "@versia-server/tests": "workspace:*",
         "@versia-server/config": "workspace:*",
         "altcha-lib": "catalog:",
         "blurhash": "catalog:",

packages/api/build.ts

@@ -1,6 +1,6 @@
 import { readdir } from "node:fs/promises";
 import { $, build } from "bun";
-import { routes } from "~/packages/api/routes";
+import { routes } from "./routes.ts";
 
 console.log("Building...");
 

packages/api/package.json

@@ -43,6 +43,7 @@
     },
     "dependencies": {
         "@versia-server/config": "workspace:*",
+        "@versia-server/tests": "workspace:*",
         "@versia/kit": "workspace:*",
         "@versia/client": "workspace:*",
         "@versia/sdk": "workspace:*",

packages/api/routes/api/auth/login/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { Application } from "@versia/kit/db";
 import { config } from "@versia-server/config";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
 import { randomString } from "@/math";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers, passwords } = await getTestUsers(1);
 

packages/api/routes/api/auth/reset/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { Application } from "@versia/kit/db";
 import { config } from "@versia-server/config";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
 import { randomString } from "@/math";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers, passwords } = await getTestUsers(1);
 const token = randomString(32, "hex");

packages/api/routes/api/v1/accounts/[id]/block.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/follow.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/accounts/[id]/followers.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/[id]/following.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/[id]/index.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[0])).toReversed();

packages/api/routes/api/v1/accounts/[id]/mute.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/note.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/pin.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/remove_from_followers.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
 import { Role } from "@versia/kit/db";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let role: Role;

packages/api/routes/api/v1/accounts/[id]/roles/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
 import { Role } from "@versia/kit/db";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let role: Role;

packages/api/routes/api/v1/accounts/[id]/statuses.test.ts

@@ -3,7 +3,7 @@ import {
     generateClient,
     getTestStatuses,
     getTestUsers,
-} from "~/tests/utils.ts";
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[1])).toReversed();

packages/api/routes/api/v1/accounts/[id]/unblock.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/unfollow.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/accounts/[id]/unmute.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/[id]/unpin.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/accounts/familiar_followers/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils.ts";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/index.get.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/index.post.test.ts

@@ -1,9 +1,9 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { db } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
+import { generateClient, getSolvedChallenge } from "@versia-server/tests";
 import { eq } from "drizzle-orm";
 import { randomString } from "@/math";
-import { generateClient, getSolvedChallenge } from "~/tests/utils";
 
 const username = randomString(10, "hex");
 const username2 = randomString(10, "hex");

packages/api/routes/api/v1/accounts/lookup/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/relationships/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { db } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { eq } from "drizzle-orm";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/search/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

packages/api/routes/api/v1/accounts/update_credentials/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "@versia-server/config";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(1);
 

packages/api/routes/api/v1/accounts/verify_credentials/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "@versia-server/config";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(1);
 

packages/api/routes/api/v1/blocks/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/challenges/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v1/challenges
 describe("/api/v1/challenges", () => {

packages/api/routes/api/v1/custom_emojis/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { db } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { inArray } from "drizzle-orm";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/emojis/[id]/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { db } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { inArray } from "drizzle-orm";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let id = "";

packages/api/routes/api/v1/emojis/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { db } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { inArray } from "drizzle-orm";
 import sharp from "sharp";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/instance/extended_description.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v1/instance/extended_description
 describe("/api/v1/instance/extended_description", () => {

packages/api/routes/api/v1/instance/privacy_policy.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v1/instance/privacy_policy
 describe("/api/v1/instance/privacy_policy", () => {

packages/api/routes/api/v1/instance/rules.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { config } from "@versia-server/config";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v1/instance/rules
 describe("/api/v1/instance/rules", () => {

packages/api/routes/api/v1/instance/terms_of_service.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v1/instance/terms_of_service
 describe("/api/v1/instance/terms_of_service", () => {

packages/api/routes/api/v1/markers/index.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(1);
 const timeline = await getTestStatuses(10, users[0]);

packages/api/routes/api/v1/mutes/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/notifications/[id]/dismiss.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification } from "@versia/client/schemas";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import type { z } from "zod";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let notifications: z.infer<typeof Notification>[] = [];

packages/api/routes/api/v1/notifications/[id]/index.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification } from "@versia/client/schemas";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import type { z } from "zod";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let notifications: z.infer<typeof Notification>[] = [];

packages/api/routes/api/v1/notifications/clear/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/notifications/destroy_multiple/index.test.ts

@@ -1,7 +1,11 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification } from "@versia/client/schemas";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 import type { z } from "zod";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 const statuses = await getTestStatuses(5, users[0]);

packages/api/routes/api/v1/notifications/index.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 const timeline = (await getTestStatuses(5, users[0])).toReversed();

packages/api/routes/api/v1/profile/avatar.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/profile/header.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

packages/api/routes/api/v1/push/subscription/index.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeEach, describe, expect, test } from "bun:test";
 import { PushSubscription } from "@versia/kit/db";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, tokens, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v1/roles/[id]/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
 import { Role } from "@versia/kit/db";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let role: Role;

packages/api/routes/api/v1/roles/index.test.ts

@@ -2,8 +2,8 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
 import { Role } from "@versia/kit/db";
 import { config } from "@versia-server/config";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(1);
 let role: Role;

packages/api/routes/api/v1/statuses/[id]/context.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 const statuses = await getTestStatuses(1, users[0]);

packages/api/routes/api/v1/statuses/[id]/favourite.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(2, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/favourited_by.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/index.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 const statuses = await getTestStatuses(1, users[0]);

packages/api/routes/api/v1/statuses/[id]/reactions/[name].test.ts

@@ -1,7 +1,11 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { Emoji, Media } from "@versia/kit/db";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 const timeline = (await getTestStatuses(2, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/reactions/index.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(3);
 const timeline = (await getTestStatuses(2, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/reblog.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 const statuses = await getTestStatuses(1, users[0]);

packages/api/routes/api/v1/statuses/[id]/reblogged_by.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/unfavourite.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(2, users[0])).toReversed();

packages/api/routes/api/v1/statuses/[id]/unreblog.test.ts

@@ -1,5 +1,9 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 const statuses = await getTestStatuses(1, users[0]);

packages/api/routes/api/v1/statuses/index.test.ts

@@ -3,10 +3,10 @@ import type { Status } from "@versia/client/schemas";
 import { db, Media } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
 import { eq } from "drizzle-orm";
 import type { z } from "zod";
-import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 let media: Media;

packages/api/routes/api/v1/timelines/home.test.ts

@@ -1,6 +1,10 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "@versia-server/config";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(10, users[0])).toReversed();

packages/api/routes/api/v1/timelines/public.test.ts

@@ -1,6 +1,10 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { config } from "@versia-server/config";
-import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
+import {
+    generateClient,
+    getTestStatuses,
+    getTestUsers,
+} from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(10, users[0])).toReversed();

packages/api/routes/api/v2/filters/[id]/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v2/filters/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "~/tests/utils";
+import { generateClient, getTestUsers } from "@versia-server/tests";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

packages/api/routes/api/v2/instance/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "~/tests/utils";
+import { generateClient } from "@versia-server/tests";
 
 // /api/v2/instance
 describe("/api/v2/instance", () => {

packages/api/routes/inbox/index.test.ts

@@ -4,6 +4,11 @@ import { Notes, Reactions, Users } from "@versia/kit/tables";
 import { sign } from "@versia/sdk/crypto";
 import * as VersiaEntities from "@versia/sdk/entities";
 import { config } from "@versia-server/config";
+import {
+    fakeRequest,
+    generateClient,
+    getTestUsers,
+} from "@versia-server/tests";
 import { randomUUIDv7, sleep } from "bun";
 import {
     clearMocks,
@@ -12,7 +17,6 @@ import {
     mock,
 } from "bun-bagel";
 import { and, eq, isNull } from "drizzle-orm";
-import { fakeRequest, generateClient, getTestUsers } from "~/tests/utils";
 
 const instanceUrl = new URL("https://versia.example.com");
 const noteId = randomUUIDv7();

packages/api/routes/oauth.test.ts

@@ -1,10 +1,11 @@
-/**
- * @deprecated
- */
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Application, Token } from "@versia/client/schemas";
+import type { Token } from "@versia/client/schemas";
+import {
+    fakeRequest,
+    generateClient,
+    getTestUsers,
+} from "@versia-server/tests";
 import type { z } from "zod";
-import { fakeRequest, getTestUsers } from "./utils.ts";
 
 let clientId: string;
 let clientSecret: string;
@@ -17,36 +18,18 @@ afterAll(async () => {
     await deleteUsers();
 });
 
-describe("POST /api/v1/apps/", () => {
+describe("Login flow", () => {
     test("should create an application", async () => {
-        const formData = new FormData();
+        const client = await generateClient(users[0]);
 
-        formData.append("client_name", "Test Application");
+        const { ok, data } = await client.createApp("Test Application", {
-        formData.append("website", "https://example.com");
+            redirect_uris: "https://example.com",
-        formData.append("redirect_uris", "https://example.com");
+            website: "https://example.com",
-        formData.append("scopes", "read write");
+            scopes: ["read", "write"],
-
-        const response = await fakeRequest("/api/v1/apps", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                client_name: "Test Application",
-                website: "https://example.com",
-                redirect_uris: "https://example.com",
-                scopes: "read write",
-            }),
         });
 
-        expect(response.status).toBe(200);
+        expect(ok).toBe(true);
-        expect(response.headers.get("content-type")).toContain(
+        expect(data).toEqual({
-            "application/json",
-        );
-
-        const json = await response.json();
-
-        expect(json).toEqual({
             name: "Test Application",
             website: "https://example.com",
             client_id: expect.any(String),
@@ -57,12 +40,10 @@ describe("POST /api/v1/apps/", () => {
             scopes: ["read", "write"],
         });
 
-        clientId = json.client_id;
+        clientId = data.client_id;
-        clientSecret = json.client_secret;
+        clientSecret = data.client_secret;
     });
-});
 
-describe("POST /api/auth/login/", () => {
     test("should get a JWT", async () => {
         const formData = new FormData();
 
@@ -83,9 +64,7 @@ describe("POST /api/auth/login/", () => {
             response.headers.get("Set-Cookie")?.match(/jwt=([^;]+);/)?.[1] ??
             "";
     });
-});
 
-describe("GET /oauth/authorize/", () => {
     test("should get a code", async () => {
         const response = await fakeRequest("/oauth/authorize", {
             method: "POST",
@@ -113,9 +92,7 @@ describe("GET /oauth/authorize/", () => {
 
         code = locationHeader.searchParams.get("code") ?? "";
     });
-});
 
-describe("POST /oauth/token/", () => {
     test("should get an access token", async () => {
         const response = await fakeRequest("/oauth/token", {
             method: "POST",
@@ -151,24 +128,19 @@ describe("POST /oauth/token/", () => {
 
         token = json;
     });
-});
 
-describe("GET /api/v1/apps/verify_credentials", () => {
     test("should return the authenticated application's credentials", async () => {
-        const response = await fakeRequest("/api/v1/apps/verify_credentials", {
+        const client = await generateClient(users[0]);
+
+        const { ok, data } = await client.verifyAppCredentials({
             headers: {
                 Authorization: `Bearer ${token.access_token}`,
             },
         });
 
-        expect(response.status).toBe(200);
+        expect(ok).toBe(true);
-        expect(response.headers.get("content-type")).toContain(
-            "application/json",
-        );
 
-        const credentials = (await response.json()) as Partial<
+        const credentials = data;
-            z.infer<typeof Application>
-        >;
 
         expect(credentials.name).toBe("Test Application");
         expect(credentials.website).toBe("https://example.com");

packages/tests/package.json

@@ -0,0 +1,20 @@
+{
+    "name": "@versia-server/tests",
+    "module": "index.ts",
+    "type": "module",
+    "version": "0.0.1",
+    "private": true,
+    "exports": {
+        ".": {
+            "import": "./index.ts",
+            "default": "./index.ts"
+        }
+    },
+    "dependencies": {
+        "@versia-server/config": "workspace:*",
+        "@versia/kit": "workspace:*",
+        "@versia/client": "workspace:*",
+        "altcha-lib": "catalog:",
+        "drizzle-orm": "catalog:"
+    }
+}

packages/tests/setup.ts

@@ -1,5 +1,5 @@
 import { setupDatabase } from "@versia/kit/db";
-import { deleteOldTestUsers } from "./utils.ts";
+import { deleteOldTestUsers } from "./index.ts";
 
 await setupDatabase();
 await deleteOldTestUsers();

plugins/openid/routes/authorize.test.ts

@@ -2,10 +2,10 @@ import { afterAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
 import { Application } from "@versia/kit/db";
 import { config } from "@versia-server/config";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
 import { SignJWT } from "jose";
 import { randomString } from "@/math";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
 
 const { deleteUsers, tokens, users } = await getTestUsers(1);
 const privateKey = await crypto.subtle.importKey(

plugins/openid/routes/jwks.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { Application } from "@versia/kit/db";
+import { fakeRequest } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { fakeRequest } from "~/tests/utils";
 
 const application = await Application.insert({
     id: randomUUIDv7(),

plugins/openid/routes/oauth/revoke.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { Application, Token } from "@versia/kit/db";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
 
 const { deleteUsers, users } = await getTestUsers(1);
 

plugins/openid/routes/oauth/token.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import { Application, Token } from "@versia/kit/db";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 import { randomUUIDv7 } from "bun";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
 
 const { deleteUsers, users } = await getTestUsers(1);
 

plugins/openid/routes/sso/:id/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 
 const { deleteUsers, tokens } = await getTestUsers(1);
 

plugins/openid/routes/sso/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { fakeRequest, getTestUsers } from "~/tests/utils";
+import { fakeRequest, getTestUsers } from "@versia-server/tests";
 
 const { deleteUsers, tokens } = await getTestUsers(1);