From 2531e5617f1d839a5d505895a8eedb54e95d811e Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 28 Feb 2025 19:12:19 +0200
Subject: [PATCH] refactor(test): remove need for async import

---
 src/public/app/test-setup.ts                             | 3 ++-
 .../app/widgets/view_widgets/calendar_view.spec.ts       | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/public/app/test-setup.ts b/src/public/app/test-setup.ts
index 75ca3ae6e..1b1df1a5b 100644
--- a/src/public/app/test-setup.ts
+++ b/src/public/app/test-setup.ts
@@ -1,8 +1,9 @@
 import { beforeAll, vi } from "vitest";
 import $ from "jquery";
 
+injectGlobals();
+
 beforeAll(() => {
-    injectGlobals();
     vi.mock("./services/ws.js", mockWebsocket);
     vi.mock("./services/server.js", mockServer);
 });
diff --git a/src/public/app/widgets/view_widgets/calendar_view.spec.ts b/src/public/app/widgets/view_widgets/calendar_view.spec.ts
index cb093f06c..e9bfbf8af 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.spec.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.spec.ts
@@ -1,5 +1,8 @@
 import { describe, it } from "vitest";
 import utils from "../../services/utils.js";
+import FNote from "../../entities/fnote.js";
+import froca from "../../services/froca.js";
+import FAttribute from "../../entities/fattribute.js";
 
 interface NoteDefinition {
     title: string;
@@ -10,10 +13,6 @@ async function buildNotes(notes: NoteDefinition[]) {
     const ids = [];
 
     for (const noteDef of notes) {
-        const FNote = (await import("../../entities/fnote.js")).default;
-        const FAttribute = (await import("../../entities/fattribute.js")).default;
-        const froca = (await import("../../services/froca.js")).default;
-
         const fakeNoteId = utils.randomString(6);
         const note = new FNote(froca, {
             noteId: fakeNoteId,
@@ -57,8 +56,6 @@ describe("Building events", () => {
         ]);
 
         // import CalendarView from "./calendar_view.js";
-        const FNote = (await import("../../entities/fnote.js")).default;
-        const froca = (await import("../../services/froca.js"));
         const CalendarView = (await import("./calendar_view.js")).default;
         const events = await CalendarView.buildEvents(noteIds);
         console.log(noteIds, events);