Merge branch 'master' into constants

Author: Miodec

.gitignore

@@ -131,4 +131,5 @@ frontend/static/webfonts-preview
 
 .turbo
 frontend/.env.sentry-build-plugin
-.claude/worktrees
+.claude/worktrees
+1024MiB

backend/__tests__/__integration__/dal/preset.spec.ts

@@ -69,7 +69,7 @@ describe("PresetDal", () => {
       //WHEN / THEN
       await expect(() =>
         PresetDal.addPreset(uid, { name: "max", config: {} }),
-      ).rejects.toThrowError("Too many presets");
+      ).rejects.toThrow("Too many presets");
     });
     it("should add preset", async () => {
       //GIVEN
@@ -358,7 +358,7 @@ describe("PresetDal", () => {
       const uid = new ObjectId().toHexString();
       await expect(() =>
         PresetDal.removePreset(uid, new ObjectId().toHexString()),
-      ).rejects.toThrowError("Preset not found");
+      ).rejects.toThrow("Preset not found");
     });
     it("should remove", async () => {
       //GIVEN
@@ -421,7 +421,7 @@ describe("PresetDal", () => {
       //WHEN
       await expect(() =>
         PresetDal.removePreset(decoyUid, first),
-      ).rejects.toThrowError("Preset not found");
+      ).rejects.toThrow("Preset not found");
 
       //THEN
       const read = await PresetDal.getPresets(uid);

backend/__tests__/__integration__/dal/user.spec.ts

@@ -1175,7 +1175,7 @@ describe("UserDal", () => {
     it("should throw for unknown user", async () => {
       await expect(async () =>
         UserDAL.getPartialUser("1234", "stack", []),
-      ).rejects.toThrowError("User not found\nStack: stack");
+      ).rejects.toThrow("User not found\nStack: stack");
     });
 
     it("should get streak", async () => {
@@ -1228,7 +1228,7 @@ describe("UserDal", () => {
     it("throws for nonexisting user", async () => {
       await expect(async () =>
         UserDAL.updateEmail("unknown", "test@example.com"),
-      ).rejects.toThrowError("User not found\nStack: update email");
+      ).rejects.toThrow("User not found\nStack: update email");
     });
     it("should update", async () => {
       //given
@@ -1244,7 +1244,7 @@ describe("UserDal", () => {
   });
   describe("resetPb", () => {
     it("throws for nonexisting user", async () => {
-      await expect(async () => UserDAL.resetPb("unknown")).rejects.toThrowError(
+      await expect(async () => UserDAL.resetPb("unknown")).rejects.toThrow(
         "User not found\nStack: reset pb",
       );
     });
@@ -1272,7 +1272,7 @@ describe("UserDal", () => {
     it("throws for nonexisting user", async () => {
       await expect(async () =>
         UserDAL.linkDiscord("unknown", "", ""),
-      ).rejects.toThrowError("User not found\nStack: link discord");
+      ).rejects.toThrow("User not found\nStack: link discord");
     });
     it("should update", async () => {
       //given
@@ -1308,7 +1308,7 @@ describe("UserDal", () => {
     it("throws for nonexisting user", async () => {
       await expect(async () =>
         UserDAL.unlinkDiscord("unknown"),
-      ).rejects.toThrowError("User not found\nStack: unlink discord");
+      ).rejects.toThrow("User not found\nStack: unlink discord");
     });
     it("should update", async () => {
       //given

backend/__tests__/api/controllers/admin.spec.ts

@@ -323,7 +323,7 @@ describe("AdminController", () => {
         data: null,
       });
 
-      expect(addToInboxMock).toBeCalledTimes(2);
+      expect(addToInboxMock).toHaveBeenCalledTimes(2);
       expect(deleteReportsMock).toHaveBeenCalledWith(["1", "2"]);
     });
     it("should fail wihtout mandatory properties", async () => {

backend/__tests__/api/controllers/user.spec.ts

@@ -1814,7 +1814,7 @@ describe("user controller test", () => {
       //THEN
       expect(result.body.message).toEqual("The Discord account is blocked");
 
-      expect(blocklistContainsMock).toBeCalledWith({
+      expect(blocklistContainsMock).toHaveBeenCalledWith({
         discordId: "discordUserId",
       });
     });

backend/__tests__/middlewares/auth.spec.ts

@@ -154,7 +154,7 @@ describe("middlewares/auth", () => {
           { headers: { authorization: "ApeKey aWQua2V5" } },
           { acceptApeKeys: false },
         ),
-      ).rejects.toThrowError("This endpoint does not accept ApeKeys");
+      ).rejects.toThrow("This endpoint does not accept ApeKeys");
 
       //THEN
     });
@@ -170,7 +170,7 @@ describe("middlewares/auth", () => {
           { headers: { authorization: "ApeKey aWQua2V5" } },
           { acceptApeKeys: false },
         ),
-      ).rejects.toThrowError("ApeKeys are not being accepted at this time");
+      ).rejects.toThrow("ApeKeys are not being accepted at this time");
 
       //THEN
     });
@@ -253,7 +253,7 @@ describe("middlewares/auth", () => {
       );
     });
     it("should fail without authentication", async () => {
-      await expect(() => authenticate({ headers: {} })).rejects.toThrowError(
+      await expect(() => authenticate({ headers: {} })).rejects.toThrow(
         "Unauthorized\nStack: endpoint: /api/v1 no authorization header found",
       );
 
@@ -269,7 +269,7 @@ describe("middlewares/auth", () => {
     it("should fail with empty authentication", async () => {
       await expect(() =>
         authenticate({ headers: { authorization: "" } }),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         "Unauthorized\nStack: endpoint: /api/v1 no authorization header found",
       );
 
@@ -285,7 +285,7 @@ describe("middlewares/auth", () => {
     it("should fail with missing authentication token", async () => {
       await expect(() =>
         authenticate({ headers: { authorization: "Bearer" } }),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         "Missing authentication token\nStack: authenticateWithAuthHeader",
       );
 
@@ -301,7 +301,7 @@ describe("middlewares/auth", () => {
     it("should fail with unknown authentication scheme", async () => {
       await expect(() =>
         authenticate({ headers: { authorization: "unknown format" } }),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         'Unknown authentication scheme\nStack: The authentication scheme "unknown" is not implemented',
       );
 
@@ -417,7 +417,7 @@ describe("middlewares/auth", () => {
       //THEN
       await expect(() =>
         authenticate({ headers: {} }, { isPublicOnDev: true }),
-      ).rejects.toThrowError("Unauthorized");
+      ).rejects.toThrow("Unauthorized");
     });
     it("should allow with apeKey on dev public endpoint in production", async () => {
       //WHEN
@@ -476,7 +476,7 @@ describe("middlewares/auth", () => {
           },
           { isGithubWebhook: true },
         ),
-      ).rejects.toThrowError("Github webhook signature invalid");
+      ).rejects.toThrow("Github webhook signature invalid");
 
       //THEH
       expect(prometheusIncrementAuthMock).not.toHaveBeenCalled();
@@ -497,7 +497,7 @@ describe("middlewares/auth", () => {
           },
           { isGithubWebhook: true },
         ),
-      ).rejects.toThrowError("Missing Github signature header");
+      ).rejects.toThrow("Missing Github signature header");
 
       //THEH
       expect(prometheusIncrementAuthMock).not.toHaveBeenCalled();
@@ -518,7 +518,7 @@ describe("middlewares/auth", () => {
           },
           { isGithubWebhook: true },
         ),
-      ).rejects.toThrowError("Missing Github Webhook Secret");
+      ).rejects.toThrow("Missing Github Webhook Secret");
 
       //THEH
       expect(prometheusIncrementAuthMock).not.toHaveBeenCalled();
@@ -542,7 +542,7 @@ describe("middlewares/auth", () => {
           },
           { isGithubWebhook: true },
         ),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         "Failed to authenticate Github webhook: could not validate",
       );
 

backend/package.json

@@ -87,7 +87,7 @@
     "testcontainers": "11.11.0",
     "tsx": "4.21.0",
     "typescript": "6.0.0-beta",
-    "vitest": "4.0.15"
+    "vitest": "4.1.0"
   },
   "engines": {
     "node": ">=24.0.0 <25"

…tend/__tests__/utils/url-handler.spec.ts …_tests__/controllers/url-handler.spec.tsfrontend/__tests__/utils/url-handler.spec.ts renamed to frontend/__tests__/controllers/url-handler.spec.ts frontend/__tests__/utils/url-handler.spec.ts renamed to frontend/__tests__/controllers/url-handler.spec.ts

@@ -6,9 +6,9 @@ import * as Notifications from "../../src/ts/stores/notifications";
 import * as TestLogic from "../../src/ts/test/test-logic";
 import * as TestState from "../../src/ts/test/test-state";
 import * as Misc from "../../src/ts/utils/misc";
-import { loadTestSettingsFromUrl } from "../../src/ts/utils/url-handler";
 import { FunboxName } from "@monkeytype/schemas/configs";
 import { CustomTextSettings } from "@monkeytype/schemas/results";
+import { loadTestSettingsFromUrl } from "../../src/ts/controllers/url-handler";
 
 //mock modules to avoid dependencies
 vi.mock("../../src/ts/test/test-logic", () => ({

frontend/__tests__/elements/test-activity-calendar.spec.ts

@@ -1150,7 +1150,7 @@ describe("test-activity-calendar.ts", () => {
         );
 
         //WHEN
-        expect(() => calendar.increment(getDate("2024-04-09"))).toThrowError(
+        expect(() => calendar.increment(getDate("2024-04-09"))).toThrow(
           new Error("cannot alter data in the past."),
         );
       });

frontend/__tests__/root/config.spec.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeEach, afterAll, vi } from "vitest";
 import * as Config from "../../src/ts/config";
 import * as Misc from "../../src/ts/utils/misc";
+import * as Env from "../../src/ts/utils/env";
 import {
   ConfigKey,
   Config as ConfigType,
@@ -14,7 +15,7 @@ import * as Notifications from "../../src/ts/stores/notifications";
 const { replaceConfig, getConfig } = Config.__testing;
 
 describe("Config", () => {
-  const isDevEnvironmentMock = vi.spyOn(Misc, "isDevEnvironment");
+  const isDevEnvironmentMock = vi.spyOn(Env, "isDevEnvironment");
   beforeEach(() => {
     isDevEnvironmentMock.mockClear();
     replaceConfig({});
@@ -73,9 +74,7 @@ describe("Config", () => {
     it("should throw if config key in not found in metadata", () => {
       expect(() => {
         Config.setConfig("nonExistentKey" as ConfigKey, true);
-      }).toThrowError(
-        `Config metadata for key "nonExistentKey" is not defined.`,
-      );
+      }).toThrow(`Config metadata for key "nonExistentKey" is not defined.`);
     });
 
     it("fails if test is active and funbox no_quit", () => {