fix: failing tests

This commit is contained in:
Mark Mankarious
2023-07-11 14:17:08 +01:00
parent 2ba2782242
commit 21b557961f
3 changed files with 19 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
import { makeAutoObservable } from "mobx";
import paper from "paper";
import { Tool } from "paper";
import { Renderer } from "../renderer/Renderer";
import { Coords } from "../renderer/elements/Coords";
import { ModeBase } from "./ModeBase";
@@ -36,7 +36,7 @@ export class ModeManager {
setRenderer(renderer: Renderer) {
this.renderer = renderer;
this.tool = new paper.Tool();
this.tool = new Tool();
this.tool.onMouseMove = this.onMouseEvent;
this.tool.onMouseDown = this.onMouseEvent;
this.tool.onMouseUp = this.onMouseEvent;
@@ -79,10 +79,12 @@ export class ModeManager {
if (!type) return;
const position = new Coords(event.point.x, event.point.y);
const delta = new Coords(event.delta.x, event.delta.y);
const mouse = {
position: new Coords(event.point.x, event.point.y),
delta: event.delta ? new Coords(event.delta.x, event.delta.y) : null,
};
this.mouse = { position, delta };
this.mouse = mouse;
this.send(type, this.mouse);
}

View File

@@ -2,6 +2,9 @@ import { ModeManager } from "../ModeManager";
import { Renderer } from "../../renderer/Renderer";
import { TestMode } from "./fixtures/TestMode";
jest.mock("paper", () => ({
Tool: jest.fn().mockImplementation(() => ({})),
}));
jest.mock("../../renderer/Renderer", () => ({
Renderer: jest.fn(),
}));

View File

@@ -7,6 +7,9 @@ import { Coords } from "../../renderer/elements/Coords";
import { Node } from "../../renderer/elements/Node";
import * as utils from "../utils";
jest.mock("paper", () => ({
Tool: jest.fn().mockImplementation(() => ({})),
}));
jest.mock("../utils", () => ({
getTargetFromSelection: jest.fn(),
}));
@@ -55,7 +58,7 @@ describe("Select mode functions correctly", () => {
it("Cursor repositions when tile is hovered", () => {
const { renderer, modeManager } = createRenderer();
const displayAtSpy = jest.spyOn(renderer.sceneElements.cursor, "displayAt");
modeManager.onMouseEvent("MOUSE_MOVE", {
modeManager.send("MOUSE_MOVE", {
position: new Coords(2, 2),
delta: null,
});
@@ -67,7 +70,7 @@ describe("Select mode functions correctly", () => {
const { modeManager } = createRenderer();
const mockNode = new MockNode();
jest.spyOn(utils, "getTargetFromSelection").mockReturnValueOnce(mockNode);
modeManager.onMouseEvent("MOUSE_MOVE", {
modeManager.send("MOUSE_MOVE", {
position: new Coords(1, 1),
delta: null,
});
@@ -77,7 +80,7 @@ describe("Select mode functions correctly", () => {
const { renderer, modeManager } = createRenderer();
jest.spyOn(utils, "getTargetFromSelection").mockReturnValueOnce(null);
const unfocusAllSpy = jest.spyOn(renderer, "unfocusAll");
modeManager.onMouseEvent("MOUSE_MOVE", {
modeManager.send("MOUSE_MOVE", {
position: new Coords(1, 1),
delta: null,
});
@@ -87,11 +90,11 @@ describe("Select mode functions correctly", () => {
const activateModeSpy = jest.spyOn(ModeManager.prototype, "activateMode");
const { modeManager } = createRenderer();
jest.spyOn(utils, "getTargetFromSelection").mockReturnValue(null);
modeManager.onMouseEvent("MOUSE_DOWN", {
modeManager.send("MOUSE_DOWN", {
position: new Coords(0, 0),
delta: null,
});
modeManager.onMouseEvent("MOUSE_MOVE", {
modeManager.send("MOUSE_MOVE", {
position: new Coords(2, 2),
delta: new Coords(2, 2),
});
@@ -103,7 +106,7 @@ describe("Select mode functions correctly", () => {
const { modeManager } = createRenderer();
const mockNode = new MockNode();
jest.spyOn(utils, "getTargetFromSelection").mockReturnValue(mockNode);
modeManager.onMouseEvent("MOUSE_DOWN", {
modeManager.send("MOUSE_DOWN", {
position: new Coords(0, 0),
delta: null,
});