From 6ff56c36e3a19194d9990beaeab6bcac76fbbbc2 Mon Sep 17 00:00:00 2001 From: Aakansha Doshi Date: Fri, 6 Sep 2024 16:41:37 +0530 Subject: [PATCH] fix: add partial mocking (#8473) * fix: add partial mocking * lint * Update packages/utils/export.test.ts --- packages/excalidraw/tests/flip.test.tsx | 17 ++++++++--------- packages/utils/export.test.ts | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/excalidraw/tests/flip.test.tsx b/packages/excalidraw/tests/flip.test.tsx index 5cf4cd55c7..53cbc53c8b 100644 --- a/packages/excalidraw/tests/flip.test.tsx +++ b/packages/excalidraw/tests/flip.test.tsx @@ -23,7 +23,6 @@ import { Excalidraw } from "../index"; import type { NormalizedZoomValue } from "../types"; import { ROUNDNESS } from "../constants"; import { vi } from "vitest"; -import * as blob from "../data/blob"; import { KEYS } from "../keys"; import { getBoundTextElementPosition } from "../element/textElement"; import { createPasteEvent } from "../clipboard"; @@ -33,15 +32,15 @@ import { point, type Radians } from "../../math"; const { h } = window; const mouse = new Pointer("mouse"); -// This needs to fixed in vitest mock, as when importActual used with mock -// the tests hangs - https://github.com/vitest-dev/vitest/issues/546. -// But fortunately spying and mocking the return value of spy works :p -const resizeImageFileSpy = vi.spyOn(blob, "resizeImageFile"); -const generateIdFromFileSpy = vi.spyOn(blob, "generateIdFromFile"); - -resizeImageFileSpy.mockImplementation(async (imageFile: File) => imageFile); -generateIdFromFileSpy.mockImplementation(async () => "fileId" as FileId); +vi.mock("../data/blob", async (actual) => { + const orig: Object = await actual(); + return { + ...orig, + resizeImageFile: (imageFile: File) => imageFile, + generateIdFromFile: () => "fileId" as FileId, + }; +}); beforeEach(async () => { // Unmount ReactDOM from root diff --git a/packages/utils/export.test.ts b/packages/utils/export.test.ts index aa1049cc12..b04ec44e24 100644 --- a/packages/utils/export.test.ts +++ b/packages/utils/export.test.ts @@ -32,7 +32,6 @@ describe("exportToCanvas", async () => { describe("exportToBlob", async () => { describe("mime type", () => { - // afterEach(vi.restoreAllMocks); it("should change image/jpg to image/jpeg", async () => { const blob = await utils.exportToBlob({ ...diagramFactory(),