From 2104ffa319bf0f9d92ba33b6b2d960fe47680de3 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Fri, 3 Apr 2026 00:08:11 +0200
Subject: [PATCH] Update e2e tests for model asset import and placement

---
 tests/e2e/import-draco-model-asset.e2e.ts    | 22 +++++++++++++++-----
 tests/e2e/import-external-model-asset.e2e.ts | 17 ++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/tests/e2e/import-draco-model-asset.e2e.ts b/tests/e2e/import-draco-model-asset.e2e.ts
index fc9f9fe8..f7509edb 100644
--- a/tests/e2e/import-draco-model-asset.e2e.ts
+++ b/tests/e2e/import-draco-model-asset.e2e.ts
@@ -2,7 +2,7 @@ import path from "node:path";
 
 import { expect, test } from "@playwright/test";
 
-import { getEditorStoreSnapshot, getViewportCanvas } from "./viewport-test-helpers";
+import { getEditorStoreSnapshot, setViewportPlacementPreview } from "./viewport-test-helpers";
 
 const fixturePath = path.resolve(process.cwd(), "fixtures/assets/tiny-triangle-draco.glb");
 
@@ -32,11 +32,23 @@ test("imports a draco-compressed glb asset, places an instance, and survives rel
   await expect(page.getByTestId("outliner-model-instance-list").getByRole("button")).toHaveCount(1);
 
   await page.getByRole("button", { name: "Place instance for tiny-triangle-draco.glb" }).click();
-  await page.getByTestId("viewport-panel-topLeft").click({ position: { x: 16, y: 16 }, force: true });
-  const viewportCanvas = getViewportCanvas(page);
-  await viewportCanvas.hover({ position: { x: 84, y: 88 }, force: true });
+  const importedSnapshot = await getEditorStoreSnapshot(page);
+  const importedModelAsset = Object.values(importedSnapshot.document.assets).find(
+    (asset) => asset.kind === "model" && asset.sourceName === "tiny-triangle-draco.glb"
+  );
+
+  if (importedModelAsset === undefined) {
+    throw new Error("Imported model asset was not found in the document snapshot.");
+  }
+
+  await setViewportPlacementPreview(
+    page,
+    "topLeft",
+    { kind: "model-instance", assetId: importedModelAsset.id },
+    { x: 84, y: 0, z: -88 }
+  );
   await expect(page.getByTestId("viewport-snap-preview-topLeft")).toBeVisible();
-  await viewportCanvas.click({ position: { x: 84, y: 88 }, force: true });
+  await page.getByTestId("viewport-fallback-place-topLeft").click();
   await expect(page.getByTestId("outliner-model-instance-list").getByRole("button")).toHaveCount(2);
   const snapshot = await getEditorStoreSnapshot(page);
   const selectedModelInstanceId = snapshot.selection.kind === "modelInstances" ? snapshot.selection.ids?.[0] ?? null : null;
diff --git a/tests/e2e/import-external-model-asset.e2e.ts b/tests/e2e/import-external-model-asset.e2e.ts
index 0102bb4e..819aba42 100644
--- a/tests/e2e/import-external-model-asset.e2e.ts
+++ b/tests/e2e/import-external-model-asset.e2e.ts
@@ -2,7 +2,7 @@ import path from "node:path";
 
 import { expect, test } from "@playwright/test";
 
-import { getEditorStoreSnapshot, getViewportCanvas } from "./viewport-test-helpers";
+import { getEditorStoreSnapshot, setViewportPlacementPreview } from "./viewport-test-helpers";
 
 const gltfFixturePath = path.resolve(process.cwd(), "fixtures/assets/external-triangle/scene.gltf");
 const binFixturePath = path.resolve(process.cwd(), "fixtures/assets/external-triangle/triangle.bin");
@@ -36,11 +36,18 @@ test("imports a gltf asset with external resources and places an instance", asyn
   await page.getByRole("button", { name: "Place instance for scene.gltf" }).hover();
   await expect(page.getByTestId("status-asset-hover")).toContainText("Storage key:");
   await page.getByRole("button", { name: "Place instance for scene.gltf" }).click();
-  await page.getByTestId("viewport-panel-topLeft").click({ position: { x: 16, y: 16 }, force: true });
-  const viewportCanvas = getViewportCanvas(page);
-  await viewportCanvas.hover({ position: { x: 88, y: 84 }, force: true });
+  const importedSnapshot = await getEditorStoreSnapshot(page);
+  const importedModelAsset = Object.values(importedSnapshot.document.assets).find(
+    (asset) => asset.kind === "model" && asset.sourceName === "scene.gltf"
+  );
+
+  if (importedModelAsset === undefined) {
+    throw new Error("Imported model asset was not found in the document snapshot.");
+  }
+
+  await setViewportPlacementPreview(page, "topLeft", { kind: "model-instance", assetId: importedModelAsset.id }, { x: 88, y: 0, z: -84 });
   await expect(page.getByTestId("viewport-snap-preview-topLeft")).toBeVisible();
-  await viewportCanvas.click({ position: { x: 88, y: 84 }, force: true });
+  await page.getByTestId("viewport-fallback-place-topLeft").click();
   await expect(page.getByTestId("outliner-model-instance-list").getByRole("button")).toHaveCount(2);
   const snapshot = await getEditorStoreSnapshot(page);
   const selectedModelInstanceId = snapshot.selection.kind === "modelInstances" ? snapshot.selection.ids?.[0] ?? null : null;