mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-18 13:29:25 +02:00
Fixed merge issues
This commit is contained in:
parent
ea63a9e41b
commit
b0d237b728
@ -35,21 +35,6 @@ describe("Test misc", () => {
|
|||||||
expect(spy).toHaveBeenCalled();
|
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 () => {
|
it("test fetch mock sync", async () => {
|
||||||
const response = await fetch("https://localhost:8080/account/info");
|
const response = await fetch("https://localhost:8080/account/info");
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
@ -114,7 +114,6 @@ export class GameManager {
|
|||||||
this.modifiers = new ModifierHelper(this);
|
this.modifiers = new ModifierHelper(this);
|
||||||
this.field = new FieldHelper(this);
|
this.field = new FieldHelper(this);
|
||||||
|
|
||||||
this.override.sanitizeOverrides();
|
|
||||||
this.initDefaultOverrides();
|
this.initDefaultOverrides();
|
||||||
|
|
||||||
// TODO: remove `any` assertion
|
// TODO: remove `any` assertion
|
||||||
|
Loading…
Reference in New Issue
Block a user