smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: duplication tests pointer state leaking between tests (#9414)

Browse source 
* fix: duplication tests pointer state leaking between tests

* fix snapshots
This commit is contained in:
David Luzar 2025-04-18 11:11:12 +02:00 • committed by GitHub
parent a5d6939826
commit b5d60973b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/element/tests/duplicate.test.tsx
View file

@ -1,4 +1,3 @@
import React from "react";
import { pointFrom } from "@excalidraw/math"; import { pointFrom } from "@excalidraw/math";
import { import {
@ -472,7 +471,7 @@ describe("group-related duplication", () => {
expect(h.state.editingGroupId).toBe("group1"); expect(h.state.editingGroupId).toBe("group1");
}); });
it.skip("alt-duplicating within group away outside frame", () => { it("alt-duplicating within group away outside frame", () => {
const frame = API.createElement({ const frame = API.createElement({
type: "frame", type: "frame",
x: 0, x: 0,

28
packages/excalidraw/tests/__snapshots__/history.test.tsx.snap
View file

@ -7348,8 +7348,8 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
"updated": 1, "updated": 1,
"version": 7, "version": 7,
"width": 10, "width": 10,
"x": -10, "x": 0,
"y": -10, "y": 0,
} }
`; `;
@ -7422,8 +7422,8 @@ History {
"strokeWidth": 2, "strokeWidth": 2,
"type": "arrow", "type": "arrow",
"width": 10, "width": 10,
"x": -10, "x": 0,
"y": -10, "y": 0,
}, },
"inserted": { "inserted": {
"isDeleted": true, "isDeleted": true,
@ -12138,8 +12138,8 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
"updated": 1, "updated": 1,
"version": 3, "version": 3,
"width": 10, "width": 10,
"x": 10, "x": -10,
"y": 10, "y": -10,
} }
`; `;
@ -12192,8 +12192,8 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
"updated": 1, "updated": 1,
"version": 5, "version": 5,
"width": 50, "width": 50,
"x": 60, "x": 40,
"y": 0, "y": -20,
} }
`; `;
@ -12246,8 +12246,8 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
"updated": 1, "updated": 1,
"version": 4, "version": 4,
"width": 50, "width": 50,
"x": 150, "x": 130,
"y": -10, "y": -30,
} }
`; `;
@ -12301,8 +12301,8 @@ History {
"strokeWidth": 2, "strokeWidth": 2,
"type": "rectangle", "type": "rectangle",
"width": 10, "width": 10,
"x": 10, "x": -10,
"y": 10, "y": -10,
}, },
"inserted": { "inserted": {
"isDeleted": true, "isDeleted": true,
@ -12387,8 +12387,8 @@ History {
"strokeWidth": 2, "strokeWidth": 2,
"type": "freedraw", "type": "freedraw",
"width": 50, "width": 50,
"x": 150, "x": 130,
"y": -10, "y": -30,
}, },
"inserted": { "inserted": {
"isDeleted": true, "isDeleted": true,

1
packages/excalidraw/tests/helpers/api.ts
View file

@ -444,7 +444,6 @@ export class API {
const text = API.createElement({ const text = API.createElement({
type: "text", type: "text",
id: "text2",
width: 50, width: 50,
height: 20, height: 20,
containerId: arrow.id, containerId: arrow.id,

9
packages/excalidraw/tests/helpers/ui.ts
View file

@ -180,10 +180,17 @@ export class Pointer {
public clientX = 0; public clientX = 0;
public clientY = 0; public clientY = 0;
static activePointers: Pointer[] = [];
static resetAll() {
Pointer.activePointers.forEach((pointer) => pointer.reset());
}
constructor( constructor(
private readonly pointerType: "mouse" | "touch" | "pen", private readonly pointerType: "mouse" | "touch" | "pen",
private readonly pointerId = 1, private readonly pointerId = 1,
) {} ) {
Pointer.activePointers.push(this);
}
reset() { reset() {
this.clientX = 0; this.clientX = 0;

6
packages/excalidraw/tests/test-utils.ts
View file

@ -19,7 +19,7 @@ import type { AllPossibleKeys } from "@excalidraw/common/utility-types";
import { STORAGE_KEYS } from "../../../excalidraw-app/app_constants"; import { STORAGE_KEYS } from "../../../excalidraw-app/app_constants";
import { UI } from "./helpers/ui"; import { Pointer, UI } from "./helpers/ui";
import * as toolQueries from "./queries/toolQueries"; import * as toolQueries from "./queries/toolQueries";
import type { RenderResult, RenderOptions } from "@testing-library/react"; import type { RenderResult, RenderOptions } from "@testing-library/react";
@ -42,6 +42,10 @@ type TestRenderFn = (
) => Promise<RenderResult<typeof customQueries>>; ) => Promise<RenderResult<typeof customQueries>>;
const renderApp: TestRenderFn = async (ui, options) => { const renderApp: TestRenderFn = async (ui, options) => {
// when tests reuse Pointer instances let's reset the last
// pointer poisitions so there's no leak between tests
Pointer.resetAll();
if (options?.localStorageData) { if (options?.localStorageData) {
initLocalStorage(options.localStorageData); initLocalStorage(options.localStorageData);
delete options.localStorageData; delete options.localStorageData;

5
setupTests.ts
View file

@ -94,11 +94,6 @@ vi.mock(
}, },
); );
vi.mock("nanoid", () => {
return {
nanoid: vi.fn(() => "test-id"),
};
});
// ReactDOM is located inside index.tsx file // ReactDOM is located inside index.tsx file
// as a result, we need a place for it to render into // as a result, we need a place for it to render into
const element = document.createElement("div"); const element = document.createElement("div");