Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

test: cover drag gestures in builder e2e (#5876)

Oleg Isonene57bd297f58c
diff --git a/apps/builder/e2e/fixtures/builder-project.ts b/apps/builder/e2e/fixtures/builder-project.ts
new file mode 100644
index 0000000000..841dd45217
--- /dev/null
+++ b/apps/builder/e2e/fixtures/builder-project.ts
@@ -0,0 +1,37 @@
+import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";
+import { loginAndCreateBlankProject } from "../flows/dashboard";
+import { newPage } from "../harness";
+
+type Build = Awaited<ReturnType<typeof loadDevBuild>>;
+type BuildUpdate = Omit<Parameters<typeof updateBuild>[1], "version">;
+
+export const createSeededBuilderProject = async ({
+ email,
+ title,
+ builderToken,
+ createBuildUpdate,
+}: {
+ email: string;
+ title: string;
+ builderToken: string;
+ createBuildUpdate: (build: Build) => BuildUpdate | Promise<BuildUpdate>;
+}) => {
+ const page = await newPage();
+ try {
+ const projectId = await loginAndCreateBlankProject({ page, email, title });
+ const build = await loadDevBuild({ projectId });
+ await updateBuild(build.id, {
+ ...(await createBuildUpdate(build)),
+ version: 0,
+ });
+ await insertAuthorizationToken({
+ token: builderToken,
+ projectId,
+ name: "E2E builder token",
+ relation: "builders",
+ });
+ return { projectId, builderToken };
+ } finally {
+ await page.close();
+ }
+};
diff --git a/apps/builder/e2e/fixtures/drag-project.ts b/apps/builder/e2e/fixtures/drag-project.ts
new file mode 100644
index 0000000000..550f0d1afb
--- /dev/null
+++ b/apps/builder/e2e/fixtures/drag-project.ts
@@ -0,0 +1,137 @@
+import type { SerializedPages } from "@webstudio-is/project-migrations/pages";
+import type { Instance } from "@webstudio-is/sdk";
+import { loadDevBuild } from "../db";
+import { createSeededBuilderProject } from "./builder-project";
+
+export const dragIds = {
+ body: "drag-body",
+ wrapper: "drag-wrapper",
+ box: "drag-box",
+ heading: "drag-heading",
+ container: "drag-container",
+ alpha: "drag-alpha-page",
+ beta: "drag-beta-page",
+ folder: "drag-folder",
+} as const;
+
+const element = (
+ id: string,
+ tag: string,
+ children: Instance["children"],
+ label?: string
+): Instance => ({
+ type: "instance",
+ id,
+ component: "ws:element",
+ tag,
+ label,
+ children,
+});
+
+const seedBuild = (serializedPages: string) => {
+ const pages = JSON.parse(serializedPages) as SerializedPages;
+ const home = pages.pages.find(({ id }) => id === pages.homePageId);
+ const root = pages.folders.find(({ id }) => id === pages.rootFolderId);
+ if (home === undefined || root === undefined) {
+ throw new Error("Expected the blank project home page and root folder");
+ }
+
+ home.rootInstanceId = dragIds.body;
+ const alphaBody = `${dragIds.alpha}-body`;
+ const betaBody = `${dragIds.beta}-body`;
+ pages.pages.push(
+ {
+ id: dragIds.alpha,
+ name: "Alpha",
+ path: "/alpha",
+ title: '"Alpha"',
+ meta: {},
+ rootInstanceId: alphaBody,
+ },
+ {
+ id: dragIds.beta,
+ name: "Beta",
+ path: "/beta",
+ title: '"Beta"',
+ meta: {},
+ rootInstanceId: betaBody,
+ }
+ );
+ pages.folders.push({
+ id: dragIds.folder,
+ name: "Group",
+ slug: "group",
+ children: [],
+ });
+ root.children.push(dragIds.alpha, dragIds.beta, dragIds.folder);
+
+ const pageBodies = pages.pages
+ .filter(({ id }) => id !== pages.homePageId)
+ .map(({ rootInstanceId }) => element(rootInstanceId, "body", []));
+
+ return {
+ pages: JSON.stringify(pages),
+ instances: JSON.stringify([
+ ...pageBodies,
+ element(dragIds.body, "body", [{ type: "id", value: dragIds.wrapper }]),
+ element(
+ dragIds.wrapper,
+ "main",
+ [
+ { type: "id", value: dragIds.box },
+ { type: "id", value: dragIds.heading },
+ { type: "id", value: dragIds.container },
+ ],
+ "Drag Wrapper"
+ ),
+ element(dragIds.box, "div", [{ type: "text", value: "Box" }], "Drag Box"),
+ element(
+ dragIds.heading,
+ "h1",
+ [{ type: "text", value: "Heading" }],
+ "Drag Heading"
+ ),
+ element(
+ dragIds.container,
+ "section",
+ [{ type: "text", value: "Drop here" }],
+ "Drop Container"
+ ),
+ ]),
+ props: "[]",
+ styleSources: "[]",
+ styleSourceSelections: "[]",
+ styles: "[]",
+ dataSources: "[]",
+ resources: "[]",
+ marketplaceProduct: "{}",
+ };
+};
+
+export const createDragProject = async (name: string) => {
+ return await createSeededBuilderProject({
+ email: `drag-${name}@webstudio.test`,
+ title: `Drag ${name}`,
+ builderToken: `drag-${name}-builder-token`,
+ createBuildUpdate: (build) => seedBuild(build.pages),
+ });
+};
+
+export const loadInstances = async (projectId: string) => {
+ const build = await loadDevBuild({ projectId });
+ return JSON.parse(build.instances) as Instance[];
+};
+
+export const getChildIds = (instances: Instance[], parentId: string) =>
+ instances
+ .find(({ id }) => id === parentId)
+ ?.children.filter(({ type }) => type === "id")
+ .map(({ value }) => value);
+
+export const loadChildIds = async (projectId: string, parentId: string) =>
+ getChildIds(await loadInstances(projectId), parentId);
+
+export const loadPages = async (projectId: string) => {
+ const build = await loadDevBuild({ projectId });
+ return JSON.parse(build.pages) as SerializedPages;
+};
diff --git a/apps/builder/e2e/fixtures/slot-keyboard-project.ts b/apps/builder/e2e/fixtures/slot-keyboard-project.ts
index 4a9c572a70..b50d188066 100644
--- a/apps/builder/e2e/fixtures/slot-keyboard-project.ts
+++ b/apps/builder/e2e/fixtures/slot-keyboard-project.ts
@@ -1,6 +1,4 @@
-import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";
-import { loginAndCreateBlankProject } from "../flows/dashboard";
-import { newPage } from "../harness";
+import { createSeededBuilderProject } from "./builder-project";
export type SeededSlotKeyboardProject = {
projectId: string;
@@ -173,31 +171,14 @@ export const createSlotKeyboardProject = async ({
title?: string;
builderToken?: string;
} = {}): Promise<SeededSlotKeyboardProject> => {
- const ownerPage = await newPage();
-
- try {
- const projectId = await loginAndCreateBlankProject({
- page: ownerPage,
- email,
- title,
- });
- const build = await loadDevBuild({ projectId });
- await updateBuild(build.id, {
- version: 0,
- ...createSlotKeyboardBuildData({
+ return await createSeededBuilderProject({
+ email,
+ title,
+ builderToken,
+ createBuildUpdate: (build) =>
+ createSlotKeyboardBuildData({
pages: build.pages,
breakpoints: build.breakpoints,
}),
- });
- await insertAuthorizationToken({
- token: builderToken,
- projectId,
- name: "E2E slot keyboard builder token",
- relation: "builders",
- });
-
- return { projectId, builderToken };
- } finally {
- await ownerPage.close();
- }
+ });
};
diff --git a/apps/builder/e2e/flows/builder.ts b/apps/builder/e2e/flows/builder.ts
index 7b9c49f748..cf3c1bcd5a 100644
--- a/apps/builder/e2e/flows/builder.ts
+++ b/apps/builder/e2e/flows/builder.ts
@@ -8,6 +8,17 @@ const builderNetworkIdleTimeout =
Number.parseInt(process.env.E2E_BUILDER_NETWORK_IDLE_TIMEOUT_MS ?? "", 10) ||
5_000;
+export const getCanvasInstanceSelector = (instanceSelector: string[]) =>
+ `[data-ws-selector="${instanceSelector.join(",")}"]`;
+
+export const getCanvasInstance = ({
+ canvas,
+ instanceSelector,
+}: {
+ canvas: Frame;
+ instanceSelector: string[];
+}) => canvas.locator(getCanvasInstanceSelector(instanceSelector)).first();
+
export const getCanvasFrame = async (page: Page) => {
const iframe = await page.locator("iframe").first().elementHandle();
return (await iframe?.contentFrame()) ?? undefined;
diff --git a/apps/builder/e2e/flows/drag.ts b/apps/builder/e2e/flows/drag.ts
new file mode 100644
index 0000000000..f64ba96da2
--- /dev/null
+++ b/apps/builder/e2e/flows/drag.ts
@@ -0,0 +1,139 @@
+import type { Frame, Locator, Page } from "playwright";
+import { waitForChangeToBeSaved } from "./sync-status";
+
+type Bounds = { x: number; y: number; width: number; height: number };
+
+const dragPointer = async ({
+ page,
+ source,
+ target,
+ targetPoint = ({ x, y, width, height }: Bounds) => ({
+ x: x + width / 2,
+ y: y + height / 2,
+ }),
+ ready,
+ attempts = 1,
+ beforeAttempt,
+}: {
+ page: Page;
+ source: Locator;
+ target: Locator;
+ targetPoint?: (bounds: Bounds) => { x: number; y: number };
+ ready: () => Promise<boolean>;
+ attempts?: number;
+ beforeAttempt?: () => Promise<void>;
+}) => {
+ for (let attempt = 0; attempt < attempts; attempt += 1) {
+ await beforeAttempt?.();
+ const bounds = await source.boundingBox();
+ if (bounds === null) {
+ throw new Error("Expected visible drag source");
+ }
+ const from = {
+ x: bounds.x + bounds.width / 2,
+ y: bounds.y + bounds.height / 2,
+ };
+ await page.mouse.move(from.x, from.y);
+ await page.mouse.down();
+ let accepted = false;
+ try {
+ await page.mouse.move(from.x + 8, from.y + 8, { steps: 4 });
+ const deadline = Date.now() + 10_000;
+ let jiggle = 0;
+ while (Date.now() < deadline) {
+ const before = await target.boundingBox();
+ if (before === null) {
+ throw new Error("Expected visible drag target");
+ }
+ const to = targetPoint(before);
+ jiggle = jiggle === 0 ? 1 : 0;
+ await page.mouse.move(to.x + jiggle, to.y, { steps: 3 });
+ await page.waitForTimeout(120);
+ const after = await target.boundingBox();
+ if (
+ after?.y === before.y &&
+ after.height === before.height &&
+ (await ready())
+ ) {
+ accepted = true;
+ break;
+ }
+ }
+ } finally {
+ await page.mouse.up();
+ }
+ if (accepted) {
+ return;
+ }
+ }
+ throw new Error("Drag target did not accept the pointer gesture");
+};
+
+const dragAndSave = async (page: Page, drag: () => Promise<void>) => {
+ await Promise.all([
+ waitForChangeToBeSaved({ page, timeout: 30_000 }),
+ drag(),
+ ]);
+};
+
+export const getTreeRowByButton = (rowButton: Locator) =>
+ rowButton.locator("xpath=ancestor-or-self::*[@data-tree-sortable-item][1]");
+
+export const dragTreeRow = async (
+ page: Page,
+ source: Locator,
+ target: Locator,
+ position: "above" | "inside"
+) => {
+ await dragAndSave(page, () =>
+ dragPointer({
+ page,
+ source,
+ target,
+ targetPoint: ({ x, y, width, height }) => ({
+ x: x + width / 2,
+ y: y + height * (position === "above" ? 0.1 : 0.5),
+ }),
+ ready: async () =>
+ (await target.getAttribute("data-is-drop-over")) === "true" &&
+ (position === "inside" ||
+ (await target.evaluate((row) => row.children.length > 1))),
+ })
+ );
+};
+
+const waitForCanvas = (canvas: Frame) =>
+ canvas.locator("body:not([inert])").waitFor();
+
+export const ensureInteractiveCanvas = async (
+ page: Page,
+ canvas: Frame,
+ target: Locator
+) => {
+ await waitForCanvas(canvas);
+ await target.click();
+ await page.locator("[data-ws-outline]").first().waitFor();
+};
+
+export const dragToCanvas = async (
+ page: Page,
+ canvas: Frame,
+ source: Locator,
+ target: Locator
+) => {
+ await dragAndSave(page, () =>
+ dragPointer({
+ page,
+ source,
+ target,
+ ready: () =>
+ page
+ .locator("[data-placement-indicator]")
+ .first()
+ .isVisible()
+ .catch(() => false),
+ attempts: 3,
+ beforeAttempt: () => waitForCanvas(canvas),
+ })
+ );
+};
diff --git a/apps/builder/e2e/flows/navigator.ts b/apps/builder/e2e/flows/navigator.ts
new file mode 100644
index 0000000000..7e6ab82c26
--- /dev/null
+++ b/apps/builder/e2e/flows/navigator.ts
@@ -0,0 +1,12 @@
+import type { Page } from "playwright";
+
+export const openNavigatorPanel = async ({ page }: { page: Page }) => {
+ const tab = page.getByRole("tab", { name: "Navigator" });
+ if ((await tab.getAttribute("aria-selected")) !== "true") {
+ await tab.click();
+ }
+ await page.locator("[data-navigator-tree]").waitFor({
+ state: "visible",
+ timeout: 10_000,
+ });
+};
diff --git a/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts b/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
index 4f9dd78da7..f249bf1481 100644
--- a/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
+++ b/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
@@ -3,6 +3,7 @@ import { loadDevBuild } from "../db";
import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
import { selectCanvasTextInstance } from "../flows/canvas-selection";
import { expectGeneratedAppBuild } from "../flows/generated-app";
+import { openNavigatorPanel } from "../flows/navigator";
import {
waitForChangeToBeSaved,
waitForSyncStatus,
@@ -57,17 +58,6 @@ const wrapSelectedInstance = async ({
await waitForSyncStatus({ page, status: "idle" });
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.locator("[data-navigator-tree]").waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
const selectNavigatorItem = async ({
page,
itemName,
diff --git a/apps/builder/e2e/tests/canvas-drag.[shard-2].e2e.ts b/apps/builder/e2e/tests/canvas-drag.[shard-2].e2e.ts
new file mode 100644
index 0000000000..a851cbfca9
--- /dev/null
+++ b/apps/builder/e2e/tests/canvas-drag.[shard-2].e2e.ts
@@ -0,0 +1,58 @@
+import assert from "node:assert/strict";
+import {
+ createDragProject,
+ dragIds,
+ getChildIds,
+ loadInstances,
+} from "../fixtures/drag-project";
+import { getCanvasInstance, openProjectBuilder } from "../flows/builder";
+import { dragToCanvas, ensureInteractiveCanvas } from "../flows/drag";
+import { newIsolatedPage, test } from "../harness";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async () => {
+ fixture = await createDragProject("canvas");
+});
+
+test("Canvas pointer drag reparents a heading and inserts a component", async () => {
+ const { page, close } = await newIsolatedPage();
+ try {
+ const canvas = await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ const instance = (...instanceSelector: string[]) =>
+ getCanvasInstance({ canvas, instanceSelector });
+ const heading = instance(dragIds.heading, dragIds.wrapper, dragIds.body);
+ const container = instance(
+ dragIds.container,
+ dragIds.wrapper,
+ dragIds.body
+ );
+
+ await ensureInteractiveCanvas(page, canvas, container);
+ await dragToCanvas(page, canvas, heading, container);
+ await ensureInteractiveCanvas(page, canvas, container);
+ await page.getByRole("tab", { name: "Components" }).click();
+ const componentName = "Checkbox";
+ await page.getByPlaceholder("Find components").fill(componentName);
+ const card = page.locator('[data-drag-component="checkbox"]');
+ await card.waitFor();
+ await dragToCanvas(page, canvas, card, container);
+
+ const instances = await loadInstances(fixture.projectId);
+ const children = getChildIds(instances, dragIds.container);
+ assert(children?.includes(dragIds.heading));
+ const inserted = instances.filter(
+ ({ id }) => children?.includes(id) === true && id !== dragIds.heading
+ );
+ assert(
+ inserted.some(({ label }) => label === `${componentName} Field`),
+ `Expected inserted ${componentName}, received ${JSON.stringify(inserted)}`
+ );
+ } finally {
+ await close();
+ }
+});
diff --git a/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts b/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts
new file mode 100644
index 0000000000..4d6103234b
--- /dev/null
+++ b/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts
@@ -0,0 +1,77 @@
+import assert from "node:assert/strict";
+import {
+ createDragProject,
+ dragIds,
+ loadChildIds,
+} from "../fixtures/drag-project";
+import { getCanvasInstance, openProjectBuilder } from "../flows/builder";
+import {
+ dragTreeRow,
+ ensureInteractiveCanvas,
+ getTreeRowByButton,
+} from "../flows/drag";
+import { openNavigatorPanel } from "../flows/navigator";
+import { newIsolatedPage, test } from "../harness";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async () => {
+ fixture = await createDragProject("navigator");
+});
+
+test("Navigator pointer drag reorders and reparents instances", async () => {
+ const { page, close } = await newIsolatedPage();
+ try {
+ const canvas = await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ const headingSelector = [dragIds.heading, dragIds.wrapper, dragIds.body];
+ await ensureInteractiveCanvas(
+ page,
+ canvas,
+ getCanvasInstance({ canvas, instanceSelector: headingSelector })
+ );
+ await openNavigatorPanel({ page });
+
+ const row = (label: string) =>
+ getTreeRowByButton(
+ page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .filter({ hasText: label })
+ .first()
+ );
+ await row("Drag Heading").waitFor();
+
+ await dragTreeRow(page, row("Drag Heading"), row("Drag Box"), "above");
+ assert.deepEqual(await loadChildIds(fixture.projectId, dragIds.wrapper), [
+ dragIds.heading,
+ dragIds.box,
+ dragIds.container,
+ ]);
+ const reloadedCanvas = await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await ensureInteractiveCanvas(
+ page,
+ reloadedCanvas,
+ getCanvasInstance({
+ canvas: reloadedCanvas,
+ instanceSelector: headingSelector,
+ })
+ );
+ await openNavigatorPanel({ page });
+ await row("Drag Box").waitFor();
+ await dragTreeRow(page, row("Drag Box"), row("Drop Container"), "inside");
+
+ const wrapper = await loadChildIds(fixture.projectId, dragIds.wrapper);
+ const container = await loadChildIds(fixture.projectId, dragIds.container);
+ assert.deepEqual(wrapper, [dragIds.heading, dragIds.container]);
+ assert(container?.includes(dragIds.box));
+ } finally {
+ await close();
+ }
+});
diff --git a/apps/builder/e2e/tests/pages-actions.[shard-1].e2e.ts b/apps/builder/e2e/tests/pages-actions.[shard-1].e2e.ts
index f7b5b7bb70..3521e854a9 100644
--- a/apps/builder/e2e/tests/pages-actions.[shard-1].e2e.ts
+++ b/apps/builder/e2e/tests/pages-actions.[shard-1].e2e.ts
@@ -5,6 +5,7 @@ import {
waitForCanvasTextHidden,
} from "../flows/builder";
import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { openNavigatorPanel } from "../flows/navigator";
import {
waitForChangeToBeSaved,
waitForSyncStatus,
@@ -129,17 +130,6 @@ const insertComponentPanelOption = async ({
await waitForSyncStatus({ page, status: "idle" });
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.locator("[data-navigator-tree]").waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
const getNavigatorButtonSummary = async ({
page,
text,
diff --git a/apps/builder/e2e/tests/pages-actions.[shard-2].e2e.ts b/apps/builder/e2e/tests/pages-actions.[shard-2].e2e.ts
index 154778202b..f67d50119c 100644
--- a/apps/builder/e2e/tests/pages-actions.[shard-2].e2e.ts
+++ b/apps/builder/e2e/tests/pages-actions.[shard-2].e2e.ts
@@ -5,6 +5,7 @@ import {
waitForCanvasTextHidden,
} from "../flows/builder";
import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { openNavigatorPanel } from "../flows/navigator";
import { openPage } from "../flows/pages-panel";
import {
waitForChangeToBeSaved,
@@ -491,17 +492,6 @@ const selectCommandPanelInstance = async ({
await selectCommandPanelItem({ page, text: label });
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.locator("[data-navigator-tree]").waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
const selectNavigatorItem = async ({
page,
itemName,
diff --git a/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts b/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts
new file mode 100644
index 0000000000..1af056f1ea
--- /dev/null
+++ b/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts
@@ -0,0 +1,51 @@
+import assert from "node:assert/strict";
+import {
+ createDragProject,
+ dragIds,
+ loadPages,
+} from "../fixtures/drag-project";
+import { openProjectBuilder } from "../flows/builder";
+import { dragTreeRow, getTreeRowByButton } from "../flows/drag";
+import { openPagesPanel } from "../flows/pages-panel";
+import { newIsolatedPage, test } from "../harness";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async () => {
+ fixture = await createDragProject("pages");
+});
+
+test("Pages panel pointer drag reorders and nests pages", async () => {
+ const { page, close } = await newIsolatedPage();
+ try {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openPagesPanel({ page });
+
+ const row = (kind: "Page" | "Folder", name: string) =>
+ getTreeRowByButton(
+ page.getByRole("group", {
+ name: `${kind} ${name}`,
+ exact: true,
+ })
+ );
+ await dragTreeRow(page, row("Page", "Beta"), row("Page", "Alpha"), "above");
+ await dragTreeRow(
+ page,
+ row("Page", "Alpha"),
+ row("Folder", "Group"),
+ "inside"
+ );
+
+ const pages = await loadPages(fixture.projectId);
+ const root = pages.folders.find(({ id }) => id === pages.rootFolderId);
+ const folder = pages.folders.find(({ id }) => id === dragIds.folder);
+ assert.deepEqual(root?.children.slice(-2), [dragIds.beta, dragIds.folder]);
+ assert.deepEqual(folder?.children, [dragIds.alpha]);
+ } finally {
+ await close();
+ }
+});
diff --git a/apps/builder/e2e/tests/props-runtime.[shard-2].e2e.ts b/apps/builder/e2e/tests/props-runtime.[shard-2].e2e.ts
index a8ae95b4ae..fb199817bf 100644
--- a/apps/builder/e2e/tests/props-runtime.[shard-2].e2e.ts
+++ b/apps/builder/e2e/tests/props-runtime.[shard-2].e2e.ts
@@ -2,6 +2,7 @@ import type { Page } from "playwright";
import { loadDevBuild } from "../db";
import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { openNavigatorPanel } from "../flows/navigator";
import {
resetSelectedProperty,
setSelectedBooleanProperty,
@@ -39,17 +40,6 @@ const insertComponentPanelOption = async ({
await waitForSyncStatus({ page, status: "idle" });
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.locator("[data-navigator-tree]").waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
const selectNavigatorItem = async ({
page,
itemName,
diff --git a/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts b/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts
index 8516839b70..7d8264a0e1 100644
--- a/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts
+++ b/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts
@@ -1,5 +1,10 @@
import type { Frame, Page } from "playwright";
-import { openProjectBuilder } from "../flows/builder";
+import {
+ getCanvasInstance,
+ getCanvasInstanceSelector,
+ openProjectBuilder,
+} from "../flows/builder";
+import { openNavigatorPanel } from "../flows/navigator";
import { waitForSyncStatus } from "../flows/sync-status";
import {
createSlotKeyboardProject,
@@ -18,16 +23,11 @@ let navigatorTopChildFixture: SeededSlotKeyboardProject;
let navigatorBottomChildFixture: SeededSlotKeyboardProject;
let multiSelectFixture: SeededSlotKeyboardProject;
-const selector = (instanceSelector: string[]) =>
- `[data-ws-selector="${instanceSelector.join(",")}"]`;
-
-const canvasInstance = ({
- canvas,
- instanceSelector,
-}: {
- canvas: Frame;
- instanceSelector: string[];
-}) => canvas.locator(selector(instanceSelector)).first();
+const slotASelector = getCanvasInstanceSelector([
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+]);
const expectCanvasInstanceVisible = async ({
canvas,
@@ -36,23 +36,12 @@ const expectCanvasInstanceVisible = async ({
canvas: Frame;
instanceSelector: string[];
}) => {
- await canvasInstance({ canvas, instanceSelector }).waitFor({
+ await getCanvasInstance({ canvas, instanceSelector }).waitFor({
state: "visible",
timeout: 30_000,
});
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.getByText("Navigator", { exact: true }).first().waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
test.beforeAll(async () => {
fixture = await createSlotKeyboardProject();
detachFixture = await createSlotKeyboardProject({
@@ -106,11 +95,11 @@ const expectCanvasInstancePrecedes = async ({
beforeSelector: string[];
afterSelector: string[];
}) => {
- const beforeLocator = canvasInstance({
+ const beforeLocator = getCanvasInstance({
canvas,
instanceSelector: beforeSelector,
});
- const afterLocator = canvasInstance({
+ const afterLocator = getCanvasInstance({
canvas,
instanceSelector: afterSelector,
});
@@ -125,7 +114,7 @@ const expectCanvasInstancePrecedes = async ({
beforeElement.compareDocumentPosition(afterElement) &
Node.DOCUMENT_POSITION_FOLLOWING
);
- }, selector(afterSelector));
+ }, getCanvasInstanceSelector(afterSelector));
if (precedes === false) {
throw new Error(
`Expected ${beforeSelector.join(",")} to precede ${afterSelector.join(",")}`
@@ -200,7 +189,10 @@ test("Keyboard shortcut moves a shared slot child into the previous sibling", as
canvas,
instanceSelector: headingSelector,
});
- await canvasInstance({ canvas, instanceSelector: headingSelector }).click();
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: headingSelector,
+ }).click();
await page.keyboard.press("Control+ArrowRight");
await waitForSyncStatus({ page, status: "idle" });
@@ -254,7 +246,7 @@ test("Keyboard shortcut keeps Navigator arrows working after outdenting a row",
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -308,7 +300,7 @@ test("Shift+ArrowDown in Navigator selects exactly one additional row", async ()
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotADivSelector,
}).click();
@@ -358,7 +350,7 @@ test("Control/Command+A after canvas selection selects sibling rows", async () =
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -408,7 +400,7 @@ test("Keyboard shortcut moves a direct shared slot child out of all slot occurre
canvas,
instanceSelector: slotAHeadingSelector,
});
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -416,11 +408,11 @@ test("Keyboard shortcut moves a direct shared slot child out of all slot occurre
await page.keyboard.press("Control+ArrowLeft");
await waitForSyncStatus({ page, status: "idle" });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).waitFor({ state: "hidden", timeout: 30_000 });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: [
"slot-keyboard-heading",
@@ -470,7 +462,7 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
canvas,
instanceSelector: slotADivSelector,
});
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotADivSelector,
}).click();
@@ -478,11 +470,11 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
await page.keyboard.press("Control+ArrowUp");
await waitForSyncStatus({ page, status: "idle" });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotADivSelector,
}).waitFor({ state: "hidden", timeout: 30_000 });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: [
"slot-keyboard-div",
@@ -504,11 +496,9 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
});
const movedDivPrecedesSlotA = await canvas
- .locator(selector(movedDivSelector))
- .evaluate((movedElement) => {
- const slotA = document.querySelector(
- '[data-ws-selector="slot-keyboard-slot-a,slot-keyboard-wrapper,slot-keyboard-body"]'
- );
+ .locator(getCanvasInstanceSelector(movedDivSelector))
+ .evaluate((movedElement, selector) => {
+ const slotA = document.querySelector(selector);
if (slotA === null) {
return false;
}
@@ -516,7 +506,7 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
movedElement.compareDocumentPosition(slotA) &
Node.DOCUMENT_POSITION_FOLLOWING
);
- });
+ }, slotASelector);
if (movedDivPrecedesSlotA === false) {
throw new Error("Expected moved div to be positioned before Slot A");
}
@@ -551,7 +541,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
canvas,
instanceSelector: slotAHeadingSelector,
});
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -559,11 +549,11 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
await page.keyboard.press("Control+ArrowDown");
await waitForSyncStatus({ page, status: "idle" });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).waitFor({ state: "hidden", timeout: 30_000 });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: [
"slot-keyboard-heading",
@@ -585,9 +575,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
});
const slotAPrecedesMovedHeading = await canvas
- .locator(
- '[data-ws-selector="slot-keyboard-slot-a,slot-keyboard-wrapper,slot-keyboard-body"]'
- )
+ .locator(slotASelector)
.evaluate((slotA, movedSelector) => {
const movedElement = document.querySelector(movedSelector);
if (movedElement === null) {
@@ -597,7 +585,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
slotA.compareDocumentPosition(movedElement) &
Node.DOCUMENT_POSITION_FOLLOWING
);
- }, selector(movedHeadingSelector));
+ }, getCanvasInstanceSelector(movedHeadingSelector));
if (slotAPrecedesMovedHeading === false) {
throw new Error("Expected moved heading to be positioned after Slot A");
}
@@ -628,7 +616,7 @@ test("Keyboard shortcut reorders a shared slot child from navigator focus", asyn
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -696,7 +684,7 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotADivSelector,
}).click();
@@ -706,11 +694,11 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
await page.keyboard.press("Control+ArrowUp");
await waitForSyncStatus({ page, status: "idle" });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotADivSelector,
}).waitFor({ state: "hidden", timeout: 30_000 });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: [
"slot-keyboard-div",
@@ -732,11 +720,9 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
});
const movedDivPrecedesSlotA = await canvas
- .locator(selector(movedDivSelector))
- .evaluate((movedElement) => {
- const slotA = document.querySelector(
- '[data-ws-selector="slot-keyboard-slot-a,slot-keyboard-wrapper,slot-keyboard-body"]'
- );
+ .locator(getCanvasInstanceSelector(movedDivSelector))
+ .evaluate((movedElement, selector) => {
+ const slotA = document.querySelector(selector);
if (slotA === null) {
return false;
}
@@ -744,7 +730,7 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre
movedElement.compareDocumentPosition(slotA) &
Node.DOCUMENT_POSITION_FOLLOWING
);
- });
+ }, slotASelector);
if (movedDivPrecedesSlotA === false) {
throw new Error("Expected moved div to be positioned before Slot A");
}
@@ -775,7 +761,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
"slot-keyboard-wrapper",
"slot-keyboard-body",
];
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).click();
@@ -785,11 +771,11 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
await page.keyboard.press("Control+ArrowDown");
await waitForSyncStatus({ page, status: "idle" });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: slotAHeadingSelector,
}).waitFor({ state: "hidden", timeout: 30_000 });
- await canvasInstance({
+ await getCanvasInstance({
canvas,
instanceSelector: [
"slot-keyboard-heading",
@@ -811,9 +797,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
});
const slotAPrecedesMovedHeading = await canvas
- .locator(
- '[data-ws-selector="slot-keyboard-slot-a,slot-keyboard-wrapper,slot-keyboard-body"]'
- )
+ .locator(slotASelector)
.evaluate((slotA, movedSelector) => {
const movedElement = document.querySelector(movedSelector);
if (movedElement === null) {
@@ -823,7 +807,7 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren
slotA.compareDocumentPosition(movedElement) &
Node.DOCUMENT_POSITION_FOLLOWING
);
- }, selector(movedHeadingSelector));
+ }, getCanvasInstanceSelector(movedHeadingSelector));
if (slotAPrecedesMovedHeading === false) {
throw new Error("Expected moved heading to be positioned after Slot A");
}
diff --git a/apps/builder/e2e/tests/style-panel-runtime.[shard-2].e2e.ts b/apps/builder/e2e/tests/style-panel-runtime.[shard-2].e2e.ts
index ea542dd908..995be9e48e 100644
--- a/apps/builder/e2e/tests/style-panel-runtime.[shard-2].e2e.ts
+++ b/apps/builder/e2e/tests/style-panel-runtime.[shard-2].e2e.ts
@@ -2,6 +2,7 @@ import type { Page } from "playwright";
import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
import { selectCanvasTextInstance } from "../flows/canvas-selection";
import { waitForCanvasTextStyle } from "../flows/canvas-style";
+import { openNavigatorPanel } from "../flows/navigator";
import {
waitForChangeToBeSaved,
waitForSyncStatus,
@@ -54,17 +55,6 @@ const addCssDeclaration = async ({
await waitForSyncStatus({ page, status: "idle" });
};
-const openNavigatorPanel = async ({ page }: { page: Page }) => {
- const tab = page.getByRole("tab", { name: "Navigator" });
- if ((await tab.getAttribute("aria-selected")) !== "true") {
- await tab.click();
- }
- await page.locator("[data-navigator-tree]").waitFor({
- state: "visible",
- timeout: 10_000,
- });
-};
-
const selectNavigatorItem = async ({
page,
itemName,