Fixed merge issues

This commit is contained in:
Bertie690 2025-07-26 14:51:22 -04:00
parent ea63a9e41b
commit b0d237b728
2 changed files with 0 additions and 16 deletions

View File

@ -35,21 +35,6 @@ describe("Test misc", () => {
expect(spy).toHaveBeenCalled();
});
it.skip("test apifetch mock async", async () => {
const spy = vi.fn();
await apiFetch("https://localhost:8080/account/info")
.then(response => {
expect(response.status).toBe(200);
expect(response.ok).toBe(true);
return response.json();
})
.then(data => {
spy(); // Call the spy function
expect(data).toEqual({ username: "greenlamp", lastSessionSlot: 0 });
});
expect(spy).toHaveBeenCalled();
});
it("test fetch mock sync", async () => {
const response = await fetch("https://localhost:8080/account/info");
const data = await response.json();

View File

@ -114,7 +114,6 @@ export class GameManager {
this.modifiers = new ModifierHelper(this);
this.field = new FieldHelper(this);
this.override.sanitizeOverrides();
this.initDefaultOverrides();
// TODO: remove `any` assertion