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: simplify browser testing infrastructure (#6271)

Oleg Isonen8718feb465d3
diff --git a/.github/actions/builder-e2e-build/action.yml b/.github/actions/builder-e2e-build/action.yml
new file mode 100644
index 0000000000..a11b08a24d
--- /dev/null
+++ b/.github/actions/builder-e2e-build/action.yml
@@ -0,0 +1,48 @@
+name: Build Builder E2E prerequisites
+
+description: Build the Builder and package its E2E schema and dependencies.
+
+inputs:
+ submodules-ssh-key:
+ description: SSH key for private E2E dependencies.
+ required: false
+
+outputs:
+ shards:
+ description: Filename-derived E2E shard matrix.
+ value: ${{ steps.shards.outputs.value }}
+
+runs:
+ using: composite
+ steps:
+ - uses: ./.github/actions/submodules-checkout
+ with:
+ submodules-ssh-key: ${{ inputs.submodules-ssh-key }}
+
+ - uses: ./.github/actions/ci-setup
+ with:
+ run-scripts: "true"
+
+ - name: Discover shards
+ id: shards
+ shell: bash
+ run: echo "value=$(pnpm --dir apps/builder exec tsx ./e2e/print-shards.ts)" >> "$GITHUB_OUTPUT"
+
+ - name: Build Builder
+ shell: bash
+ run: pnpm e2e:builder:build
+
+ - name: Generate schema snapshot
+ shell: bash
+ run: pnpm e2e:builder:refresh-schema-cache
+
+ - name: Upload prerequisites
+ uses: actions/upload-artifact@v6
+ with:
+ name: builder-e2e-build
+ retention-days: 7
+ path: |
+ apps/builder/build/server
+ apps/builder/build/client/assets
+ packages/*/lib
+ .cache/builder-e2e/schema-*.sql
diff --git a/.github/actions/builder-e2e-shard/action.yml b/.github/actions/builder-e2e-shard/action.yml
new file mode 100644
index 0000000000..fae6b18d3b
--- /dev/null
+++ b/.github/actions/builder-e2e-shard/action.yml
@@ -0,0 +1,74 @@
+name: Run Builder E2E shard
+
+description: Run one Builder E2E shard and preserve diagnostics on failure.
+
+inputs:
+ submodules-ssh-key:
+ description: SSH key for private E2E dependencies.
+ required: false
+ shard:
+ description: Filename-derived shard name.
+ required: true
+ partition:
+ description: Optional Playwright partition within the selected files.
+ required: false
+
+runs:
+ using: composite
+ steps:
+ - uses: ./.github/actions/submodules-checkout
+ with:
+ submodules-ssh-key: ${{ inputs.submodules-ssh-key }}
+
+ - uses: ./.github/actions/ci-setup
+ with:
+ run-scripts: "true"
+
+ - name: Cache Playwright Chromium
+ uses: actions/cache@v5
+ with:
+ path: |
+ ~/.cache/ms-playwright/chromium-*
+ ~/.cache/ms-playwright/chromium_headless_shell-*
+ ~/.cache/ms-playwright/ffmpeg-*
+ key: playwright-chromium-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
+
+ - name: Download Builder E2E build
+ uses: actions/download-artifact@v7
+ with:
+ name: builder-e2e-build
+ path: .
+
+ - name: Run Builder E2E
+ shell: bash
+ env:
+ E2E_SKIP_BUILDER_BUILD: "true"
+ E2E_SKIP_CLEANUP: "true"
+ E2E_TEST_SHARD: ${{ inputs.shard }}
+ E2E_TEST_PARTITION: ${{ inputs.partition }}
+ run: |
+ args=(--workers=4)
+ if [ -n "$E2E_TEST_PARTITION" ]; then
+ args+=(--shard="$E2E_TEST_PARTITION")
+ fi
+ pnpm e2e:builder -- "${args[@]}"
+
+ - name: Upload report
+ if: failure()
+ uses: actions/upload-artifact@v6
+ with:
+ name: builder-e2e-report-${{ inputs.shard }}
+ retention-days: 7
+ path: |
+ apps/builder/playwright-report
+ apps/builder/test-results/e2e
+
+ - name: Print service logs
+ if: failure()
+ shell: bash
+ run: docker compose $BUILDER_E2E_COMPOSE_ARGS logs
+
+ - name: Stop services
+ if: always()
+ shell: bash
+ run: docker compose $BUILDER_E2E_COMPOSE_ARGS down --volumes --remove-orphans
diff --git a/.github/actions/test-suite/action.yml b/.github/actions/test-suite/action.yml
new file mode 100644
index 0000000000..8cdc83aaa9
--- /dev/null
+++ b/.github/actions/test-suite/action.yml
@@ -0,0 +1,65 @@
+name: Test suite
+
+description: Run one package, CLI, or Builder test suite.
+
+inputs:
+ submodules-ssh-key:
+ description: SSH key for private test dependencies.
+ required: false
+ scope:
+ description: Test suite scope.
+ required: true
+ project:
+ description: Builder Vitest project pattern.
+ required: false
+
+runs:
+ using: composite
+ steps:
+ - uses: ./.github/actions/submodules-checkout
+ with:
+ submodules-ssh-key: ${{ inputs.submodules-ssh-key }}
+
+ - uses: ./.github/actions/ci-setup
+
+ - name: Cache Playwright Chromium
+ if: inputs.scope != 'cli'
+ uses: actions/cache@v5
+ with:
+ path: |
+ ~/.cache/ms-playwright/chromium-*
+ ~/.cache/ms-playwright/chromium_headless_shell-*
+ ~/.cache/ms-playwright/ffmpeg-*
+ key: playwright-chromium-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
+
+ - name: Cache Playwright Firefox
+ if: inputs.scope == 'packages'
+ uses: actions/cache@v5
+ with:
+ path: ~/.cache/ms-playwright/firefox-*
+ key: playwright-firefox-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
+
+ - name: Install package test browsers
+ if: inputs.scope == 'packages'
+ shell: bash
+ run: pnpm --filter @webstudio-is/sdk-components-animation exec playwright install chromium firefox
+
+ - name: Install Builder test browser
+ if: startsWith(inputs.scope, 'builder-')
+ shell: bash
+ run: pnpm --filter @webstudio-is/builder exec playwright install chromium
+
+ - name: Test packages
+ if: inputs.scope == 'packages'
+ shell: bash
+ run: pnpm -r --filter "!@webstudio-is/builder" --filter "!webstudio" test
+
+ - name: Test CLI
+ if: inputs.scope == 'cli'
+ shell: bash
+ run: pnpm --filter webstudio test
+
+ - name: Test Builder
+ if: startsWith(inputs.scope, 'builder-')
+ shell: bash
+ run: pnpm --filter @webstudio-is/builder exec vitest run --project "${{ inputs.project }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 32c7a04ce1..f55a85309e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,9 +8,9 @@ on:
pull_request_target:
types: [labeled]
-# cancel in-progress runs on new commits to same PR (gitub.event.number)
+# Keep pull_request_target label events from canceling pull_request checks.
concurrency:
- group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
+ group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.sha }}
cancel-in-progress: true
permissions:
@@ -23,7 +23,7 @@ jobs:
github.event_name == 'push' ||
github.event_name == 'pull_request' ||
(github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
- timeout-minutes: 20
+ timeout-minutes: 5
runs-on: ubuntu-24.04-arm
environment:
name: development
@@ -32,7 +32,6 @@ jobs:
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- allow-unsafe-pr-checkout: ${{ github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy' }}
- uses: ./.github/actions/submodules-checkout
with:
@@ -43,40 +42,66 @@ jobs:
- name: Build packaged SSG fixture
run: pnpm --filter webstudio test:ssg-package
- checks:
- # Run on push, regular PR (for repo branches), or labeled PR with safe-to-deploy (for forks)
+ tests:
+ name: tests (${{ matrix.environment }}, ${{ matrix.suite.scope }})
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request' ||
(github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
-
- timeout-minutes: 20
-
+ timeout-minutes: 5
+ runs-on: ubuntu-24.04
strategy:
+ fail-fast: false
matrix:
environment:
- empty
- development
-
+ suite:
+ - scope: packages
+ - scope: cli
+ - scope: builder-core
+ project: core-*
+ - scope: builder-app
+ project: app-*
environment:
name: ${{ matrix.environment }}
-
env:
DATABASE_URL: postgres://
AUTH_SECRET: test
- runs-on: ubuntu-24.04-arm
-
steps:
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- allow-unsafe-pr-checkout: ${{ github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy' }}
- # Will not checkout submodules on empty environment, and will on development
- - uses: ./.github/actions/submodules-checkout
+ - uses: ./.github/actions/test-suite
with:
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
+ scope: ${{ matrix.suite.scope }}
+ project: ${{ matrix.suite.project }}
+
+ checks:
+ # Run on push, regular PR (for repo branches), or labeled PR with safe-to-deploy (for forks)
+ if: |
+ github.event_name == 'push' ||
+ github.event_name == 'pull_request' ||
+ (github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
+
+ timeout-minutes: 5
+
+ environment:
+ name: empty
+
+ env:
+ DATABASE_URL: postgres://
+ AUTH_SECRET: test
+
+ runs-on: ubuntu-24.04-arm
+
+ steps:
+ - uses: actions/checkout@v5
+ with:
+ ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: pnpm/action-setup@v6
@@ -89,8 +114,6 @@ jobs:
run: |
pnpm install
- - run: echo ===SHA USED=== ${{ github.event.pull_request.head.sha || github.sha }} # todo: remove after check whats happening on main
-
- run: |
pnpm oxfmt --check
@@ -110,23 +133,6 @@ jobs:
run: |
pnpm check:generated-docs
- - name: Cache Playwright browsers
- uses: actions/cache@v5
- with:
- path: ~/.cache/ms-playwright
- key: playwright-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
- playwright-${{ runner.os }}-
-
- - name: Playwright init
- run: |
- pnpm playwright install
- working-directory: packages/sdk-components-animation
-
- - name: Test
- run: |
- pnpm -r test
-
- name: Typecheck
run: |
pnpm -r typecheck
@@ -138,6 +144,8 @@ jobs:
github.event_name == 'pull_request' ||
(github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
+ timeout-minutes: 5
+
runs-on: ubuntu-24.04-arm
environment:
@@ -147,7 +155,6 @@ jobs:
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- allow-unsafe-pr-checkout: ${{ github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy' }}
- uses: ./.github/actions/submodules-checkout
with:
@@ -204,45 +211,48 @@ jobs:
github.event_name == 'pull_request' ||
(github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
- timeout-minutes: 20
+ timeout-minutes: 5
runs-on: ubuntu-24.04
environment:
name: development
+ outputs:
+ shards: ${{ steps.build.outputs.shards }}
+
steps:
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- allow-unsafe-pr-checkout: ${{ github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy' }}
- - uses: ./.github/actions/submodules-checkout
+ - id: build
+ uses: ./.github/actions/builder-e2e-build
with:
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
+ supabase-migrations:
+ name: Supabase migrations
+ if: |
+ github.event_name == 'push' ||
+ github.event_name == 'pull_request' ||
+ (github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
+ timeout-minutes: 5
+ runs-on: ubuntu-24.04
+ environment:
+ name: empty
+
+ steps:
+ - uses: actions/checkout@v5
+ with:
+ ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
- uses: ./.github/actions/ci-setup
with:
run-scripts: "true"
- - name: Build builder and generated preview dependencies
- run: pnpm e2e:builder:build
-
- # Generate this from the current migrations for this workflow run only.
- # Shards consume the snapshot as a fast, disposable schema cache.
- - name: Generate builder e2e schema snapshot
- run: pnpm e2e:builder:refresh-schema-cache
-
- - name: Upload builder e2e prerequisites
- uses: actions/upload-artifact@v6
- with:
- name: builder-e2e-build
- retention-days: 7
- path: |
- apps/builder/build/server
- apps/builder/build/client/assets
- packages/*/lib
- .cache/builder-e2e/schema-*.sql
+ - name: Apply migrations to Supabase PostgreSQL
+ run: pnpm e2e:builder:check-supabase-migrations
builder-e2e:
name: builder-e2e (${{ matrix.shard }})
@@ -252,7 +262,7 @@ jobs:
github.event_name == 'pull_request' ||
(github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy')
- timeout-minutes: 40
+ timeout-minutes: 5
needs: builder-e2e-build
@@ -260,72 +270,24 @@ jobs:
strategy:
fail-fast: false
matrix:
- shard: [1, 2, 3, 4, 5, 6]
+ include: ${{ fromJSON(needs.builder-e2e-build.outputs.shards) }}
environment:
name: development
env:
- BUILDER_E2E_COMPOSE_ARGS: "--env-file apps/builder/.env -f apps/builder/docker-compose.yaml -f apps/builder/docker-compose.e2e.yaml"
+ BUILDER_E2E_COMPOSE_ARGS: "--env-file apps/builder/.env -f apps/builder/docker-compose.yaml -f apps/builder/docker-compose.e2e-shard.yaml"
+ COMPOSE_PROJECT_NAME: builder-e2e
+ E2E_BUILD_DATABASE_IMAGE: "false"
+ E2E_COMPOSE_OVERRIDE_FILE: ${{ github.workspace }}/apps/builder/docker-compose.e2e-shard.yaml
steps:
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- allow-unsafe-pr-checkout: ${{ github.event_name == 'pull_request_target' && github.event.label.name == 'safe-to-deploy' }}
- - uses: ./.github/actions/submodules-checkout
+ - uses: ./.github/actions/builder-e2e-shard
with:
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
-
- - uses: ./.github/actions/ci-setup
- with:
- run-scripts: "true"
-
- - name: Cache Playwright browsers
- uses: actions/cache@v5
- with:
- path: ~/.cache/ms-playwright
- key: builder-e2e-playwright-${{ runner.os }}-${{ hashFiles('apps/builder/package.json', 'pnpm-lock.yaml') }}
-
- - name: Download builder e2e build
- uses: actions/download-artifact@v7
- with:
- name: builder-e2e-build
- path: .
-
- - name: Run builder e2e
- env:
- E2E_SKIP_BUILDER_BUILD: true
- E2E_TEST_COMMAND_TIMEOUT_SECONDS: 900
- run: |
- run_builder_e2e() {
- pnpm e2e:builder -- --shard=${{ matrix.shard }}/6
- }
-
- run_builder_e2e_keep_logs() {
- E2E_SKIP_CLEANUP=true pnpm e2e:builder -- --shard=${{ matrix.shard }}/6
- }
-
- run_builder_e2e || {
- echo "::warning::Builder e2e shard ${{ matrix.shard }} failed; retrying once with a clean backend"
- run_builder_e2e_keep_logs
- }
-
- - name: Upload Builder e2e report
- if: failure()
- uses: actions/upload-artifact@v6
- with:
- name: builder-e2e-report-${{ matrix.shard }}
- retention-days: 7
- path: |
- apps/builder/playwright-report
- apps/builder/test-results/e2e
-
- - name: Print e2e service logs
- if: failure()
- run: docker compose $BUILDER_E2E_COMPOSE_ARGS logs
-
- - name: Stop e2e services
- if: always()
- run: docker compose $BUILDER_E2E_COMPOSE_ARGS down --volumes --remove-orphans
+ shard: ${{ matrix.shard }}
+ partition: ${{ matrix.partition }}
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
index 61a6546306..e27e36b37e 100644
--- a/.github/workflows/visual-regression.yml
+++ b/.github/workflows/visual-regression.yml
@@ -76,7 +76,7 @@ jobs:
)
)
)
- timeout-minutes: 30
+ timeout-minutes: 5
runs-on: ubuntu-latest
environment:
name: development
@@ -93,11 +93,14 @@ jobs:
- uses: ./.github/actions/ci-setup
- - name: Cache pinned visual browser
+ - name: Cache Playwright Chromium
uses: actions/cache@v5
with:
- path: ~/.cache/ms-playwright
- key: visual-playwright-${{ runner.os }}-${{ hashFiles('packages/sdk-components-animation/package.json', 'pnpm-lock.yaml') }}
+ path: |
+ ~/.cache/ms-playwright/chromium-*
+ ~/.cache/ms-playwright/chromium_headless_shell-*
+ ~/.cache/ms-playwright/ffmpeg-*
+ key: playwright-chromium-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
- name: Install pinned visual browser
run: |
diff --git a/apps/builder/app/builder/features/settings-panel/asset-query-form.test.tsx b/apps/builder/app/builder/features/settings-panel/asset-query-form.test.tsx
index bad6247736..120035ee6b 100644
--- a/apps/builder/app/builder/features/settings-panel/asset-query-form.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/asset-query-form.test.tsx
@@ -69,7 +69,7 @@ test("loads the external query schema declared by OpenAPI", async () => {
expect(fetchDescription).toHaveBeenCalledTimes(2);
expect(fetchDescription.mock.calls[1][0]).toBe(
- "http://localhost:3000/rest/assets/query-schema.json"
+ `${window.location.origin}/rest/assets/query-schema.json`
);
expect(definition.fields).toContainEqual(
expect.objectContaining({ path: ["properties", "title"] })
diff --git a/apps/builder/app/builder/features/settings-panel/content-database-diagnostics-view.test.tsx b/apps/builder/app/builder/features/settings-panel/content-database-diagnostics-view.test.tsx
index 18889449fe..ccb928a082 100644
--- a/apps/builder/app/builder/features/settings-panel/content-database-diagnostics-view.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/content-database-diagnostics-view.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/settings-panel/controls/content-block-source.test.tsx b/apps/builder/app/builder/features/settings-panel/controls/content-block-source.test.tsx
index f61aa7e509..0734598eef 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/content-block-source.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/content-block-source.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import type { ComponentProps } from "react";
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text-content.test.tsx b/apps/builder/app/builder/features/settings-panel/controls/text-content.test.tsx
index c0f2d6279a..c8ed0e4c95 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text-content.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text-content.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.test.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.test.tsx
index 4047726c91..c8e765f614 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/settings-panel/property-label.test.tsx b/apps/builder/app/builder/features/settings-panel/property-label.test.tsx
index f852dc0061..4ab3cb002b 100644
--- a/apps/builder/app/builder/features/settings-panel/property-label.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/property-label.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx b/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
index 6c649907f6..1f6eafd341 100644
--- a/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
+++ b/apps/builder/app/builder/features/settings-panel/request-inspector.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, expect, test, vi } from "vitest";
@@ -64,8 +61,8 @@ test("places an available query editor in the first selected tab", () => {
"Diagnostics",
]);
expect(tabs[0].getAttribute("data-state")).toBe("active");
- expect(queryContainer.current?.style.minHeight).toBe("0");
- expect(queryContainer.current?.style.minWidth).toBe("0");
+ expect(queryContainer.current?.style.minHeight).toBe("0px");
+ expect(queryContainer.current?.style.minWidth).toBe("0px");
expect(queryContainer.current?.style.overflow).toBe("hidden");
});
diff --git a/apps/builder/app/builder/features/template-name-confirmation-dialog.test.tsx b/apps/builder/app/builder/features/template-name-confirmation-dialog.test.tsx
index 15a66e17cc..f03f33113a 100644
--- a/apps/builder/app/builder/features/template-name-confirmation-dialog.test.tsx
+++ b/apps/builder/app/builder/features/template-name-confirmation-dialog.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.ui.test.tsx b/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.ui.test.tsx
index 4de080f83e..859eee3b31 100644
--- a/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.ui.test.tsx
+++ b/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.ui.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/features/text-file-editor/mdx-editor-lint.test.ts b/apps/builder/app/builder/features/text-file-editor/mdx-editor-lint.test.ts
index ef2a53852d..077b81cae8 100644
--- a/apps/builder/app/builder/features/text-file-editor/mdx-editor-lint.test.ts
+++ b/apps/builder/app/builder/features/text-file-editor/mdx-editor-lint.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { EditorState } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import { forceLinting, forEachDiagnostic } from "@codemirror/lint";
diff --git a/apps/builder/app/builder/shared/assets/mdx-content-repository.test.ts b/apps/builder/app/builder/shared/assets/mdx-content-repository.test.ts
index 71a6552c75..3eb35fbff0 100644
--- a/apps/builder/app/builder/shared/assets/mdx-content-repository.test.ts
+++ b/apps/builder/app/builder/shared/assets/mdx-content-repository.test.ts
@@ -30,16 +30,10 @@ const collect = async (data: AsyncIterable<Uint8Array>) => {
};
describe("HTTP MDX content repository", () => {
- test("can be created during server rendering without reading browser globals", () => {
- const browserWindow = globalThis.window;
- vi.stubGlobal("window", undefined);
- try {
- expect(() =>
- createBuilderHttpAssetContentRepository({ projectId: asset.projectId })
- ).not.toThrow();
- } finally {
- vi.stubGlobal("window", browserWindow);
- }
+ test("defers browser-dependent work until the first request", () => {
+ expect(() =>
+ createBuilderHttpAssetContentRepository({ projectId: asset.projectId })
+ ).not.toThrow();
});
test("returns content and exact revision identity from one response", async () => {
diff --git a/apps/builder/app/builder/shared/bindable-expression.test.tsx b/apps/builder/app/builder/shared/bindable-expression.test.tsx
index aa400c1347..b1ec751569 100644
--- a/apps/builder/app/builder/shared/bindable-expression.test.tsx
+++ b/apps/builder/app/builder/shared/bindable-expression.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, expect, test, vi } from "vitest";
diff --git a/apps/builder/app/builder/shared/commands.test.ts b/apps/builder/app/builder/shared/commands.test.ts
index 7e72372d0e..5258b0a415 100644
--- a/apps/builder/app/builder/shared/commands.test.ts
+++ b/apps/builder/app/builder/shared/commands.test.ts
@@ -371,7 +371,7 @@ describe("cut", () => {
expect(JSON.parse(writeText.mock.calls[0]?.[0] ?? "")).toMatchObject({
"@webstudio/instances/v0.1": {
- sourceOrigin: "http://localhost:3000",
+ sourceOrigin: window.location.origin,
rootInstanceIds: ["box1", "box2"],
},
});
diff --git a/apps/builder/app/builder/shared/css-editor/parse-style-input.test.ts b/apps/builder/app/builder/shared/css-editor/parse-style-input.test.ts
index b1cd8f478e..fb611e57b7 100644
--- a/apps/builder/app/builder/shared/css-editor/parse-style-input.test.ts
+++ b/apps/builder/app/builder/shared/css-editor/parse-style-input.test.ts
@@ -194,7 +194,7 @@ describe("parseStyleInput", () => {
expect(result).toEqual(
new Map([
["color", { type: "keyword", value: "red" }],
- ["--somethinginvalid", { type: "unparsed", value: "block" }],
+ ["--somethinginvalid", { type: "invalid", value: "block" }],
])
);
});
diff --git a/apps/builder/app/builder/shared/query-builder.test.tsx b/apps/builder/app/builder/shared/query-builder.test.tsx
index 7982b45c64..51787d3d78 100644
--- a/apps/builder/app/builder/shared/query-builder.test.tsx
+++ b/apps/builder/app/builder/shared/query-builder.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { act } from "react-dom/test-utils";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, expect, test } from "vitest";
@@ -258,6 +255,7 @@ test("renders the query source inside a constrained full-size editor", () => {
const scrollerStyle = getComputedStyle(
sourceContainer.querySelector(".cm-scroller") as Element
);
- expect(scrollerStyle.minHeight).toBe("0");
- expect(scrollerStyle.overflow).toBe("auto");
+ expect(scrollerStyle.minHeight).toBe("0px");
+ expect(scrollerStyle.overflowX).toBe("hidden");
+ expect(scrollerStyle.overflowY).toBe("auto");
});
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx
index 80a218744a..0be688988f 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { describe, test, expect } from "vitest";
import { __testing__ } from "./webstudio-component";
diff --git a/apps/builder/app/services/asset-upload.server.test.ts b/apps/builder/app/services/asset-upload.server.test.ts
index 44988375ea..d4a7bceb8b 100644
--- a/apps/builder/app/services/asset-upload.server.test.ts
+++ b/apps/builder/app/services/asset-upload.server.test.ts
@@ -1,5 +1,3 @@
-// @vitest-environment node
-
import { afterEach, expect, test, vi } from "vitest";
import { RESIZABLE_IMAGE_MIME_TYPES } from "@webstudio-is/sdk";
import { getBrowserUploadBody } from "./asset-upload.server";
diff --git a/apps/builder/app/services/no-store-redirect.test.ts b/apps/builder/app/services/no-store-redirect.server.test.ts
similarity index 100%
rename from apps/builder/app/services/no-store-redirect.test.ts
rename to apps/builder/app/services/no-store-redirect.server.test.ts
diff --git a/apps/builder/app/shared/asset-content-bridge.client.ts b/apps/builder/app/shared/asset-content-bridge.client.ts
index 2d41c69d23..f8887d1f26 100644
--- a/apps/builder/app/shared/asset-content-bridge.client.ts
+++ b/apps/builder/app/shared/asset-content-bridge.client.ts
@@ -131,3 +131,20 @@ export const getAssetContentBridge = () => {
}
return bridge;
};
+
+export const __testing__ = {
+ initBridge: (bridge: AssetContentBridge) => {
+ const owner = window.self === window.top ? window : window.top;
+ if (owner === null) {
+ throw new Error("Test window has no top-level owner");
+ }
+ owner[namespace] = bridge;
+ },
+ clearBridge: () => {
+ const owner = window.self === window.top ? window : window.top;
+ if (owner === null) {
+ throw new Error("Test window has no top-level owner");
+ }
+ delete owner[namespace];
+ },
+};
diff --git a/apps/builder/app/shared/awareness.test.tsx b/apps/builder/app/shared/awareness.test.tsx
index 8d08ace27b..c1633d4d9e 100644
--- a/apps/builder/app/shared/awareness.test.tsx
+++ b/apps/builder/app/shared/awareness.test.tsx
@@ -179,6 +179,11 @@ test("awareness updates are coalesced into one microtask", async () => {
test("pointer tracking is throttled to 8fps and keeps latest position", () => {
vi.useFakeTimers();
$selectedPageId.set("homePageId");
+ const originalFrameElement = window.frameElement;
+ Object.defineProperty(window, "frameElement", {
+ configurable: true,
+ value: null,
+ });
const stop = startPointerTracking();
@@ -199,6 +204,10 @@ test("pointer tracking is throttled to 8fps and keeps latest position", () => {
expect($pointerPosition.get()).toMatchObject({ x: 12, y: 22 });
stop();
+ Object.defineProperty(window, "frameElement", {
+ configurable: true,
+ value: originalFrameElement,
+ });
});
test("pointer tracking maps iframe coordinates to parent viewport", () => {
diff --git a/apps/builder/app/shared/builder-api.ts b/apps/builder/app/shared/builder-api.ts
index f96c6d1c32..e064e3662c 100644
--- a/apps/builder/app/shared/builder-api.ts
+++ b/apps/builder/app/shared/builder-api.ts
@@ -370,4 +370,16 @@ export const initBuilderApi = () => {
return () => {};
};
-export const __testing__ = { canAccessAssetContent };
+export const __testing__ = {
+ api: _builderApi,
+ canAccessAssetContent,
+ useLocalApi: () => {
+ const owner = isInTop() ? window : window.top;
+ invariant(owner);
+ const previousApi = owner[apiWindowNamespace];
+ owner[apiWindowNamespace] = _builderApi;
+ return () => {
+ owner[apiWindowNamespace] = previousApi;
+ };
+ },
+};
diff --git a/apps/builder/app/shared/clipboard.test.ts b/apps/builder/app/shared/clipboard.test.ts
index 5b901835ea..1a48ff31f7 100644
--- a/apps/builder/app/shared/clipboard.test.ts
+++ b/apps/builder/app/shared/clipboard.test.ts
@@ -1,8 +1,11 @@
-import { afterEach, expect, test, vi } from "vitest";
-import { initBuilderApi } from "./builder-api";
+import { afterAll, afterEach, expect, test, vi } from "vitest";
+import { __testing__ as builderApiTesting } from "./builder-api";
import { readClipboardText } from "./clipboard";
+afterAll(builderApiTesting.useLocalApi());
+
afterEach(() => {
+ vi.restoreAllMocks();
vi.unstubAllGlobals();
});
@@ -15,9 +18,9 @@ test("reads clipboard text", async () => {
});
test("reports denied clipboard access without rejecting", async () => {
- initBuilderApi();
- const toastError = vi.fn();
- window.__webstudio__$__builderApi.toast.error = toastError;
+ const toastError = vi
+ .spyOn(builderApiTesting.api.toast, "error")
+ .mockImplementation(() => {});
vi.stubGlobal("navigator", {
clipboard: {
readText: vi
diff --git a/apps/builder/app/shared/copy-paste/asset-transfer-utils.ts b/apps/builder/app/shared/copy-paste/asset-transfer-utils.ts
index a54f118cb9..81ff5ec3b9 100644
--- a/apps/builder/app/shared/copy-paste/asset-transfer-utils.ts
+++ b/apps/builder/app/shared/copy-paste/asset-transfer-utils.ts
@@ -5,7 +5,7 @@ import {
} from "@webstudio-is/sdk";
import { produce } from "immer";
import { replaceAssetMutable } from "@webstudio-is/project-build/runtime";
-import { builderApi } from "../builder-api";
+import type { builderApi } from "../builder-api";
const assetTransferError =
"Could not transfer assets from the source Webstudio deployment. Make sure it is reachable and try again.";
@@ -14,12 +14,12 @@ export const transferFragmentAssets = async ({
sourceOrigin,
projectId,
fragments,
- importAssets = builderApi.importAssets,
+ importAssets,
}: {
sourceOrigin: string | undefined;
projectId: string;
fragments: WebstudioFragment[];
- importAssets?: typeof builderApi.importAssets;
+ importAssets: typeof builderApi.importAssets;
}) => {
if (fragments.every((fragment) => fragment.assets.length === 0)) {
return {
diff --git a/apps/builder/app/shared/copy-paste/copy-paste.test.ts b/apps/builder/app/shared/copy-paste/copy-paste.test.ts
index b28892bb1f..f95d4a37cc 100644
--- a/apps/builder/app/shared/copy-paste/copy-paste.test.ts
+++ b/apps/builder/app/shared/copy-paste/copy-paste.test.ts
@@ -1,11 +1,11 @@
-import { afterEach, expect, test, vi } from "vitest";
+import { afterAll, afterEach, expect, test, vi } from "vitest";
import { enableMapSet } from "immer";
import { createDefaultPages } from "@webstudio-is/project-build";
import { createEmptyWebstudioFragment } from "@webstudio-is/project-build/runtime";
import { coreMetas, ROOT_INSTANCE_ID, type Instance } from "@webstudio-is/sdk";
import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";
import type { Project } from "@webstudio-is/project";
-import { initBuilderApi } from "../builder-api";
+import { __testing__ as builderApiTesting } from "../builder-api";
import { registerContainers } from "../sync/sync-stores";
import {
$assets,
@@ -40,6 +40,7 @@ import { insertFragmentWithBreakpointWarning } from "./fragment-utils";
enableMapSet();
registerContainers();
+afterAll(builderApiTesting.useLocalApi());
$registeredComponentMetas.set(
new Map(Object.entries({ ...baseComponentMetas, ...coreMetas }))
);
@@ -154,24 +155,21 @@ class TestClipboardEvent extends Event {
}
const setupToastInfo = () => {
- initBuilderApi();
- const toastInfo = vi.fn();
- window.__webstudio__$__builderApi.toast.info = toastInfo;
- return toastInfo;
+ return vi
+ .spyOn(builderApiTesting.api.toast, "info")
+ .mockImplementation(() => {});
};
const setupToastError = () => {
- initBuilderApi();
- const toastError = vi.fn();
- window.__webstudio__$__builderApi.toast.error = toastError;
- return toastError;
+ return vi
+ .spyOn(builderApiTesting.api.toast, "error")
+ .mockImplementation(() => {});
};
const setupToastSuccess = () => {
- initBuilderApi();
- const toastSuccess = vi.fn();
- window.__webstudio__$__builderApi.toast.success = toastSuccess;
- return toastSuccess;
+ return vi
+ .spyOn(builderApiTesting.api.toast, "success")
+ .mockImplementation(() => {});
};
const waitForClipboardEvent = () =>
@@ -181,9 +179,8 @@ const pastePlainText = async (
value: unknown,
target: "design-token" | "css-variable" | "cancel" = "css-variable"
) => {
- initBuilderApi();
vi.spyOn(
- window.__webstudio__$__builderApi,
+ builderApiTesting.api,
"showDesignTokenImportDialog"
).mockResolvedValue(target);
const abortController = new AbortController();
@@ -747,7 +744,7 @@ test("resolves token conflicts for fragments through the shared paste helper", a
value: { type: "unparsed", value: "blue" },
});
const conflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showTokenConflictDialog")
+ .spyOn(builderApiTesting.api, "showTokenConflictDialog")
.mockResolvedValue("ours");
await insertFragmentWithBreakpointWarning(fragment);
@@ -792,10 +789,9 @@ test("does not insert a fragment when token conflict resolution is cancelled", a
property: "color",
value: { type: "unparsed", value: "blue" },
});
- vi.spyOn(
- window.__webstudio__$__builderApi,
- "showTokenConflictDialog"
- ).mockResolvedValue("cancel");
+ vi.spyOn(builderApiTesting.api, "showTokenConflictDialog").mockResolvedValue(
+ "cancel"
+ );
const inserted = await insertFragmentWithBreakpointWarning(fragment);
@@ -818,7 +814,7 @@ test.each([
setupToastError();
setupToastSuccess();
const conflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showTokenConflictDialog")
+ .spyOn(builderApiTesting.api, "showTokenConflictDialog")
.mockResolvedValue(resolution);
await pastePlainText({
color: { $type: "color", $value: "#123456" },
@@ -848,7 +844,7 @@ test("silently reuses an identical pasted design value", async () => {
setupToastError();
const toastSuccess = setupToastSuccess();
const conflictDialog = vi.spyOn(
- window.__webstudio__$__builderApi,
+ builderApiTesting.api,
"showTokenConflictDialog"
);
await pastePlainText({
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
index 93058f80bd..3a82c7ce9c 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
@@ -1,4 +1,4 @@
-import { describe, test, expect, vi } from "vitest";
+import { afterAll, afterEach, describe, test, expect, vi } from "vitest";
import { enableMapSet } from "immer";
import { toast } from "@webstudio-is/design-system";
import type {
@@ -46,9 +46,11 @@ import {
expectSlotsShareFragment,
} from "../slot-test-utils";
import { pasteHandled } from "./copy-paste";
-import { initBuilderApi } from "../builder-api";
+import { __testing__ as builderApiTesting } from "../builder-api";
import { $externalContentRoots } from "../external-content-mutations";
+afterAll(builderApiTesting.useLocalApi());
+afterEach(() => vi.restoreAllMocks());
const expectString = expect.any(String) as unknown as string;
enableMapSet();
@@ -292,9 +294,8 @@ describe("copy and cut guards", () => {
expect(fragment.instances).not.toEqual(
expect.arrayContaining([expect.objectContaining({ id: "mdx-heading" })])
);
- initBuilderApi();
const importAssets = vi
- .spyOn(window.__webstudio__$__builderApi, "importAssets")
+ .spyOn(builderApiTesting.api, "importAssets")
.mockResolvedValue(new Map([["post", $assets.get().get("post")!]]));
$instances.set(
toMap([createInstance("target-body", "Body", [])] satisfies Instance[])
@@ -389,9 +390,8 @@ describe("copy and cut guards", () => {
id: "imported-asset",
projectId: "my-project",
} satisfies Asset;
- initBuilderApi();
const importAssets = vi
- .spyOn(window.__webstudio__$__builderApi, "importAssets")
+ .spyOn(builderApiTesting.api, "importAssets")
.mockRejectedValueOnce(new Error("Source is unavailable"))
.mockImplementation(
async () => new Map([[sourceAsset.id, importedAsset]])
@@ -464,17 +464,15 @@ describe("copy and cut guards", () => {
selectInstance(["legacy-button", "body0"]);
const clipboardData = instanceText.onCopy?.() ?? "";
selectInstance(["body0"]);
- initBuilderApi();
- const previousWarn = window.__webstudio__$__builderApi.toast.warn;
- const warn = vi.fn();
- window.__webstudio__$__builderApi.toast.warn = warn;
+ const warn = vi
+ .spyOn(builderApiTesting.api.toast, "warn")
+ .mockImplementation(() => {});
expect(await instanceText.onPaste?.(clipboardData)).toEqual(pasteHandled);
expect($instances.get().get("body0")?.children).toHaveLength(2);
expect(warn).toHaveBeenCalledWith(
"Pasted with warning: Placing <h3> element inside a <button> violates HTML spec."
);
- window.__webstudio__$__builderApi.toast.warn = previousWarn;
});
test("sanitizes multi-root clipboard root ids before paste", async () => {
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index acd9014565..ed0eede107 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -363,6 +363,7 @@ const insertPastedFragment = async ({
sourceOrigin,
projectId,
fragments: [fragment],
+ importAssets: builderApi.importAssets,
});
if (transferred.success === false) {
return transferred;
diff --git a/apps/builder/app/shared/copy-paste/plugin-jsx.test.ts b/apps/builder/app/shared/copy-paste/plugin-jsx.test.ts
index 70efa77c01..3b61481e4e 100644
--- a/apps/builder/app/shared/copy-paste/plugin-jsx.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-jsx.test.ts
@@ -11,7 +11,8 @@ const mocks = vi.hoisted(() => ({
toastError: vi.fn(),
}));
-vi.mock("../trpc/trpc-client", () => ({
+vi.mock("../trpc/trpc-client", async (importOriginal) => ({
+ ...(await importOriginal()),
nativeClient: {
build: {
createJsxFragment: {
@@ -21,11 +22,13 @@ vi.mock("../trpc/trpc-client", () => ({
},
}));
-vi.mock("../instance-utils/insert", () => ({
+vi.mock("../instance-utils/insert", async (importOriginal) => ({
+ ...(await importOriginal()),
insertWebstudioFragmentAt: mocks.insertWebstudioFragmentAt,
}));
-vi.mock("../builder-api", () => ({
+vi.mock("../builder-api", async (importOriginal) => ({
+ ...(await importOriginal()),
builderApi: {
toast: {
error: mocks.toastError,
diff --git a/apps/builder/app/shared/copy-paste/plugin-page.test.ts b/apps/builder/app/shared/copy-paste/plugin-page.test.ts
index 8b3365b407..c5dca7b182 100644
--- a/apps/builder/app/shared/copy-paste/plugin-page.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-page.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, expect, test, vi } from "vitest";
+import { afterAll, afterEach, expect, test, vi } from "vitest";
import { enableMapSet } from "immer";
import { createDefaultPages } from "@webstudio-is/project-build";
import type { PageTransferItem } from "@webstudio-is/project-build/transfer";
@@ -42,11 +42,11 @@ import {
__testing__,
} from "./plugin-page";
import { pasteHandled, pasteIgnored } from "./copy-paste";
-import { initBuilderApi } from "../builder-api";
+import { __testing__ as builderApiTesting } from "../builder-api";
enableMapSet();
registerContainers();
-initBuilderApi();
+afterAll(builderApiTesting.useLocalApi());
const { preparePageTransferItem } = __testing__;
afterEach(() => {
@@ -433,7 +433,7 @@ test("transfers assets copied from another deployment before inserting the page"
])
);
const importAssets = vi
- .spyOn(window.__webstudio__$__builderApi, "importAssets")
+ .spyOn(builderApiTesting.api, "importAssets")
.mockImplementation(async (projectId, sources) => {
expect(projectId).toBe("target-project");
expect(sources).toEqual([
@@ -544,10 +544,7 @@ test("preserves legacy page metadata assets that exist in the destination", asyn
$assets.set(
new Map([[sourceAsset.id, { ...sourceAsset, projectId: "target-project" }]])
);
- const importAssets = vi.spyOn(
- window.__webstudio__$__builderApi,
- "importAssets"
- );
+ const importAssets = vi.spyOn(builderApiTesting.api, "importAssets");
expect(await handlePastePage(clipboardData, ROOT_FOLDER_ID)).toEqual(
pasteHandled
@@ -589,7 +586,7 @@ test.each([
color: "blue",
});
const conflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showRootStyleConflictDialog")
+ .spyOn(builderApiTesting.api, "showRootStyleConflictDialog")
.mockResolvedValue(resolution);
await handlePastePage(clipboardData ?? "", ROOT_FOLDER_ID);
@@ -649,13 +646,10 @@ test("cancels page paste when global root style resolution is cancelled", async
});
const initialPageCount = targetPages.pages.size;
vi.spyOn(
- window.__webstudio__$__builderApi,
+ builderApiTesting.api,
"showRootStyleConflictDialog"
).mockResolvedValue("cancel");
- const importAssets = vi.spyOn(
- window.__webstudio__$__builderApi,
- "importAssets"
- );
+ const importAssets = vi.spyOn(builderApiTesting.api, "importAssets");
await handlePastePage(clipboardData ?? "", ROOT_FOLDER_ID);
@@ -686,15 +680,14 @@ test("checks current root styles after resolving token conflicts", async () => {
color: "red",
});
addRootTokenStyle({ styleSourceId: "target-token", value: "blue" });
- vi.spyOn(
- window.__webstudio__$__builderApi,
- "showTokenConflictDialog"
- ).mockImplementation(async () => {
- updateRootLocalStyle("blue");
- return "ours";
- });
+ vi.spyOn(builderApiTesting.api, "showTokenConflictDialog").mockImplementation(
+ async () => {
+ updateRootLocalStyle("blue");
+ return "ours";
+ }
+ );
const rootConflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showRootStyleConflictDialog")
+ .spyOn(builderApiTesting.api, "showRootStyleConflictDialog")
.mockResolvedValue("ours");
await handlePastePage(clipboardData ?? "", ROOT_FOLDER_ID);
@@ -853,7 +846,7 @@ test("copies folder data with nested pages across projects", async () => {
);
setRootLocalStyle({ styleSourceId: "target-local", value: "blue" });
const conflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showRootStyleConflictDialog")
+ .spyOn(builderApiTesting.api, "showRootStyleConflictDialog")
.mockResolvedValue("ours");
await handlePastePage(clipboardData ?? "", ROOT_FOLDER_ID);
@@ -1019,7 +1012,7 @@ test("copies template data as a template", async () => {
);
setRootLocalStyle({ styleSourceId: "target-local", value: "blue" });
const conflictDialog = vi
- .spyOn(window.__webstudio__$__builderApi, "showRootStyleConflictDialog")
+ .spyOn(builderApiTesting.api, "showRootStyleConflictDialog")
.mockResolvedValue("theirs");
await handlePastePage(clipboardData ?? "", ROOT_FOLDER_ID);
diff --git a/apps/builder/app/shared/copy-paste/plugin-page.ts b/apps/builder/app/shared/copy-paste/plugin-page.ts
index 7cb1bbe9bf..a23247fa38 100644
--- a/apps/builder/app/shared/copy-paste/plugin-page.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-page.ts
@@ -39,6 +39,7 @@ import { getPageActionTarget } from "../page-action-target";
import { pasteHandled, pasteIgnored, type Plugin } from "./copy-paste";
import { breakpointPasteLimitWarning } from "@webstudio-is/project-build/runtime";
import { transferFragmentAssets } from "./asset-transfer-utils";
+import { builderApi } from "../builder-api";
import { rewriteTransferredDocumentAssetReferences } from "./mdx-asset-transfer";
import {
createClipboardAssetPaths,
@@ -495,6 +496,7 @@ export const handlePastePage = async (
item.rootFragment,
item.bodyFragment,
]),
+ importAssets: builderApi.importAssets,
});
if (transferred.success === false) {
return transferred;
diff --git a/apps/builder/app/shared/dom-utils.test.ts b/apps/builder/app/shared/dom-utils.test.ts
index 370b371cab..7f64af999a 100644
--- a/apps/builder/app/shared/dom-utils.test.ts
+++ b/apps/builder/app/shared/dom-utils.test.ts
@@ -1,7 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
-
import { test, expect, beforeEach } from "vitest";
import {
getAllElementsByInstanceSelector,
diff --git a/apps/builder/app/shared/external-content-roots.test.ts b/apps/builder/app/shared/external-content-roots.test.ts
index a94fb97c62..30e3da4419 100644
--- a/apps/builder/app/shared/external-content-roots.test.ts
+++ b/apps/builder/app/shared/external-content-roots.test.ts
@@ -9,8 +9,8 @@ import {
type Instance,
} from "@webstudio-is/sdk";
import {
+ __testing__ as assetContentBridgeTesting,
createAssetContentBridge,
- initAssetContentBridge,
} from "./asset-content-bridge.client";
import {
acquireExternalContentRoot,
@@ -75,7 +75,7 @@ test("places unresolved-template placeholders at their authored nesting point",
authorize: () => true,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -156,6 +156,7 @@ const releases: Array<() => void> = [];
const sessions: Array<ReturnType<typeof createAssetContentSession>> = [];
afterEach(() => {
+ assetContentBridgeTesting.clearBridge();
for (const release of releases.splice(0)) {
release();
}
@@ -183,7 +184,7 @@ test("rejects a stale raw editor replacement behind a newer queued edit", async
});
sessions.push(session);
const requireReload = vi.fn();
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -246,7 +247,7 @@ test("rebases frontmatter edits from Content Blocks sharing one Asset", async ()
debounceMilliseconds: 0,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -341,7 +342,7 @@ test("does not install an Asset load after its Content Block unmounts", async ()
authorize: () => true,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -405,7 +406,7 @@ test("replaces a mounted root when its source Asset changes", async () => {
authorize: () => true,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -537,7 +538,7 @@ name: [
authorize: () => true,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -705,7 +706,7 @@ test("keeps dynamic Collection occurrences isolated by render scope", async () =
debounceMilliseconds: 0,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -882,7 +883,7 @@ test("finishes a queued canvas save after its external root is released", async
debounceMilliseconds: 0,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -988,7 +989,7 @@ test("retains a failed queued update when project teardown cannot drain it", asy
debounceMilliseconds: 0,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -1070,7 +1071,7 @@ test("retains pending content when the repository write fails during teardown",
debounceMilliseconds: 60_000,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -1125,7 +1126,7 @@ test("keeps drained queues when the project becomes active during teardown", asy
authorize: () => true,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
@@ -1180,7 +1181,7 @@ test("materializes into normal instances and saves their synchronous mutations o
debounceMilliseconds: 0,
});
sessions.push(session);
- initAssetContentBridge(
+ assetContentBridgeTesting.initBridge(
createAssetContentBridge({
origin: window.location.origin,
request: fetch,
diff --git a/apps/builder/app/shared/notifications/notification-popover.test.ts b/apps/builder/app/shared/notifications/notification-popover.node.test.ts
similarity index 100%
rename from apps/builder/app/shared/notifications/notification-popover.test.ts
rename to apps/builder/app/shared/notifications/notification-popover.node.test.ts
diff --git a/apps/builder/app/shared/polly/cross-tab-manager.test.ts b/apps/builder/app/shared/polly/cross-tab-manager.test.ts
index fdae4d76ab..67b26b6143 100644
--- a/apps/builder/app/shared/polly/cross-tab-manager.test.ts
+++ b/apps/builder/app/shared/polly/cross-tab-manager.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { describe, test, expect, vi, beforeEach, afterEach } from "vitest";
import { createCrossTabPollingManager } from "./cross-tab-manager";
import type { SubscriptionResponse, TopicName } from "./types";
diff --git a/apps/builder/app/shared/polly/polling-client.test.ts b/apps/builder/app/shared/polly/polling-client.test.ts
index dcbfac907c..e68a5dc7d7 100644
--- a/apps/builder/app/shared/polly/polling-client.test.ts
+++ b/apps/builder/app/shared/polly/polling-client.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { describe, test, expect, vi, beforeEach, afterEach } from "vitest";
import { createPollingClient } from "./polling-client";
diff --git a/apps/builder/app/shared/polly/polling-manager.test.ts b/apps/builder/app/shared/polly/polling-manager.test.ts
index 9fb07f7012..6ef15b62ab 100644
--- a/apps/builder/app/shared/polly/polling-manager.test.ts
+++ b/apps/builder/app/shared/polly/polling-manager.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { describe, test, expect, vi, beforeEach, afterEach } from "vitest";
import { createPollingManager } from "./polling-manager";
import type { SubscriptionResponse, TopicName } from "./types";
diff --git a/apps/builder/app/shared/pubsub/create.test.ts b/apps/builder/app/shared/pubsub/create.node.test.ts
similarity index 94%
rename from apps/builder/app/shared/pubsub/create.test.ts
rename to apps/builder/app/shared/pubsub/create.node.test.ts
index 402f16df31..ab36269235 100644
--- a/apps/builder/app/shared/pubsub/create.test.ts
+++ b/apps/builder/app/shared/pubsub/create.node.test.ts
@@ -1,4 +1,12 @@
-import { describe, test, expect, beforeEach, afterEach, vi } from "vitest";
+import {
+ afterAll,
+ afterEach,
+ beforeEach,
+ describe,
+ expect,
+ test,
+ vi,
+} from "vitest";
import { createPubsub } from "./create";
type TestPublishMap = {
@@ -15,6 +23,45 @@ type TestPublishMap = {
// Helper to cast to Window type for test mocking
const asWindow = (obj: unknown) => obj as Window & typeof globalThis;
+const testWindow = asWindow({
+ addEventListener: vi.fn(),
+ crypto: globalThis.crypto,
+ parent: { postMessage: vi.fn() },
+ postMessage: vi.fn(),
+});
+testWindow.self = testWindow;
+testWindow.top = testWindow;
+const originalDescriptors = new Map(
+ ["window", "requestAnimationFrame", "cancelAnimationFrame"].map((name) => [
+ name,
+ Object.getOwnPropertyDescriptor(globalThis, name),
+ ])
+);
+Object.defineProperties(globalThis, {
+ window: { configurable: true, value: testWindow, writable: true },
+ requestAnimationFrame: {
+ configurable: true,
+ writable: true,
+ value: (callback: FrameRequestCallback) =>
+ setTimeout(() => callback(performance.now()), 0),
+ },
+ cancelAnimationFrame: {
+ configurable: true,
+ writable: true,
+ value: (handle: number) => clearTimeout(handle),
+ },
+});
+
+afterAll(() => {
+ for (const [name, descriptor] of originalDescriptors) {
+ if (descriptor === undefined) {
+ Reflect.deleteProperty(globalThis, name);
+ } else {
+ Object.defineProperty(globalThis, name, descriptor);
+ }
+ }
+});
+
describe("createPubsub", () => {
let postMessageSpy: ReturnType<typeof vi.fn>;
let parentPostMessageSpy: ReturnType<typeof vi.fn>;
diff --git a/apps/builder/app/shared/resources.test.ts b/apps/builder/app/shared/resources.test.ts
index ea2ee4b015..fd2b0481a3 100644
--- a/apps/builder/app/shared/resources.test.ts
+++ b/apps/builder/app/shared/resources.test.ts
@@ -42,6 +42,7 @@ test("removes obsolete queued requests but keeps cached results", () => {
const resourceCacheListener = vi.fn();
const unlisten = $resourcesCache.listen(resourceCacheListener);
+ resourceCacheListener.mockClear();
queueResources([]);
expect($resourcesCache.get().has(key)).toBe(true);
@@ -457,9 +458,6 @@ test("loads detailed Assets diagnostics and performance only on demand", async (
],
])
);
- const resourceCacheListener = vi.fn();
- const unlisten = $resourcesCache.listen(resourceCacheListener);
-
const first = loadResourceDiagnostics(request, fetch);
const second = loadResourceDiagnostics(request, fetch);
expect(first).toBe(second);
@@ -478,8 +476,7 @@ test("loads detailed Assets diagnostics and performance only on demand", async (
phases: { diagnosticsPreparation: 50 },
},
});
- expect(resourceCacheListener).not.toHaveBeenCalled();
- unlisten();
+ expect($resourcesCache.get().has(key)).toBe(false);
});
test("caches performance metrics separately from resource values", async () => {
diff --git a/apps/builder/app/shared/rest-resources-loader.test.ts b/apps/builder/app/shared/rest-resources-loader.node.test.ts
similarity index 100%
rename from apps/builder/app/shared/rest-resources-loader.test.ts
rename to apps/builder/app/shared/rest-resources-loader.node.test.ts
diff --git a/apps/builder/app/shared/style-object-model.test.tsx b/apps/builder/app/shared/style-object-model.test.tsx
index 09b186612c..154953c686 100644
--- a/apps/builder/app/shared/style-object-model.test.tsx
+++ b/apps/builder/app/shared/style-object-model.test.tsx
@@ -1170,7 +1170,7 @@ test("work with unknown or invalid properties", () => {
instanceSelector,
property: "unknownProperty" as CssProperty,
}).usedValue
- ).toEqual({ type: "unparsed", value: "[object Object]" });
+ ).toEqual({ type: "invalid", value: "[object Object]" });
expect(
getComputedStyleDecl({
model,
diff --git a/apps/builder/app/shared/sync/project-queue.test.ts b/apps/builder/app/shared/sync/project-queue.test.ts
index 1944a846b2..6203331acb 100644
--- a/apps/builder/app/shared/sync/project-queue.test.ts
+++ b/apps/builder/app/shared/sync/project-queue.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import {
describe,
test,
@@ -446,47 +443,38 @@ describe("project-queue", () => {
expect(commands).toHaveLength(0);
});
- test("enqueues setDetails for 'edit' permit", () => {
- const enqueueSpy = vi.spyOn(commandQueue, "enqueue");
-
- enqueueProjectDetails({
- projectId: "p1",
- buildId: "b1",
- version: 1,
- authPermit: "edit",
- authToken: "tok",
- });
-
- expect(enqueueSpy).toHaveBeenCalledWith(
- expect.objectContaining({
- type: "setDetails",
+ test.each([
+ { authPermit: "edit", authToken: "tok" },
+ { authPermit: "own", authToken: undefined },
+ ] as const)(
+ "enqueues project details for '$authPermit' permit",
+ async ({ authPermit, authToken }) => {
+ enqueueProjectDetails({
projectId: "p1",
- version: 1,
buildId: "b1",
- authToken: "tok",
- })
- );
-
- enqueueSpy.mockRestore();
- });
-
- test("enqueues setDetails for 'own' permit", () => {
- const enqueueSpy = vi.spyOn(commandQueue, "enqueue");
-
- enqueueProjectDetails({
- projectId: "p1",
- buildId: "b1",
- version: 1,
- authPermit: "own",
- authToken: undefined,
- });
+ version: 1,
+ authPermit,
+ authToken,
+ });
+ commandQueue.enqueue({
+ type: "transactions",
+ projectId: "p1",
+ transactions: [makeTx(`tx-${authPermit}`)],
+ });
- expect(enqueueSpy).toHaveBeenCalledWith(
- expect.objectContaining({ type: "setDetails" })
- );
+ await vi.advanceTimersByTimeAsync(NEW_ENTRIES_INTERVAL * 3);
+ await flush();
- enqueueSpy.mockRestore();
- });
+ expect(mockBuildPatch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ projectId: "p1",
+ buildId: "b1",
+ version: 1,
+ authToken,
+ })
+ );
+ }
+ );
});
// ServerSyncStorage
diff --git a/apps/builder/dev/backend.sh b/apps/builder/dev/backend.sh
index 1d852a0467..bfa8c41f3e 100644
--- a/apps/builder/dev/backend.sh
+++ b/apps/builder/dev/backend.sh
@@ -25,7 +25,11 @@ builder_backend_migrations_fingerprint() {
-type f \( -name migration.sql -o -name migration.ts \) -print
printf '%s\n' \
apps/builder/dev/backend.sh \
- apps/builder/docker-compose.yaml
+ apps/builder/docker-compose.yaml \
+ apps/builder/docker-compose.e2e.yaml \
+ apps/builder/docker-compose.e2e-shard.yaml \
+ apps/builder/e2e/postgres.Dockerfile \
+ apps/builder/e2e/postgres-init.sql
} | LC_ALL=C sort | while IFS= read -r path; do
if [ -f "$path" ]; then
printf '%s ' "$path"
@@ -155,9 +159,8 @@ builder_backend_bootstrap_if_empty() {
builder_backend_write_schema_snapshot() {
mkdir -p "$(dirname "$SCHEMA_SNAPSHOT")"
local temporary_snapshot="${SCHEMA_SNAPSHOT}.tmp.$$"
- # Supabase initializes auth, storage, extensions, and other service schemas.
# Dump only the application-owned public schema so the snapshot can be
- # restored into a fresh Supabase database without replacing its internals.
+ # restored without replacing database-owned schemas.
if builder_compose exec -T db \
sh -c 'PGPASSWORD="$POSTGRES_PASSWORD" pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" --schema=public --schema-only --clean --if-exists --no-owner --no-privileges' \
>"$temporary_snapshot"; then
diff --git a/apps/builder/docker-compose.e2e-shard.yaml b/apps/builder/docker-compose.e2e-shard.yaml
new file mode 100644
index 0000000000..dcf1459c8a
--- /dev/null
+++ b/apps/builder/docker-compose.e2e-shard.yaml
@@ -0,0 +1,11 @@
+services:
+ db:
+ # Shards restore the schema generated by the migration job and only need
+ # PostgreSQL plus the extension referenced by that snapshot.
+ image: postgres:15.19-alpine
+ environment:
+ POSTGRES_USER: ${POSTGRES_USER:?}
+ tmpfs:
+ - /var/lib/postgresql/data
+ volumes:
+ - ./e2e/postgres-init.sql:/docker-entrypoint-initdb.d/postgres-init.sql:ro
diff --git a/apps/builder/docker-compose.e2e-supabase.yaml b/apps/builder/docker-compose.e2e-supabase.yaml
new file mode 100644
index 0000000000..28b7f1b82a
--- /dev/null
+++ b/apps/builder/docker-compose.e2e-supabase.yaml
@@ -0,0 +1,6 @@
+services:
+ db:
+ # Keep the compatibility check disposable while retaining the exact
+ # Supabase image and initialization from docker-compose.yaml.
+ tmpfs:
+ - /var/lib/postgresql/data
diff --git a/apps/builder/docker-compose.e2e.yaml b/apps/builder/docker-compose.e2e.yaml
index 5583cbe14f..3e2a54cb1a 100644
--- a/apps/builder/docker-compose.e2e.yaml
+++ b/apps/builder/docker-compose.e2e.yaml
@@ -1,4 +1,12 @@
services:
db:
+ build:
+ context: .
+ dockerfile: e2e/postgres.Dockerfile
+ image: webstudio-builder-e2e-postgres
+ environment:
+ POSTGRES_USER: ${POSTGRES_USER:?}
tmpfs:
- /var/lib/postgresql/data
+ volumes:
+ - ./e2e/postgres-init.sql:/docker-entrypoint-initdb.d/postgres-init.sql:ro
diff --git a/apps/builder/e2e/README.md b/apps/builder/e2e/README.md
index 91217dae0b..e930067bcb 100644
--- a/apps/builder/e2e/README.md
+++ b/apps/builder/e2e/README.md
@@ -20,15 +20,26 @@ explicitly with:
pnpm e2e:builder:refresh-schema-cache
```
+The regular E2E suite uses lightweight PostgreSQL containers. Verify that the
+complete migration chain also applies to the pinned Supabase PostgreSQL image
+with:
+
+```sh
+pnpm e2e:builder:check-supabase-migrations
+```
+
Pass normal Playwright Test arguments after `--`. For example:
```sh
pnpm e2e:builder -- --grep "Builder can copy, duplicate, and delete a page"
-pnpm e2e:builder -- apps/builder/e2e/tests/pages-actions.e2e.ts
+pnpm e2e:builder -- 'apps/builder/e2e/tests/pages-actions.[shard-5].e2e.ts'
pnpm e2e:builder -- --debug --grep "Builder can copy"
```
-A filter that matches no tests fails before the test environment runs.
+A lightweight Playwright discovery pass validates the selection before Docker,
+database migrations, browser installation, or the Builder build starts. A
+filter that matches no tests therefore fails without starting the test
+environment.
## Fast local reruns
@@ -65,30 +76,38 @@ each invocation.
## Test organization
- Put workflows in `e2e/tests/*.e2e.ts` and import `test` from `e2e/test.ts`.
-- Use Playwright's built-in `browser`, `page`, and hook APIs.
-- Use the built-in `context` fixture for test-local authenticated state.
-- Use `withBrowserContext(browser, callback)` for setup that must run in
- `beforeAll`. If cookies must survive from `beforeAll` into the tests, create
- an explicit context with `newBrowserContext(browser)` and close it in
+- Use Playwright's `page` fixture for the workflow under test. Playwright gives
+ each test an isolated context and closes it automatically.
+- Use Playwright's `context` fixture when setup should share authentication with
+ the workflow page.
+- Use `withBrowserContext(browser, callback)` for isolated setup or setup that
+ runs in `beforeAll`. If cookies must survive from `beforeAll` into the tests,
+ create an explicit context with `newBrowserContext(browser)` and close it in
`afterAll`.
- Use `newIsolatedPage(browser)` for identities that must not share cookies.
- Keep tests in a file independent even though Playwright runs them in
declaration order by default.
-CI uses Playwright's standard six-way file sharding:
+CI discovers isolated Playwright shards from filename tags. Each shard uses two
+workers, and files are assigned by measured CI duration to keep jobs near three
+to four minutes:
-```sh
-pnpm e2e:builder -- --shard=1/6
+```txt
+pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts
```
-Test filenames do not encode shard ownership. Playwright balances files across
-the configured shards.
+Every E2E filename must contain at least one unique shard tag. CI derives its
+matrix from those tags, so adding or removing a shard does not require editing
+the workflow. Files with multiple tags are partitioned across those shards. All
+files selected by a shard must use the same set of tags. Each shard uses four
+workers. Rebalance by changing filename tags when measured job durations drift.
+Suites may opt into parallel mode only when every worker creates uniquely named
+setup data and the tests do not depend on each other's mutations.
## Failures
-CI retries a failed shard once against a clean disposable database. Failed
-shard jobs upload the Playwright HTML report, traces, screenshots, and videos,
-along with the backend service logs.
+Failed shard jobs upload the Playwright HTML report, traces, screenshots,
+videos, and backend service logs.
When you need a completely clean backend locally:
diff --git a/apps/builder/e2e/flows/dashboard.node.test.ts b/apps/builder/e2e/flows/dashboard.node.test.ts
new file mode 100644
index 0000000000..d0a0ac8223
--- /dev/null
+++ b/apps/builder/e2e/flows/dashboard.node.test.ts
@@ -0,0 +1,11 @@
+import { expect, test } from "vitest";
+import { getWorkerEmail } from "./dashboard";
+
+test("isolates login identities between parallel Playwright workers", () => {
+ expect(getWorkerEmail("[email protected]", "0")).toBe(
+ );
+ expect(getWorkerEmail("[email protected]", "1")).toBe(
+ );
+});
diff --git a/apps/builder/e2e/flows/dashboard.ts b/apps/builder/e2e/flows/dashboard.ts
index 4ece5b6ac4..ce4395723f 100644
--- a/apps/builder/e2e/flows/dashboard.ts
+++ b/apps/builder/e2e/flows/dashboard.ts
@@ -4,6 +4,17 @@ import env from "../../app/env/env.server";
const loginReadyTimeout = 30_000;
+export const getWorkerEmail = (
+ email: string,
+ parallelIndex = process.env.TEST_PARALLEL_INDEX
+) => {
+ if (parallelIndex === undefined) {
+ return email;
+ }
+ const separatorIndex = email.lastIndexOf("@");
+ return `${email.slice(0, separatorIndex)}+worker-${parallelIndex}${email.slice(separatorIndex)}`;
+};
+
export const loginWithSecret = async ({
page,
email,
@@ -53,7 +64,7 @@ export const loginWithSecret = async ({
throw new Error("AUTH_SECRET must be set for e2e dev login");
}
await page.getByPlaceholder("Auth secret").fill(env.AUTH_SECRET);
- await page.getByPlaceholder("Email (optional)").fill(email);
+ await page.getByPlaceholder("Email (optional)").fill(getWorkerEmail(email));
if (devPlan !== undefined) {
await page.locator('select[name="devPlan"]').selectOption(devPlan);
}
diff --git a/apps/builder/e2e/postgres-init.sql b/apps/builder/e2e/postgres-init.sql
new file mode 100644
index 0000000000..90153accd5
--- /dev/null
+++ b/apps/builder/e2e/postgres-init.sql
@@ -0,0 +1,3 @@
+CREATE SCHEMA IF NOT EXISTS extensions;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA extensions;
+ALTER ROLE supabase_admin SET search_path TO public, extensions;
diff --git a/apps/builder/e2e/postgres.Dockerfile b/apps/builder/e2e/postgres.Dockerfile
new file mode 100644
index 0000000000..76b21f01fc
--- /dev/null
+++ b/apps/builder/e2e/postgres.Dockerfile
@@ -0,0 +1,5 @@
+FROM postgres:15.19-bookworm
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes postgresql-15-pgtap \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/apps/builder/e2e/print-shards.ts b/apps/builder/e2e/print-shards.ts
new file mode 100644
index 0000000000..069c499d54
--- /dev/null
+++ b/apps/builder/e2e/print-shards.ts
@@ -0,0 +1,6 @@
+import { readdir } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import { getE2eShardMatrix } from "./test-shards";
+
+const testDirectory = fileURLToPath(new URL("./tests", import.meta.url));
+console.info(JSON.stringify(getE2eShardMatrix(await readdir(testDirectory))));
diff --git a/apps/builder/e2e/run-local.sh b/apps/builder/e2e/run-local.sh
index 7e402e8bc8..8480c9e43b 100644
--- a/apps/builder/e2e/run-local.sh
+++ b/apps/builder/e2e/run-local.sh
@@ -2,7 +2,7 @@
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
-COMPOSE_OVERRIDE_FILE="$ROOT_DIR/apps/builder/docker-compose.e2e.yaml"
+COMPOSE_OVERRIDE_FILE="${E2E_COMPOSE_OVERRIDE_FILE:-$ROOT_DIR/apps/builder/docker-compose.e2e.yaml}"
PLAYWRIGHT_ARGS=("$@")
if [ "${PLAYWRIGHT_ARGS[0]:-}" = "--" ]; then
PLAYWRIGHT_ARGS=("${PLAYWRIGHT_ARGS[@]:1}")
@@ -29,6 +29,7 @@ source "$ROOT_DIR/apps/builder/e2e/run-step.sh"
builder_backend_init
export E2E_DB_BOOTSTRAP="${E2E_DB_BOOTSTRAP:-auto}"
+export E2E_BUILD_DATABASE_IMAGE="${E2E_BUILD_DATABASE_IMAGE:-true}"
export E2E_GENERATE_PRISMA="${E2E_GENERATE_PRISMA:-auto}"
export E2E_DOCKER_PULL_TIMEOUT_SECONDS="${E2E_DOCKER_PULL_TIMEOUT_SECONDS:-300}"
export E2E_DOCKER_TIMEOUT_SECONDS="${E2E_DOCKER_TIMEOUT_SECONDS:-60}"
@@ -39,6 +40,7 @@ export E2E_RUN_TESTS="${E2E_RUN_TESTS:-true}"
export E2E_START_POSTGREST="${E2E_START_POSTGREST:-$E2E_RUN_TESTS}"
export E2E_BUILDER_BUILD_TIMEOUT_SECONDS="${E2E_BUILDER_BUILD_TIMEOUT_SECONDS:-600}"
export E2E_TEST_COMMAND_TIMEOUT_SECONDS="${E2E_TEST_COMMAND_TIMEOUT_SECONDS:-900}"
+export E2E_TEST_SELECTION_TIMEOUT_SECONDS="${E2E_TEST_SELECTION_TIMEOUT_SECONDS:-60}"
export E2E_WRITE_SCHEMA_SNAPSHOT="${E2E_WRITE_SCHEMA_SNAPSHOT:-false}"
cleanup() {
@@ -118,8 +120,30 @@ run_builder_e2e_tests() {
)
}
-run_step "pull e2e database image" "$E2E_DOCKER_PULL_TIMEOUT_SECONDS" \
+validate_builder_e2e_selection() {
+ (
+ cd "$ROOT_DIR/apps/builder"
+ E2E_BUILDER_URL="${E2E_BUILDER_URL:-https://127.0.0.1:3000}" \
+ pnpm e2e:ci --list "${PLAYWRIGHT_ARGS[@]}"
+ )
+}
+
+prepare_e2e_database_image() {
+ if [ "$E2E_BUILD_DATABASE_IMAGE" = "true" ]; then
+ builder_compose build --pull db
+ return
+ fi
+
builder_backend_pull_db
+}
+
+if [ "$E2E_RUN_TESTS" = "true" ]; then
+ run_step "validate builder e2e test selection" \
+ "$E2E_TEST_SELECTION_TIMEOUT_SECONDS" validate_builder_e2e_selection
+fi
+
+run_step "prepare e2e database image" "$E2E_DOCKER_PULL_TIMEOUT_SECONDS" \
+ prepare_e2e_database_image
run_step "start e2e database" "$E2E_DOCKER_TIMEOUT_SECONDS" \
builder_backend_start_db
diff --git a/apps/builder/e2e/test-shards.server.test.ts b/apps/builder/e2e/test-shards.server.test.ts
new file mode 100644
index 0000000000..5662e72204
--- /dev/null
+++ b/apps/builder/e2e/test-shards.server.test.ts
@@ -0,0 +1,49 @@
+import { expect, test } from "vitest";
+import {
+ getE2eFileShards,
+ getE2eShardMatrix,
+ getE2eTestMatch,
+} from "./test-shards";
+
+test("discovers the shard matrix from e2e filenames", () => {
+ expect(
+ getE2eShardMatrix([
+ "second.[shard-2].[shard-5].e2e.ts",
+ "first.[shard-1].e2e.ts",
+ "another.[shard-2].[shard-5].e2e.ts",
+ "helper.ts",
+ ])
+ ).toEqual([
+ { shard: "shard-1", partition: "" },
+ { shard: "shard-2", partition: "1/2" },
+ { shard: "shard-5", partition: "2/2" },
+ ]);
+});
+
+test("requires shard tags and consistent multi-shard groups", () => {
+ expect(() => getE2eFileShards("unassigned.e2e.ts")).toThrow(
+ "Every e2e file must have a shard tag"
+ );
+ expect(() =>
+ getE2eFileShards("duplicated.[shard-2].[shard-2].e2e.ts")
+ ).toThrow("Every shard tag in an e2e filename must be unique");
+ expect(() =>
+ getE2eShardMatrix([
+ "first.[shard-2].[shard-5].e2e.ts",
+ "second.[shard-2].[shard-6].e2e.ts",
+ ])
+ ).toThrow("Every file selected by shard-2 must use the same shard tags");
+});
+
+test("matches all e2e files locally and only the selected shard in CI", () => {
+ const allTests = getE2eTestMatch(undefined);
+ expect(allTests.test("tests/pages.[shard-1].e2e.ts")).toBe(true);
+
+ const shardTests = getE2eTestMatch("shard-2");
+ expect(shardTests.test("tests/pages.[shard-2].e2e.ts")).toBe(true);
+ expect(
+ shardTests.test("tests/pages.[shard-2].[shard-5].[shard-6].e2e.ts")
+ ).toBe(true);
+ expect(shardTests.test("tests/pages.[shard-1].e2e.ts")).toBe(false);
+ expect(() => getE2eTestMatch("../../other")).toThrow("Invalid e2e shard");
+});
diff --git a/apps/builder/e2e/test-shards.ts b/apps/builder/e2e/test-shards.ts
new file mode 100644
index 0000000000..bac9f0173b
--- /dev/null
+++ b/apps/builder/e2e/test-shards.ts
@@ -0,0 +1,62 @@
+const e2eFileSuffix = ".e2e.ts";
+const shardTagPattern = /\[(shard-\d+)\]/g;
+const shardNamePattern = /^shard-\d+$/;
+
+export const getE2eFileShards = (fileName: string) => {
+ const shards = [...fileName.matchAll(shardTagPattern)].map(
+ (match) => match[1]
+ );
+ if (shards.length === 0) {
+ throw new Error(`Every e2e file must have a shard tag: ${fileName}`);
+ }
+ if (new Set(shards).size !== shards.length) {
+ throw new Error(
+ `Every shard tag in an e2e filename must be unique: ${fileName}`
+ );
+ }
+ return shards;
+};
+
+export const getE2eShardMatrix = (fileNames: readonly string[]) => {
+ const shardGroups = new Map<string, Set<string>>();
+ for (const fileName of fileNames) {
+ if (fileName.endsWith(e2eFileSuffix) === false) {
+ continue;
+ }
+ const shards = getE2eFileShards(fileName);
+ const group = shards.join(",");
+ for (const shard of shards) {
+ const groups = shardGroups.get(shard) ?? new Set<string>();
+ groups.add(group);
+ shardGroups.set(shard, groups);
+ }
+ }
+
+ return [...shardGroups]
+ .sort(([left], [right]) =>
+ left.localeCompare(right, undefined, { numeric: true })
+ )
+ .map(([shard, groups]) => {
+ if (groups.size !== 1) {
+ throw new Error(
+ `Every file selected by ${shard} must use the same shard tags`
+ );
+ }
+ const shards = [...groups][0].split(",");
+ const partition =
+ shards.length === 1
+ ? ""
+ : `${shards.indexOf(shard) + 1}/${shards.length}`;
+ return { shard, partition };
+ });
+};
+
+export const getE2eTestMatch = (shard: string | undefined) => {
+ if (shard === undefined || shard === "") {
+ return /tests\/.*\.e2e\.ts/;
+ }
+ if (shardNamePattern.test(shard) === false) {
+ throw new Error(`Invalid e2e shard: ${shard}`);
+ }
+ return new RegExp(`tests/.*\\[${shard}\\].*\\.e2e\\.ts$`);
+};
diff --git a/apps/builder/e2e/test.ts b/apps/builder/e2e/test.ts
index a5a26ae5a7..ea442453b8 100644
--- a/apps/builder/e2e/test.ts
+++ b/apps/builder/e2e/test.ts
@@ -17,7 +17,7 @@ export const dashboardUrl = `${builderUrlObject.protocol}//wstd.dev:${builderUrl
export const postgrestUrl = env.POSTGREST_URL;
-const browserContextOptions: BrowserContextOptions = {
+export const browserContextOptions: BrowserContextOptions = {
ignoreHTTPSErrors: true,
permissions: ["clipboard-read", "clipboard-write"],
};
@@ -37,8 +37,6 @@ export const getBrowserLaunchOptions = (url = builderUrl) => {
};
};
-export const test = base;
-
export const newBrowserContext = (browser: Browser) =>
browser.newContext(browserContextOptions);
@@ -56,11 +54,13 @@ export const withBrowserContext = async <Result>(
}
};
+export const test = base;
+
export const newIsolatedPage = async (browser: Browser) => {
const context = await newBrowserContext(browser);
return {
page: await context.newPage(),
- close: async () => await context.close(),
+ close: () => context.close(),
};
};
@@ -92,12 +92,3 @@ export const getProjectBuilderUrl = ({
export const getProjectIdFromBuilderUrl = (url: string) => {
return parseBuilderUrl(url).projectId;
};
-
-export const assert = (
- condition: unknown,
- message: string
-): asserts condition => {
- if (condition === false || condition === undefined || condition === null) {
- throw new Error(message);
- }
-};
diff --git a/apps/builder/e2e/tests/animation-runtime.e2e.ts b/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
similarity index 76%
rename from apps/builder/e2e/tests/animation-runtime.e2e.ts
rename to apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
index 2792ebd94a..a32a1e9834 100644
--- a/apps/builder/e2e/tests/animation-runtime.e2e.ts
+++ b/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts
@@ -9,7 +9,7 @@ import {
waitForSyncStatus,
} from "../flows/sync-status";
import { createContentModeProject } from "../fixtures/content-mode-suite";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
const openCommandPanel = async ({ page }: { page: Page }) => {
@@ -144,7 +144,7 @@ const waitForPersistedAnimation = async ({
};
test("Builder animation UI creates supported animation props that persist and build", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -156,55 +156,50 @@ test("Builder animation UI creates supported animation props that persist and bu
editorToken: "animation-runtime-editor-token",
builderToken: "animation-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const text = "Initial content";
const wrapperName = "Animation Group";
const presetName = "Fade in";
- try {
- await measure("animation runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
+ await measure("animation runtime open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCanvasText({ page, text });
- await selectCanvasTextInstance({ page, text });
+ });
+ await waitForCanvasText({ page, text });
+ await selectCanvasTextInstance({ page, text });
- await measure("animation runtime wrap selected text", async () => {
- await wrapSelectedInstance({ page, option: wrapperName });
- });
- await selectNavigatorItem({ page, itemName: wrapperName });
+ await measure("animation runtime wrap selected text", async () => {
+ await wrapSelectedInstance({ page, option: wrapperName });
+ });
+ await selectNavigatorItem({ page, itemName: wrapperName });
- await measure("animation runtime add preset", async () => {
- await addAnimationPreset({ page, presetName });
- });
- await waitForPersistedAnimation({
- projectId: fixture.projectId,
- presetName,
- });
+ await measure("animation runtime add preset", async () => {
+ await addAnimationPreset({ page, presetName });
+ });
+ await waitForPersistedAnimation({
+ projectId: fixture.projectId,
+ presetName,
+ });
- await measure("animation runtime reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text });
- await expectPersistedAnimation({
+ await measure("animation runtime reload builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- presetName,
+ authToken: fixture.builderToken,
});
+ });
+ await waitForCanvasText({ page, text });
+ await expectPersistedAnimation({
+ projectId: fixture.projectId,
+ presetName,
+ });
- await measure("animation runtime generated app build", async () => {
- await expectGeneratedAppBuild({
- projectId: fixture.projectId,
- expectedText: text,
- });
+ await measure("animation runtime generated app build", async () => {
+ await expectGeneratedAppBuild({
+ projectId: fixture.projectId,
+ expectedText: text,
});
- } finally {
- await close();
- }
+ });
});
diff --git a/apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.ts b/apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.ts
new file mode 100644
index 0000000000..c263b6fe51
--- /dev/null
+++ b/apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.ts
@@ -0,0 +1,46 @@
+import assert from "node:assert/strict";
+import {
+ createDragProject,
+ dragIds,
+ loadDragProjectData,
+} from "../fixtures/drag-project";
+import { openAssetsPanel, uploadAsset } from "../flows/assets-panel";
+import { getCanvasInstance, openProjectBuilder } from "../flows/builder";
+import { dragToCanvas, ensureInteractiveCanvas } from "../flows/drag";
+import { test } from "../test";
+
+test("Dragging an image asset onto canvas inserts a bound Image", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createDragProject(context, "asset-canvas");
+ const canvas = await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ const container = getCanvasInstance({
+ canvas,
+ instanceSelector: [dragIds.container, dragIds.wrapper, dragIds.body],
+ });
+ await ensureInteractiveCanvas(page, canvas, container);
+ await openAssetsPanel({ page });
+ const assetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+
+ await dragToCanvas(page, canvas, page.getByTitle(assetTitle), container);
+ await page
+ .getByRole("tabpanel", { name: "Assets" })
+ .waitFor({ state: "hidden" });
+
+ const { instances, props } = await loadDragProjectData(fixture.projectId);
+ const image = instances.find(({ component }) => component === "Image");
+ assert(image, "Expected an Image on the canvas");
+ const source = props.find(
+ (prop) => prop.instanceId === image.id && prop.name === "src"
+ );
+ assert(source?.type === "asset", "Expected an asset-bound image source");
+ assert(source.value.length > 0, "Expected the uploaded asset id");
+});
diff --git a/apps/builder/e2e/tests/asset-canvas-drag.e2e.ts b/apps/builder/e2e/tests/asset-canvas-drag.e2e.ts
deleted file mode 100644
index 77dc512f90..0000000000
--- a/apps/builder/e2e/tests/asset-canvas-drag.e2e.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import assert from "node:assert/strict";
-import {
- createDragProject,
- dragIds,
- loadDragProjectData,
-} from "../fixtures/drag-project";
-import { openAssetsPanel, uploadAsset } from "../flows/assets-panel";
-import { getCanvasInstance, openProjectBuilder } from "../flows/builder";
-import { dragToCanvas, ensureInteractiveCanvas } from "../flows/drag";
-import { newIsolatedPage, test } from "../test";
-
-test("Dragging an image asset onto canvas inserts a bound Image", async ({
- browser,
- context,
-}) => {
- const fixture = await createDragProject(context, "asset-canvas");
- const { page, close } = await newIsolatedPage(browser);
- try {
- const canvas = await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- const container = getCanvasInstance({
- canvas,
- instanceSelector: [dragIds.container, dragIds.wrapper, dragIds.body],
- });
- await ensureInteractiveCanvas(page, canvas, container);
- await openAssetsPanel({ page });
- const assetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
-
- await dragToCanvas(page, canvas, page.getByTitle(assetTitle), container);
- await page
- .getByRole("tabpanel", { name: "Assets" })
- .waitFor({ state: "hidden" });
-
- const { instances, props } = await loadDragProjectData(fixture.projectId);
- const image = instances.find(({ component }) => component === "Image");
- assert(image, "Expected an Image on the canvas");
- const source = props.find(
- (prop) => prop.instanceId === image.id && prop.name === "src"
- );
- assert(source?.type === "asset", "Expected an asset-bound image source");
- assert(source.value.length > 0, "Expected the uploaded asset id");
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.ts b/apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.ts
new file mode 100644
index 0000000000..312a3c211e
--- /dev/null
+++ b/apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.ts
@@ -0,0 +1,391 @@
+import {
+ createAssetFolder,
+ openAssetsPanel,
+ uploadAsset,
+} from "../flows/assets-panel";
+import { openProjectBuilder } from "../flows/builder";
+import { dragPointer } from "../flows/drag";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import { test } from "../test";
+
+test("Assets can be selected by dragging across the panel", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Lasso Select E2E",
+ builderToken: "asset-folder-lasso-select-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const firstAssetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ const secondAssetTitle = await uploadAsset({
+ page,
+ filename: "replacement-image.svg",
+ });
+ const firstAsset = page.getByTitle(firstAssetTitle);
+ const secondAsset = page.getByTitle(secondAssetTitle);
+ const firstBounds = await firstAsset.boundingBox();
+ const secondBounds = await secondAsset.boundingBox();
+ const viewport = firstAsset.locator(
+ "xpath=ancestor::*[@data-asset-manager-scroll-area]"
+ );
+ const viewportBounds = await viewport.boundingBox();
+ if (
+ firstBounds === null ||
+ secondBounds === null ||
+ viewportBounds === null
+ ) {
+ throw new Error("Expected visible assets and asset-list viewport");
+ }
+
+ const start = {
+ x: viewportBounds.x + viewportBounds.width - 2,
+ y: viewportBounds.y + viewportBounds.height - 2,
+ };
+ const end = {
+ x: Math.min(firstBounds.x, secondBounds.x) - 2,
+ y: Math.min(firstBounds.y, secondBounds.y) - 2,
+ };
+ await page.mouse.move(start.x, start.y);
+ await page.mouse.down();
+ try {
+ await page.mouse.move(end.x, end.y, { steps: 10 });
+ await page.locator("[data-asset-manager-marquee]").waitFor();
+ } finally {
+ await page.mouse.up();
+ }
+
+ for (const asset of [firstAsset, secondAsset]) {
+ const option = asset.locator("xpath=ancestor::*[@role='option']");
+ if ((await option.getAttribute("aria-selected")) !== "true") {
+ throw new Error(
+ "Expected dragging across the panel to select both assets"
+ );
+ }
+ }
+});
+
+test("Multiselected folders can be dragged into a folder", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Multifolder Drag E2E",
+ builderToken: "asset-folder-multifolder-drag-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const destination = await createAssetFolder({
+ page,
+ name: "Destination",
+ });
+ const alpha = await createAssetFolder({ page, name: "Alpha" });
+ const bravo = await createAssetFolder({ page, name: "Bravo" });
+
+ await alpha.click();
+ await bravo.click({
+ modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
+ });
+ if (
+ (await page.locator('[role="option"][aria-selected="true"]').count()) !== 2
+ ) {
+ throw new Error("Expected both folders to be selected before dragging");
+ }
+
+ await Promise.all([
+ waitForChangeToBeSaved({ page, timeout: 30_000 }),
+ dragPointer({
+ page,
+ source: bravo,
+ target: destination,
+ ready: async () =>
+ (await destination.getAttribute("data-is-drop-over")) === "true",
+ }),
+ ]);
+ await alpha.waitFor({ state: "hidden" });
+ await bravo.waitFor({ state: "hidden" });
+ await destination.dblclick();
+ await page
+ .getByRole("button", { name: "Folder Alpha", exact: true })
+ .waitFor();
+ await page
+ .getByRole("button", { name: "Folder Bravo", exact: true })
+ .waitFor();
+});
+
+test("Dragging an asset auto-scrolls a long folder list", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Autoscroll E2E",
+ builderToken: "asset-folder-autoscroll-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const assetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ const scrollArea = page.locator("[data-asset-manager-scroll-area]");
+ for (let index = 0; index < 24; index += 1) {
+ await createAssetFolder({
+ page,
+ name: `Filler ${String(index).padStart(2, "0")}`,
+ });
+ const overflows = await scrollArea.evaluate(
+ (element) => element.scrollHeight > element.clientHeight + 80
+ );
+ if (overflows) {
+ break;
+ }
+ }
+ const destination = await createAssetFolder({
+ page,
+ name: "Destination",
+ });
+ const asset = page.getByTitle(assetTitle);
+ await asset.scrollIntoViewIfNeeded();
+ if ((await scrollArea.evaluate((element) => element.scrollTop)) === 0) {
+ throw new Error("Expected the long asset list to be scrolled");
+ }
+
+ const assetBounds = await asset.boundingBox();
+ const scrollBounds = await scrollArea.boundingBox();
+ if (assetBounds === null || scrollBounds === null) {
+ throw new Error("Expected visible asset and native scroll area");
+ }
+ const from = {
+ x: assetBounds.x + assetBounds.width / 2,
+ y: assetBounds.y + assetBounds.height / 2,
+ };
+ await page.mouse.move(from.x, from.y);
+ await page.mouse.down();
+ try {
+ await page.mouse.move(from.x + 8, from.y + 8, { steps: 4 });
+ const deadline = Date.now() + 10_000;
+ let destinationBounds = await destination.boundingBox();
+ while (
+ Date.now() < deadline &&
+ (destinationBounds === null ||
+ destinationBounds.y < scrollBounds.y ||
+ destinationBounds.y + destinationBounds.height >
+ scrollBounds.y + scrollBounds.height)
+ ) {
+ await page.mouse.move(
+ scrollBounds.x + scrollBounds.width / 2,
+ scrollBounds.y + 4,
+ { steps: 2 }
+ );
+ await page.waitForTimeout(120);
+ destinationBounds = await destination.boundingBox();
+ }
+ if (
+ destinationBounds === null ||
+ destinationBounds.y < scrollBounds.y ||
+ destinationBounds.y + destinationBounds.height >
+ scrollBounds.y + scrollBounds.height
+ ) {
+ throw new Error("Expected auto-scroll to reveal the destination folder");
+ }
+ await page.mouse.move(
+ destinationBounds.x + destinationBounds.width / 2,
+ destinationBounds.y + destinationBounds.height / 2,
+ { steps: 4 }
+ );
+ const dropDeadline = Date.now() + 5_000;
+ while (
+ Date.now() < dropDeadline &&
+ (await destination.getAttribute("data-is-drop-over")) !== "true"
+ ) {
+ await page.mouse.move(
+ destinationBounds.x + destinationBounds.width / 2 + 1,
+ destinationBounds.y + destinationBounds.height / 2,
+ { steps: 2 }
+ );
+ await page.waitForTimeout(100);
+ }
+ if ((await destination.getAttribute("data-is-drop-over")) !== "true") {
+ throw new Error("Expected the destination folder to accept the drop");
+ }
+ const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
+ await page.mouse.up();
+ await save;
+ } catch (error) {
+ await page.mouse.up();
+ throw error;
+ }
+
+ await asset.waitFor({ state: "hidden" });
+ await destination.dblclick();
+ await page.getByTitle(assetTitle).waitFor();
+});
+
+test("Multiselected assets can be moved from the context menu", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Menu Move E2E",
+ builderToken: "asset-folder-menu-move-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const destination = await createAssetFolder({
+ page,
+ name: "Destination",
+ });
+ const firstAssetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ const secondAssetTitle = await uploadAsset({
+ page,
+ filename: "replacement-image.svg",
+ });
+ const firstAsset = page.getByTitle(firstAssetTitle);
+ const secondAsset = page.getByTitle(secondAssetTitle);
+
+ await firstAsset.click();
+ await secondAsset.click({
+ modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
+ });
+ await secondAsset.click({ button: "right" });
+ await page.getByRole("menuitem", { name: "Move", exact: true }).click();
+ const dialog = page.getByRole("dialog", { name: "Move items" });
+ await dialog.getByRole("combobox", { name: "Folder" }).click();
+ await page.getByRole("option", { name: "Destination", exact: true }).click();
+ await Promise.all([
+ waitForChangeToBeSaved({ page, timeout: 30_000 }),
+ dialog.getByRole("button", { name: "Move", exact: true }).click(),
+ ]);
+
+ await firstAsset.waitFor({ state: "hidden" });
+ await secondAsset.waitFor({ state: "hidden" });
+ await destination.dblclick();
+ await page.getByTitle(firstAssetTitle).waitFor();
+ await page.getByTitle(secondAssetTitle).waitFor();
+});
+
+test("Folders can be multiselected and deleted as one operation", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Multiselect E2E",
+ builderToken: "asset-folder-multiselect-e2e-builder-token",
+ });
+ const folderNames = ["Alpha", "Bravo", "Charlie"];
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const folders = [];
+ for (const name of folderNames) {
+ folders.push(await createAssetFolder({ page, name }));
+ }
+
+ await folders[1]!.click({ button: "right" });
+ await page.getByRole("menuitem", { name: "Settings" }).waitFor();
+ await page.keyboard.press("Escape");
+
+ await folders[0]!.click();
+ await folders[2]!.click({ modifiers: ["Shift"] });
+ const options = page.getByRole("option");
+ for (const folder of folders) {
+ const option = options.filter({ has: folder });
+ if ((await option.getAttribute("aria-selected")) !== "true") {
+ throw new Error("Expected Shift + Click to select the folder range");
+ }
+ }
+
+ await page.keyboard.press("Escape");
+ await folders[0]!.click();
+ await folders[2]!.click({
+ modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
+ });
+ const selectedOptions = page.locator('[role="option"][aria-selected="true"]');
+ if ((await selectedOptions.count()) !== 2) {
+ throw new Error("Expected Cmd/Ctrl + Click to select two folders");
+ }
+
+ await folders[0]!.click({ button: "right" });
+ await page.getByRole("menuitem", { name: "Delete" }).click();
+ const deleteDialog = page
+ .getByRole("dialog")
+ .filter({ hasText: "Delete selected items" });
+ await deleteDialog.waitFor();
+ await Promise.all([
+ waitForChangeToBeSaved({ page }),
+ deleteDialog.getByRole("button", { name: "Delete" }).click(),
+ ]);
+
+ await folders[0]!.waitFor({ state: "hidden" });
+ await folders[2]!.waitFor({ state: "hidden" });
+ await folders[1]!.waitFor({ state: "visible" });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await page
+ .getByRole("button", { name: "Folder Bravo", exact: true })
+ .waitFor();
+ for (const deletedName of ["Alpha", "Charlie"]) {
+ if (
+ await page
+ .getByRole("button", { name: `Folder ${deletedName}`, exact: true })
+ .isVisible()
+ ) {
+ throw new Error(`Expected ${deletedName} to stay deleted after reload`);
+ }
+ }
+});
diff --git a/apps/builder/e2e/tests/asset-folders-selection-actions.e2e.ts b/apps/builder/e2e/tests/asset-folders-selection-actions.e2e.ts
deleted file mode 100644
index 52b64f07a4..0000000000
--- a/apps/builder/e2e/tests/asset-folders-selection-actions.e2e.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import {
- createAssetFolder,
- openAssetsPanel,
- uploadAsset,
-} from "../flows/assets-panel";
-import { openProjectBuilder } from "../flows/builder";
-import { dragPointer } from "../flows/drag";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import { newIsolatedPage, test } from "../test";
-
-test("Assets can be selected by dragging across the panel", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Lasso Select E2E",
- builderToken: "asset-folder-lasso-select-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const firstAssetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- const secondAssetTitle = await uploadAsset({
- page,
- filename: "replacement-image.svg",
- });
- const firstAsset = page.getByTitle(firstAssetTitle);
- const secondAsset = page.getByTitle(secondAssetTitle);
- const firstBounds = await firstAsset.boundingBox();
- const secondBounds = await secondAsset.boundingBox();
- const viewport = firstAsset.locator(
- "xpath=ancestor::*[@data-asset-manager-scroll-area]"
- );
- const viewportBounds = await viewport.boundingBox();
- if (
- firstBounds === null ||
- secondBounds === null ||
- viewportBounds === null
- ) {
- throw new Error("Expected visible assets and asset-list viewport");
- }
-
- const start = {
- x: viewportBounds.x + viewportBounds.width - 2,
- y: viewportBounds.y + viewportBounds.height - 2,
- };
- const end = {
- x: Math.min(firstBounds.x, secondBounds.x) - 2,
- y: Math.min(firstBounds.y, secondBounds.y) - 2,
- };
- await page.mouse.move(start.x, start.y);
- await page.mouse.down();
- try {
- await page.mouse.move(end.x, end.y, { steps: 10 });
- await page.locator("[data-asset-manager-marquee]").waitFor();
- } finally {
- await page.mouse.up();
- }
-
- for (const asset of [firstAsset, secondAsset]) {
- const option = asset.locator("xpath=ancestor::*[@role='option']");
- if ((await option.getAttribute("aria-selected")) !== "true") {
- throw new Error(
- "Expected dragging across the panel to select both assets"
- );
- }
- }
- } finally {
- await close();
- }
-});
-
-test("Multiselected folders can be dragged into a folder", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Multifolder Drag E2E",
- builderToken: "asset-folder-multifolder-drag-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const destination = await createAssetFolder({
- page,
- name: "Destination",
- });
- const alpha = await createAssetFolder({ page, name: "Alpha" });
- const bravo = await createAssetFolder({ page, name: "Bravo" });
-
- await alpha.click();
- await bravo.click({
- modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
- });
- if (
- (await page.locator('[role="option"][aria-selected="true"]').count()) !==
- 2
- ) {
- throw new Error("Expected both folders to be selected before dragging");
- }
-
- await Promise.all([
- waitForChangeToBeSaved({ page, timeout: 30_000 }),
- dragPointer({
- page,
- source: bravo,
- target: destination,
- ready: async () =>
- (await destination.getAttribute("data-is-drop-over")) === "true",
- }),
- ]);
- await alpha.waitFor({ state: "hidden" });
- await bravo.waitFor({ state: "hidden" });
- await destination.dblclick();
- await page
- .getByRole("button", { name: "Folder Alpha", exact: true })
- .waitFor();
- await page
- .getByRole("button", { name: "Folder Bravo", exact: true })
- .waitFor();
- } finally {
- await close();
- }
-});
-
-test("Dragging an asset auto-scrolls a long folder list", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Autoscroll E2E",
- builderToken: "asset-folder-autoscroll-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const assetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- const scrollArea = page.locator("[data-asset-manager-scroll-area]");
- for (let index = 0; index < 24; index += 1) {
- await createAssetFolder({
- page,
- name: `Filler ${String(index).padStart(2, "0")}`,
- });
- const overflows = await scrollArea.evaluate(
- (element) => element.scrollHeight > element.clientHeight + 80
- );
- if (overflows) {
- break;
- }
- }
- const destination = await createAssetFolder({
- page,
- name: "Destination",
- });
- const asset = page.getByTitle(assetTitle);
- await asset.scrollIntoViewIfNeeded();
- if ((await scrollArea.evaluate((element) => element.scrollTop)) === 0) {
- throw new Error("Expected the long asset list to be scrolled");
- }
-
- const assetBounds = await asset.boundingBox();
- const scrollBounds = await scrollArea.boundingBox();
- if (assetBounds === null || scrollBounds === null) {
- throw new Error("Expected visible asset and native scroll area");
- }
- const from = {
- x: assetBounds.x + assetBounds.width / 2,
- y: assetBounds.y + assetBounds.height / 2,
- };
- await page.mouse.move(from.x, from.y);
- await page.mouse.down();
- try {
- await page.mouse.move(from.x + 8, from.y + 8, { steps: 4 });
- const deadline = Date.now() + 10_000;
- let destinationBounds = await destination.boundingBox();
- while (
- Date.now() < deadline &&
- (destinationBounds === null ||
- destinationBounds.y < scrollBounds.y ||
- destinationBounds.y + destinationBounds.height >
- scrollBounds.y + scrollBounds.height)
- ) {
- await page.mouse.move(
- scrollBounds.x + scrollBounds.width / 2,
- scrollBounds.y + 4,
- { steps: 2 }
- );
- await page.waitForTimeout(120);
- destinationBounds = await destination.boundingBox();
- }
- if (
- destinationBounds === null ||
- destinationBounds.y < scrollBounds.y ||
- destinationBounds.y + destinationBounds.height >
- scrollBounds.y + scrollBounds.height
- ) {
- throw new Error(
- "Expected auto-scroll to reveal the destination folder"
- );
- }
- await page.mouse.move(
- destinationBounds.x + destinationBounds.width / 2,
- destinationBounds.y + destinationBounds.height / 2,
- { steps: 4 }
- );
- const dropDeadline = Date.now() + 5_000;
- while (
- Date.now() < dropDeadline &&
- (await destination.getAttribute("data-is-drop-over")) !== "true"
- ) {
- await page.mouse.move(
- destinationBounds.x + destinationBounds.width / 2 + 1,
- destinationBounds.y + destinationBounds.height / 2,
- { steps: 2 }
- );
- await page.waitForTimeout(100);
- }
- if ((await destination.getAttribute("data-is-drop-over")) !== "true") {
- throw new Error("Expected the destination folder to accept the drop");
- }
- const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
- await page.mouse.up();
- await save;
- } catch (error) {
- await page.mouse.up();
- throw error;
- }
-
- await asset.waitFor({ state: "hidden" });
- await destination.dblclick();
- await page.getByTitle(assetTitle).waitFor();
- } finally {
- await close();
- }
-});
-
-test("Multiselected assets can be moved from the context menu", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Menu Move E2E",
- builderToken: "asset-folder-menu-move-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const destination = await createAssetFolder({
- page,
- name: "Destination",
- });
- const firstAssetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- const secondAssetTitle = await uploadAsset({
- page,
- filename: "replacement-image.svg",
- });
- const firstAsset = page.getByTitle(firstAssetTitle);
- const secondAsset = page.getByTitle(secondAssetTitle);
-
- await firstAsset.click();
- await secondAsset.click({
- modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
- });
- await secondAsset.click({ button: "right" });
- await page.getByRole("menuitem", { name: "Move", exact: true }).click();
- const dialog = page.getByRole("dialog", { name: "Move items" });
- await dialog.getByRole("combobox", { name: "Folder" }).click();
- await page
- .getByRole("option", { name: "Destination", exact: true })
- .click();
- await Promise.all([
- waitForChangeToBeSaved({ page, timeout: 30_000 }),
- dialog.getByRole("button", { name: "Move", exact: true }).click(),
- ]);
-
- await firstAsset.waitFor({ state: "hidden" });
- await secondAsset.waitFor({ state: "hidden" });
- await destination.dblclick();
- await page.getByTitle(firstAssetTitle).waitFor();
- await page.getByTitle(secondAssetTitle).waitFor();
- } finally {
- await close();
- }
-});
-
-test("Folders can be multiselected and deleted as one operation", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Multiselect E2E",
- builderToken: "asset-folder-multiselect-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
- const folderNames = ["Alpha", "Bravo", "Charlie"];
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const folders = [];
- for (const name of folderNames) {
- folders.push(await createAssetFolder({ page, name }));
- }
-
- await folders[1]!.click({ button: "right" });
- await page.getByRole("menuitem", { name: "Settings" }).waitFor();
- await page.keyboard.press("Escape");
-
- await folders[0]!.click();
- await folders[2]!.click({ modifiers: ["Shift"] });
- const options = page.getByRole("option");
- for (const folder of folders) {
- const option = options.filter({ has: folder });
- if ((await option.getAttribute("aria-selected")) !== "true") {
- throw new Error("Expected Shift + Click to select the folder range");
- }
- }
-
- await page.keyboard.press("Escape");
- await folders[0]!.click();
- await folders[2]!.click({
- modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
- });
- const selectedOptions = page.locator(
- '[role="option"][aria-selected="true"]'
- );
- if ((await selectedOptions.count()) !== 2) {
- throw new Error("Expected Cmd/Ctrl + Click to select two folders");
- }
-
- await folders[0]!.click({ button: "right" });
- await page.getByRole("menuitem", { name: "Delete" }).click();
- const deleteDialog = page
- .getByRole("dialog")
- .filter({ hasText: "Delete selected items" });
- await deleteDialog.waitFor();
- await Promise.all([
- waitForChangeToBeSaved({ page }),
- deleteDialog.getByRole("button", { name: "Delete" }).click(),
- ]);
-
- await folders[0]!.waitFor({ state: "hidden" });
- await folders[2]!.waitFor({ state: "hidden" });
- await folders[1]!.waitFor({ state: "visible" });
-
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await page
- .getByRole("button", { name: "Folder Bravo", exact: true })
- .waitFor();
- for (const deletedName of ["Alpha", "Charlie"]) {
- if (
- await page
- .getByRole("button", { name: `Folder ${deletedName}`, exact: true })
- .isVisible()
- ) {
- throw new Error(`Expected ${deletedName} to stay deleted after reload`);
- }
- }
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..445b74752d
--- /dev/null
+++ b/apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,316 @@
+import {
+ createAssetFolder,
+ dragAssetToFolder,
+ openAssetsPanel,
+ openAssetSettings,
+ uploadAsset,
+} from "../flows/assets-panel";
+import { openProjectBuilder } from "../flows/builder";
+import { loginWithSecret } from "../flows/dashboard";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import { dashboardUrl, test } from "../test";
+
+test("Cloning a project preserves nested asset folders", async ({
+ context,
+}) => {
+ const email = "[email protected]";
+ const sourceTitle = "Asset Folder Clone Source";
+ const cloneTitle = "Asset Folder Clone Result";
+ const fixture = await createContentModeProject({
+ context: context,
+ email,
+ title: sourceTitle,
+ builderToken: "asset-folder-clone-e2e-builder-token",
+ });
+ const page = await context.newPage();
+
+ try {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const parent = await createAssetFolder({ page, name: "Clone parent" });
+ await parent.dblclick();
+ const child = await createAssetFolder({ page, name: "Clone child" });
+ await child.dblclick();
+ const assetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+
+ await loginWithSecret({ page, email });
+ const cloneUrl = new URL("/dashboard", dashboardUrl);
+ cloneUrl.searchParams.set("projectToCloneAuthToken", fixture.builderToken);
+ await page.goto(cloneUrl.href);
+ const cloneDialog = page.getByRole("dialog", { name: "Clone project" });
+ await cloneDialog.locator('input[name="title"]').fill(cloneTitle);
+ await cloneDialog
+ .getByRole("button", { name: "Clone", exact: true })
+ .click();
+
+ const clonedProjectTitle = page.getByText(cloneTitle, { exact: true });
+ await clonedProjectTitle.waitFor();
+ const clonedProjectCard = clonedProjectTitle.locator(
+ "xpath=ancestor::div[.//a][1]"
+ );
+ await clonedProjectCard.locator("a").first().click();
+ await page.waitForURL(/https:\/\/p-[^.]+\.wstd\.dev:\d+\//);
+ await openAssetsPanel({ page, force: true });
+ await page
+ .getByRole("button", { name: "Folder Clone parent", exact: true })
+ .press("Enter");
+ await page
+ .getByRole("button", { name: "Folder Clone child", exact: true })
+ .press("Enter");
+ await page.getByTitle(assetTitle).waitFor();
+ } finally {
+ await page.close();
+ }
+});
+
+test("Asset can be dragged into a folder", async ({ page, context }) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Drag E2E",
+ builderToken: "asset-folder-drag-e2e-builder-token",
+ });
+ const filename = "upload-image.svg";
+ const folderName = "Images";
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const assetTitle = await uploadAsset({ page, filename });
+ const folder = await createAssetFolder({ page, name: folderName });
+
+ await dragAssetToFolder({ page, assetTitle, folderName });
+ await folder.dblclick();
+ await page.getByTitle(assetTitle).waitFor();
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await page
+ .getByRole("button", { name: `Folder ${folderName}`, exact: true })
+ .dblclick();
+ await page.getByTitle(assetTitle).waitFor();
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Dragging over Back navigates to parent folders before dropping", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Back Drag E2E",
+ builderToken: "asset-folder-back-drag-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+
+ const parent = await createAssetFolder({ page, name: "Parent" });
+ await parent.dblclick();
+ const child = await createAssetFolder({ page, name: "Child" });
+ await child.dblclick();
+ const grandchild = await createAssetFolder({ page, name: "Grandchild" });
+ await grandchild.dblclick();
+ const assetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ const asset = page.getByTitle(assetTitle);
+ const assetBounds = await asset.boundingBox();
+ if (assetBounds === null) {
+ throw new Error("Expected visible asset drag source");
+ }
+
+ const from = {
+ x: assetBounds.x + assetBounds.width / 2,
+ y: assetBounds.y + assetBounds.height / 2,
+ };
+ await page.mouse.move(from.x, from.y);
+ await page.mouse.down();
+ try {
+ await page.mouse.move(from.x + 8, from.y + 8, { steps: 4 });
+
+ for (const folderName of ["Grandchild", "Child"]) {
+ const back = page.getByRole("button", { name: "Back", exact: true });
+ const backBounds = await back.boundingBox();
+ if (backBounds === null) {
+ throw new Error("Expected visible Back drag target");
+ }
+ await page.mouse.move(
+ backBounds.x - 4,
+ backBounds.y + backBounds.height / 2
+ );
+ await page.mouse.move(
+ backBounds.x + backBounds.width / 2,
+ backBounds.y + backBounds.height / 2,
+ { steps: 4 }
+ );
+ await page
+ .getByRole("button", {
+ name: `Folder ${folderName}`,
+ exact: true,
+ })
+ .waitFor({ timeout: 5_000 });
+ }
+
+ const assetGrid = page.getByRole("listbox");
+ const gridBounds = await assetGrid.boundingBox();
+ if (gridBounds === null) {
+ throw new Error("Expected visible asset grid drop target");
+ }
+ await page.mouse.move(
+ gridBounds.x + gridBounds.width - 4,
+ gridBounds.y + gridBounds.height - 4,
+ { steps: 4 }
+ );
+ const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
+ await page.mouse.up();
+ await save;
+ } catch (error) {
+ await page.mouse.up();
+ throw error;
+ }
+
+ await page.getByTitle(assetTitle).waitFor();
+ await page
+ .getByRole("button", { name: "Folder Child", exact: true })
+ .waitFor();
+});
+
+test("Asset folder changes wait until the nested selector loses focus", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Selector E2E",
+ builderToken: "asset-folder-selector-e2e-builder-token",
+ });
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+
+ const parent = await createAssetFolder({ page, name: "Parent" });
+ await parent.dblclick();
+ await createAssetFolder({ page, name: "Child" });
+ await page.getByRole("button", { name: "Back", exact: true }).click();
+
+ const assetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ await openAssetSettings({ page, filename: assetTitle });
+
+ const settings = page.getByText("Asset settings");
+ const topLevelSelect = page.getByRole("combobox", {
+ name: "Folder",
+ exact: true,
+ });
+ await topLevelSelect.click();
+ await page.getByRole("option", { name: "Parent", exact: true }).click();
+ await settings.waitFor();
+
+ const childSelect = page.getByRole("combobox", {
+ name: "Asset subfolder level 1",
+ exact: true,
+ });
+ await childSelect.click();
+ await page.getByRole("option", { name: "Child", exact: true }).click();
+ await settings.waitFor();
+
+ await Promise.all([
+ waitForChangeToBeSaved({ page, timeout: 30_000 }),
+ page.locator("#asset-manager-filename").click(),
+ ]);
+ await settings.waitFor({ state: "hidden" });
+
+ await parent.dblclick();
+ await page
+ .getByRole("button", { name: "Folder Child", exact: true })
+ .dblclick();
+ await page.getByTitle(assetTitle).waitFor();
+});
+
+test("Multiselected assets can be dragged into a folder", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Folder Multidrag E2E",
+ builderToken: "asset-folder-multidrag-e2e-builder-token",
+ });
+ const folderName = "Selected assets";
+
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openAssetsPanel({ page });
+ const firstAssetTitle = await uploadAsset({
+ page,
+ filename: "upload-image.svg",
+ });
+ const secondAssetTitle = await uploadAsset({
+ page,
+ filename: "replacement-image.svg",
+ });
+ const folder = await createAssetFolder({ page, name: folderName });
+ const firstAsset = page.getByTitle(firstAssetTitle);
+ const secondAsset = page.getByTitle(secondAssetTitle);
+
+ await firstAsset.click();
+ await secondAsset.click({
+ modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
+ });
+ if (
+ (await page.locator('[role="option"][aria-selected="true"]').count()) !== 2
+ ) {
+ throw new Error("Expected both assets to be selected before dragging");
+ }
+
+ await dragAssetToFolder({
+ page,
+ assetTitle: secondAssetTitle,
+ folderName,
+ });
+ await firstAsset.waitFor({ state: "hidden" });
+ await folder.dblclick();
+ await page.getByTitle(firstAssetTitle).waitFor();
+ await page.getByTitle(secondAssetTitle).waitFor();
+});
diff --git a/apps/builder/e2e/tests/asset-folders.e2e.ts b/apps/builder/e2e/tests/asset-folders.e2e.ts
deleted file mode 100644
index bf308b7c7f..0000000000
--- a/apps/builder/e2e/tests/asset-folders.e2e.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-import {
- createAssetFolder,
- dragAssetToFolder,
- openAssetsPanel,
- openAssetSettings,
- uploadAsset,
-} from "../flows/assets-panel";
-import { openProjectBuilder } from "../flows/builder";
-import { loginWithSecret } from "../flows/dashboard";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import { dashboardUrl, newIsolatedPage, test } from "../test";
-
-test("Cloning a project preserves nested asset folders", async ({
- context,
-}) => {
- const email = "[email protected]";
- const sourceTitle = "Asset Folder Clone Source";
- const cloneTitle = "Asset Folder Clone Result";
- const fixture = await createContentModeProject({
- context: context,
- email,
- title: sourceTitle,
- builderToken: "asset-folder-clone-e2e-builder-token",
- });
- const page = await context.newPage();
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const parent = await createAssetFolder({ page, name: "Clone parent" });
- await parent.dblclick();
- const child = await createAssetFolder({ page, name: "Clone child" });
- await child.dblclick();
- const assetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
-
- await loginWithSecret({ page, email });
- const cloneUrl = new URL("/dashboard", dashboardUrl);
- cloneUrl.searchParams.set("projectToCloneAuthToken", fixture.builderToken);
- await page.goto(cloneUrl.href);
- const cloneDialog = page.getByRole("dialog", { name: "Clone project" });
- await cloneDialog.locator('input[name="title"]').fill(cloneTitle);
- await cloneDialog
- .getByRole("button", { name: "Clone", exact: true })
- .click();
-
- const clonedProjectTitle = page.getByText(cloneTitle, { exact: true });
- await clonedProjectTitle.waitFor();
- const clonedProjectCard = clonedProjectTitle.locator(
- "xpath=ancestor::div[.//a][1]"
- );
- await clonedProjectCard.locator("a").first().click();
- await page.waitForURL(/https:\/\/p-[^.]+\.wstd\.dev:\d+\//);
- await openAssetsPanel({ page, force: true });
- await page
- .getByRole("button", { name: "Folder Clone parent", exact: true })
- .press("Enter");
- await page
- .getByRole("button", { name: "Folder Clone child", exact: true })
- .press("Enter");
- await page.getByTitle(assetTitle).waitFor();
- } finally {
- await page.close();
- }
-});
-
-test("Asset can be dragged into a folder", async ({ browser, context }) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Drag E2E",
- builderToken: "asset-folder-drag-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
- const filename = "upload-image.svg";
- const folderName = "Images";
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const assetTitle = await uploadAsset({ page, filename });
- const folder = await createAssetFolder({ page, name: folderName });
-
- await dragAssetToFolder({ page, assetTitle, folderName });
- await folder.dblclick();
- await page.getByTitle(assetTitle).waitFor();
-
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await page
- .getByRole("button", { name: `Folder ${folderName}`, exact: true })
- .dblclick();
- await page.getByTitle(assetTitle).waitFor();
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Dragging over Back navigates to parent folders before dropping", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Back Drag E2E",
- builderToken: "asset-folder-back-drag-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
-
- const parent = await createAssetFolder({ page, name: "Parent" });
- await parent.dblclick();
- const child = await createAssetFolder({ page, name: "Child" });
- await child.dblclick();
- const grandchild = await createAssetFolder({ page, name: "Grandchild" });
- await grandchild.dblclick();
- const assetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- const asset = page.getByTitle(assetTitle);
- const assetBounds = await asset.boundingBox();
- if (assetBounds === null) {
- throw new Error("Expected visible asset drag source");
- }
-
- const from = {
- x: assetBounds.x + assetBounds.width / 2,
- y: assetBounds.y + assetBounds.height / 2,
- };
- await page.mouse.move(from.x, from.y);
- await page.mouse.down();
- try {
- await page.mouse.move(from.x + 8, from.y + 8, { steps: 4 });
-
- for (const folderName of ["Grandchild", "Child"]) {
- const back = page.getByRole("button", { name: "Back", exact: true });
- const backBounds = await back.boundingBox();
- if (backBounds === null) {
- throw new Error("Expected visible Back drag target");
- }
- await page.mouse.move(
- backBounds.x - 4,
- backBounds.y + backBounds.height / 2
- );
- await page.mouse.move(
- backBounds.x + backBounds.width / 2,
- backBounds.y + backBounds.height / 2,
- { steps: 4 }
- );
- await page
- .getByRole("button", {
- name: `Folder ${folderName}`,
- exact: true,
- })
- .waitFor({ timeout: 5_000 });
- }
-
- const assetGrid = page.getByRole("listbox");
- const gridBounds = await assetGrid.boundingBox();
- if (gridBounds === null) {
- throw new Error("Expected visible asset grid drop target");
- }
- await page.mouse.move(
- gridBounds.x + gridBounds.width - 4,
- gridBounds.y + gridBounds.height - 4,
- { steps: 4 }
- );
- const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
- await page.mouse.up();
- await save;
- } catch (error) {
- await page.mouse.up();
- throw error;
- }
-
- await page.getByTitle(assetTitle).waitFor();
- await page
- .getByRole("button", { name: "Folder Child", exact: true })
- .waitFor();
- } finally {
- await close();
- }
-});
-
-test("Asset folder changes wait until the nested selector loses focus", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Selector E2E",
- builderToken: "asset-folder-selector-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
-
- const parent = await createAssetFolder({ page, name: "Parent" });
- await parent.dblclick();
- await createAssetFolder({ page, name: "Child" });
- await page.getByRole("button", { name: "Back", exact: true }).click();
-
- const assetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- await openAssetSettings({ page, filename: assetTitle });
-
- const settings = page.getByText("Asset settings");
- const topLevelSelect = page.getByRole("combobox", {
- name: "Folder",
- exact: true,
- });
- await topLevelSelect.click();
- await page.getByRole("option", { name: "Parent", exact: true }).click();
- await settings.waitFor();
-
- const childSelect = page.getByRole("combobox", {
- name: "Asset subfolder level 1",
- exact: true,
- });
- await childSelect.click();
- await page.getByRole("option", { name: "Child", exact: true }).click();
- await settings.waitFor();
-
- await Promise.all([
- waitForChangeToBeSaved({ page, timeout: 30_000 }),
- page.locator("#asset-manager-filename").click(),
- ]);
- await settings.waitFor({ state: "hidden" });
-
- await parent.dblclick();
- await page
- .getByRole("button", { name: "Folder Child", exact: true })
- .dblclick();
- await page.getByTitle(assetTitle).waitFor();
- } finally {
- await close();
- }
-});
-
-test("Multiselected assets can be dragged into a folder", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Folder Multidrag E2E",
- builderToken: "asset-folder-multidrag-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
- const folderName = "Selected assets";
-
- try {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForSyncStatus({ page, status: "idle" });
- await openAssetsPanel({ page });
- const firstAssetTitle = await uploadAsset({
- page,
- filename: "upload-image.svg",
- });
- const secondAssetTitle = await uploadAsset({
- page,
- filename: "replacement-image.svg",
- });
- const folder = await createAssetFolder({ page, name: folderName });
- const firstAsset = page.getByTitle(firstAssetTitle);
- const secondAsset = page.getByTitle(secondAssetTitle);
-
- await firstAsset.click();
- await secondAsset.click({
- modifiers: [process.platform === "darwin" ? "Meta" : "Control"],
- });
- if (
- (await page.locator('[role="option"][aria-selected="true"]').count()) !==
- 2
- ) {
- throw new Error("Expected both assets to be selected before dragging");
- }
-
- await dragAssetToFolder({
- page,
- assetTitle: secondAssetTitle,
- folderName,
- });
- await firstAsset.waitFor({ state: "hidden" });
- await folder.dblclick();
- await page.getByTitle(firstAssetTitle).waitFor();
- await page.getByTitle(secondAssetTitle).waitFor();
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..ff83a08020
--- /dev/null
+++ b/apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,53 @@
+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 { test, withBrowserContext } from "../test";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createDragProject(context, "canvas")
+ );
+});
+
+test("Canvas pointer drag reparents a heading and inserts a component", async ({
+ page,
+}) => {
+ 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)}`
+ );
+});
diff --git a/apps/builder/e2e/tests/canvas-drag.e2e.ts b/apps/builder/e2e/tests/canvas-drag.e2e.ts
deleted file mode 100644
index ccca225277..0000000000
--- a/apps/builder/e2e/tests/canvas-drag.e2e.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-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, withBrowserContext } from "../test";
-
-let fixture: Awaited<ReturnType<typeof createDragProject>>;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createDragProject(context, "canvas")
- );
-});
-
-test("Canvas pointer drag reparents a heading and inserts a component", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- 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/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..c92fc7dded
--- /dev/null
+++ b/apps/builder/e2e/tests/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,420 @@
+import {
+ deleteSelectedAsset,
+ openAssetSettings,
+ openAssetsPanel,
+ replaceSelectedAsset,
+ uploadAsset,
+} from "../flows/assets-panel";
+import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
+import {
+ selectCanvasImage,
+ waitForCanvasImage,
+ waitForCanvasImageCount,
+ waitForCanvasImageSourceName,
+ waitForCanvasVideoSource,
+} from "../flows/canvas-media";
+import {
+ waitForCanvasTextStyle,
+ waitForCanvasTextStyleCount,
+} from "../flows/canvas-style";
+import { chooseSelectedAssetProperty } from "../flows/props-panel";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+let fixture: SeededContentModeProject;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createContentModeProject({ context })
+ );
+});
+test("Editor can insert content templates with assets and styles", async ({
+ page,
+}) => {
+ await measure("content mode open editor for asset template", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode insert asset template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.assetTemplateName,
+ });
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ });
+ await waitForCanvasVideoSource({
+ page,
+ sourceName: fixture.assetTemplateVideoName,
+ });
+
+ await measure("content mode insert heading template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.styledHeadingTemplateName,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ property: "font-size",
+ value: fixture.styledHeadingTemplateFontSize,
+ });
+
+ await measure("content mode insert token template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.tokenTemplateLabel,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.tokenTemplateVisibleText,
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text: fixture.tokenTemplateVisibleText,
+ property: "font-size",
+ value: fixture.tokenTemplateFontSize,
+ });
+
+ await measure("content mode insert local style templates", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.isolatedLocalTemplateName,
+ });
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.isolatedLocalTemplateName,
+ });
+ });
+ await waitForCanvasTextStyleCount({
+ page,
+ text: fixture.isolatedLocalTemplateText,
+ property: "font-size",
+ value: fixture.isolatedLocalTemplateFontSize,
+ count: 2,
+ });
+
+ await measure("content mode reload editor for asset template", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ });
+ await waitForCanvasVideoSource({
+ page,
+ sourceName: fixture.assetTemplateVideoName,
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ property: "font-size",
+ value: fixture.styledHeadingTemplateFontSize,
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text: fixture.tokenTemplateVisibleText,
+ property: "font-size",
+ value: fixture.tokenTemplateFontSize,
+ });
+ await waitForCanvasTextStyleCount({
+ page,
+ text: fixture.isolatedLocalTemplateText,
+ property: "font-size",
+ value: fixture.isolatedLocalTemplateFontSize,
+ count: 2,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Editor can upload, replace, and delete asset in content mode", async ({
+ page,
+}) => {
+ const uploadFilename = "upload-image.svg";
+ const replacementFilename = "replacement-image.svg";
+
+ await measure("content mode open editor for asset workflows", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ let uploadedAssetTitle = "";
+ await measure("content mode upload asset", async () => {
+ await openAssetsPanel({ page });
+ uploadedAssetTitle = await uploadAsset({
+ page,
+ filename: uploadFilename,
+ });
+ });
+
+ let replacementAssetTitle = "";
+ await measure("content mode replace asset", async () => {
+ await openAssetSettings({ page, filename: uploadedAssetTitle });
+ const assetId = await page.locator("#asset-manager-id").inputValue();
+ if (assetId.length === 0) {
+ throw new Error(
+ "Expected Asset settings to expose the uploaded asset id"
+ );
+ }
+ await page.getByText("0 uses", { exact: true }).waitFor();
+ replacementAssetTitle = await replaceSelectedAsset({
+ page,
+ filename: replacementFilename,
+ });
+ });
+
+ await measure("content mode delete asset", async () => {
+ await openAssetSettings({ page, filename: replacementAssetTitle });
+ await deleteSelectedAsset({
+ page,
+ filename: replacementAssetTitle,
+ });
+ });
+
+ await measure("content mode reload editor for asset workflows", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await openAssetsPanel({ page });
+ await page.getByTitle(uploadedAssetTitle).waitFor({ state: "hidden" });
+ await page.getByTitle(replacementAssetTitle).waitFor({ state: "hidden" });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Editor can replace image source with asset in content mode", async ({
+ page,
+}) => {
+ const uploadFilename = "upload-image.svg";
+ const replacementFilename = "replacement-image.svg";
+
+ await measure(
+ "content mode open editor for image source asset replacement",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.imageReplacementTemplateName,
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.imageReplacementTemplateImageAlt,
+ });
+
+ let uploadedAssetTitle = "";
+ await measure("content mode upload image source asset", async () => {
+ await openAssetsPanel({ page });
+ uploadedAssetTitle = await uploadAsset({
+ page,
+ filename: uploadFilename,
+ });
+ });
+
+ await selectCanvasImage({
+ page,
+ alt: fixture.imageReplacementTemplateImageAlt,
+ });
+ await measure("content mode choose image source asset", async () => {
+ await chooseSelectedAssetProperty({
+ page,
+ label: "Source",
+ assetFilename: uploadFilename,
+ });
+ });
+ await waitForCanvasImageSourceName({ page, sourceName: "upload-image_" });
+
+ let replacementAssetTitle = "";
+ await measure("content mode replace used image source asset", async () => {
+ await openAssetsPanel({ page });
+ await openAssetSettings({
+ page,
+ filename: uploadedAssetTitle,
+ });
+ replacementAssetTitle = await replaceSelectedAsset({
+ page,
+ filename: replacementFilename,
+ });
+ });
+ await waitForCanvasImageSourceName({
+ page,
+ sourceName: "replacement-image_",
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure(
+ "content mode reload editor for image source asset replacement",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasImageSourceName({
+ page,
+ sourceName: "replacement-image_",
+ });
+ await openAssetsPanel({ page });
+ await page.getByTitle(replacementAssetTitle).waitFor();
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Builder copy/paste preserves image asset references after reload", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Asset Copy E2E",
+ assetNamePrefix: "asset-copy-",
+ editorToken: "asset-copy-e2e-editor-token",
+ builderToken: "asset-copy-e2e-builder-token",
+ });
+
+ const getImageAssetReferenceCount = async () => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ const props = JSON.parse(build.props) as Array<{
+ name: string;
+ type: string;
+ value: string;
+ }>;
+ const references = props.filter(
+ (prop) =>
+ prop.name === "src" &&
+ prop.type === "asset" &&
+ prop.value === fixture.assetTemplateImageAssetId
+ );
+ return references.length;
+ };
+
+ await measure("asset copy open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ const initialAssetReferenceCount = await getImageAssetReferenceCount();
+
+ await measure("asset copy insert template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.assetTemplateName,
+ });
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ });
+ await measure("asset copy open build mode", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ });
+ await selectCanvasImage({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ });
+ await page.keyboard.press("ControlOrMeta+C");
+ const save = waitForChangeToBeSaved({ page });
+ await page.keyboard.press("ControlOrMeta+V");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+ await waitForCanvasImageCount({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ count: 2,
+ });
+ if (
+ (await getImageAssetReferenceCount()) !==
+ initialAssetReferenceCount + 2
+ ) {
+ throw new Error(
+ "Expected insertion and paste to add two asset references."
+ );
+ }
+
+ await measure("asset copy reload builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasImageCount({
+ page,
+ alt: fixture.assetTemplateImageAlt,
+ count: 2,
+ });
+ if (
+ (await getImageAssetReferenceCount()) !==
+ initialAssetReferenceCount + 2
+ ) {
+ throw new Error("Expected reload to preserve copied asset references.");
+ }
+});
diff --git a/apps/builder/e2e/tests/content-mode-assets.e2e.ts b/apps/builder/e2e/tests/content-mode-assets.e2e.ts
deleted file mode 100644
index 6bec864ea0..0000000000
--- a/apps/builder/e2e/tests/content-mode-assets.e2e.ts
+++ /dev/null
@@ -1,444 +0,0 @@
-import {
- deleteSelectedAsset,
- openAssetSettings,
- openAssetsPanel,
- replaceSelectedAsset,
- uploadAsset,
-} from "../flows/assets-panel";
-import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
-import {
- selectCanvasImage,
- waitForCanvasImage,
- waitForCanvasImageCount,
- waitForCanvasImageSourceName,
- waitForCanvasVideoSource,
-} from "../flows/canvas-media";
-import {
- waitForCanvasTextStyle,
- waitForCanvasTextStyleCount,
-} from "../flows/canvas-style";
-import { chooseSelectedAssetProperty } from "../flows/props-panel";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-let fixture: SeededContentModeProject;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
- );
-});
-test("Editor can insert content templates with assets and styles", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure("content mode open editor for asset template", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode insert asset template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.assetTemplateName,
- });
- });
- await waitForCanvasImage({
- page,
- alt: fixture.assetTemplateImageAlt,
- });
- await waitForCanvasVideoSource({
- page,
- sourceName: fixture.assetTemplateVideoName,
- });
-
- await measure("content mode insert heading template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.styledHeadingTemplateName,
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.styledHeadingTemplateText,
- });
- await waitForCanvasTextStyle({
- page,
- text: fixture.styledHeadingTemplateText,
- property: "font-size",
- value: fixture.styledHeadingTemplateFontSize,
- });
-
- await measure("content mode insert token template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.tokenTemplateLabel,
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.tokenTemplateVisibleText,
- });
- await waitForCanvasTextStyle({
- page,
- text: fixture.tokenTemplateVisibleText,
- property: "font-size",
- value: fixture.tokenTemplateFontSize,
- });
-
- await measure("content mode insert local style templates", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.isolatedLocalTemplateName,
- });
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.isolatedLocalTemplateName,
- });
- });
- await waitForCanvasTextStyleCount({
- page,
- text: fixture.isolatedLocalTemplateText,
- property: "font-size",
- value: fixture.isolatedLocalTemplateFontSize,
- count: 2,
- });
-
- await measure("content mode reload editor for asset template", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasImage({
- page,
- alt: fixture.assetTemplateImageAlt,
- });
- await waitForCanvasVideoSource({
- page,
- sourceName: fixture.assetTemplateVideoName,
- });
- await waitForCanvasTextStyle({
- page,
- text: fixture.styledHeadingTemplateText,
- property: "font-size",
- value: fixture.styledHeadingTemplateFontSize,
- });
- await waitForCanvasTextStyle({
- page,
- text: fixture.tokenTemplateVisibleText,
- property: "font-size",
- value: fixture.tokenTemplateFontSize,
- });
- await waitForCanvasTextStyleCount({
- page,
- text: fixture.isolatedLocalTemplateText,
- property: "font-size",
- value: fixture.isolatedLocalTemplateFontSize,
- count: 2,
- });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Editor can upload, replace, and delete asset in content mode", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const uploadFilename = "upload-image.svg";
- const replacementFilename = "replacement-image.svg";
-
- try {
- await measure("content mode open editor for asset workflows", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
- await waitForSyncStatus({ page, status: "idle" });
-
- let uploadedAssetTitle = "";
- await measure("content mode upload asset", async () => {
- await openAssetsPanel({ page });
- uploadedAssetTitle = await uploadAsset({
- page,
- filename: uploadFilename,
- });
- });
-
- let replacementAssetTitle = "";
- await measure("content mode replace asset", async () => {
- await openAssetSettings({ page, filename: uploadedAssetTitle });
- const assetId = await page.locator("#asset-manager-id").inputValue();
- if (assetId.length === 0) {
- throw new Error(
- "Expected Asset settings to expose the uploaded asset id"
- );
- }
- await page.getByText("0 uses", { exact: true }).waitFor();
- replacementAssetTitle = await replaceSelectedAsset({
- page,
- filename: replacementFilename,
- });
- });
-
- await measure("content mode delete asset", async () => {
- await openAssetSettings({ page, filename: replacementAssetTitle });
- await deleteSelectedAsset({
- page,
- filename: replacementAssetTitle,
- });
- });
-
- await measure(
- "content mode reload editor for asset workflows",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await openAssetsPanel({ page });
- await page.getByTitle(uploadedAssetTitle).waitFor({ state: "hidden" });
- await page.getByTitle(replacementAssetTitle).waitFor({ state: "hidden" });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Editor can replace image source with asset in content mode", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const uploadFilename = "upload-image.svg";
- const replacementFilename = "replacement-image.svg";
-
- try {
- await measure(
- "content mode open editor for image source asset replacement",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.imageReplacementTemplateName,
- });
- await waitForCanvasImage({
- page,
- alt: fixture.imageReplacementTemplateImageAlt,
- });
-
- let uploadedAssetTitle = "";
- await measure("content mode upload image source asset", async () => {
- await openAssetsPanel({ page });
- uploadedAssetTitle = await uploadAsset({
- page,
- filename: uploadFilename,
- });
- });
-
- await selectCanvasImage({
- page,
- alt: fixture.imageReplacementTemplateImageAlt,
- });
- await measure("content mode choose image source asset", async () => {
- await chooseSelectedAssetProperty({
- page,
- label: "Source",
- assetFilename: uploadFilename,
- });
- });
- await waitForCanvasImageSourceName({ page, sourceName: "upload-image_" });
-
- let replacementAssetTitle = "";
- await measure("content mode replace used image source asset", async () => {
- await openAssetsPanel({ page });
- await openAssetSettings({
- page,
- filename: uploadedAssetTitle,
- });
- replacementAssetTitle = await replaceSelectedAsset({
- page,
- filename: replacementFilename,
- });
- });
- await waitForCanvasImageSourceName({
- page,
- sourceName: "replacement-image_",
- });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure(
- "content mode reload editor for image source asset replacement",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasImageSourceName({
- page,
- sourceName: "replacement-image_",
- });
- await openAssetsPanel({ page });
- await page.getByTitle(replacementAssetTitle).waitFor();
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Builder copy/paste preserves image asset references after reload", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Asset Copy E2E",
- assetNamePrefix: "asset-copy-",
- editorToken: "asset-copy-e2e-editor-token",
- builderToken: "asset-copy-e2e-builder-token",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- const getImageAssetReferenceCount = async () => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- const props = JSON.parse(build.props) as Array<{
- name: string;
- type: string;
- value: string;
- }>;
- const references = props.filter(
- (prop) =>
- prop.name === "src" &&
- prop.type === "asset" &&
- prop.value === fixture.assetTemplateImageAssetId
- );
- return references.length;
- };
-
- try {
- await measure("asset copy open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
- const initialAssetReferenceCount = await getImageAssetReferenceCount();
-
- await measure("asset copy insert template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.assetTemplateName,
- });
- });
- await waitForCanvasImage({
- page,
- alt: fixture.assetTemplateImageAlt,
- });
- await measure("asset copy open build mode", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasImage({
- page,
- alt: fixture.assetTemplateImageAlt,
- });
- await selectCanvasImage({
- page,
- alt: fixture.assetTemplateImageAlt,
- });
- await page.keyboard.press("ControlOrMeta+C");
- const save = waitForChangeToBeSaved({ page });
- await page.keyboard.press("ControlOrMeta+V");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
- await waitForCanvasImageCount({
- page,
- alt: fixture.assetTemplateImageAlt,
- count: 2,
- });
- if (
- (await getImageAssetReferenceCount()) !==
- initialAssetReferenceCount + 2
- ) {
- throw new Error(
- "Expected insertion and paste to add two asset references."
- );
- }
-
- await measure("asset copy reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasImageCount({
- page,
- alt: fixture.assetTemplateImageAlt,
- count: 2,
- });
- if (
- (await getImageAssetReferenceCount()) !==
- initialAssetReferenceCount + 2
- ) {
- throw new Error("Expected reload to preserve copied asset references.");
- }
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/content-mode-content-editing.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/content-mode-content-editing.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..122a96fe13
--- /dev/null
+++ b/apps/builder/e2e/tests/content-mode-content-editing.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,623 @@
+import type { Page } from "@playwright/test";
+import { deleteContentBlockChildAfterCanvasText } from "../flows/block-outline";
+import {
+ openProjectBuilder,
+ waitForCanvasFrame,
+ waitForCanvasText,
+ waitForCanvasTextHidden,
+} from "../flows/builder";
+import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";
+import { expectLocatorHidden, expectTextHidden } from "../flows/assertions";
+import {
+ selectCanvasImage,
+ selectCanvasVideoSource,
+ waitForCanvasImage,
+ waitForCanvasVideoSource,
+} from "../flows/canvas-media";
+import {
+ pasteCanvasText,
+ removeCanvasInlineLink,
+ replaceCanvasText,
+ replaceCanvasTextAndApplyInlineFormats,
+} from "../flows/content-editing";
+import {
+ fillSelectedStringProperty,
+ waitForSelectedStringPropertyValue,
+} from "../flows/props-panel";
+import {
+ expectContentModeTemplateActionsUnavailable,
+ openPagesPanel,
+} from "../flows/pages-panel";
+import { waitForSyncStatus } from "../flows/sync-status";
+import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+const getElementTagWithTextCount = async ({
+ projectId,
+ tag,
+ text,
+}: {
+ projectId: string;
+ tag: string;
+ text: string;
+}) => {
+ const build = await loadDevBuild({ projectId });
+ const instances = JSON.parse(build.instances) as Array<{
+ id: string;
+ component: string;
+ tag?: string;
+ children?: Array<{ type: string; value?: string }>;
+ }>;
+ const instancesById = new Map(
+ instances.map((instance) => [instance.id, instance])
+ );
+
+ const instanceContainsText = (instanceId: string): boolean => {
+ const instance = instancesById.get(instanceId);
+ if (instance === undefined) {
+ return false;
+ }
+ return (
+ instance.children?.some((child) => {
+ if (child.type === "text") {
+ return child.value?.includes(text);
+ }
+ if (child.type === "id" && child.value !== undefined) {
+ return instanceContainsText(child.value);
+ }
+ return false;
+ }) ?? false
+ );
+ };
+
+ return instances.filter(
+ (instance) =>
+ instance.component === "ws:element" &&
+ instance.tag === tag &&
+ instanceContainsText(instance.id)
+ ).length;
+};
+
+const getElementHrefWithText = async ({
+ projectId,
+ text,
+}: {
+ projectId: string;
+ text: string;
+}) => {
+ const build = await loadDevBuild({ projectId });
+ const instances = JSON.parse(build.instances) as Array<{
+ id: string;
+ tag?: string;
+ children?: Array<{ type: string; value?: string }>;
+ }>;
+ const props = JSON.parse(build.props) as Array<{
+ instanceId: string;
+ name: string;
+ type: string;
+ value: unknown;
+ }>;
+ const instancesById = new Map(
+ instances.map((instance) => [instance.id, instance])
+ );
+
+ const instanceContainsText = (instanceId: string): boolean => {
+ const instance = instancesById.get(instanceId);
+ if (instance === undefined) {
+ return false;
+ }
+ return (
+ instance.children?.some((child) => {
+ if (child.type === "text") {
+ return child.value?.includes(text);
+ }
+ return (
+ child.type === "id" &&
+ child.value !== undefined &&
+ instanceContainsText(child.value)
+ );
+ }) ?? false
+ );
+ };
+
+ const link = instances.find(
+ (instance) => instance.tag === "a" && instanceContainsText(instance.id)
+ );
+ if (link === undefined) {
+ throw new Error(`Expected a link containing "${text}"`);
+ }
+ const href = props.find(
+ (prop) => prop.instanceId === link.id && prop.name === "href"
+ );
+ if (href?.type !== "string" || typeof href.value !== "string") {
+ throw new Error(`Expected a static href for link containing "${text}"`);
+ }
+ return href.value;
+};
+
+const undoShortcut = async ({ page }: { page: Page }) => {
+ await page.keyboard.press("ControlOrMeta+Z");
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const redoShortcut = async ({ page }: { page: Page }) => {
+ await page.keyboard.press("ControlOrMeta+Shift+Z");
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+let fixture: SeededContentModeProject;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createContentModeProject({ context })
+ );
+});
+test("Editor can delete direct children but not protected containers", async ({
+ page,
+}) => {
+ await measure(
+ "content mode open editor for direct child delete",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode insert deletable template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.deletableTemplateName,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.deletableTemplateText,
+ });
+
+ await measure("content mode delete direct child", async () => {
+ await deleteContentBlockChildAfterCanvasText({
+ page,
+ text: fixture.deletableTemplateText,
+ });
+ });
+ await waitForCanvasTextHidden({
+ page,
+ text: fixture.deletableTemplateText,
+ });
+
+ await measure(
+ "content mode reload editor for direct child delete",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasTextHidden({
+ page,
+ text: fixture.deletableTemplateText,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode insert nested template", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.nestedTemplateName,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.nestedTemplateText,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode try nested delete", async () => {
+ const canvas = await waitForCanvasFrame({ page });
+ await page.keyboard.down("Alt");
+ try {
+ await canvas.getByText(fixture.nestedTemplateText).hover();
+ await page
+ .getByRole("button", { name: "Delete block" })
+ .waitFor({ state: "hidden", timeout: 1_000 });
+ } finally {
+ await page.keyboard.up("Alt");
+ }
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.nestedTemplateText,
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await openPagesPanel({ page });
+ await expectContentModeTemplateActionsUnavailable({
+ page,
+ templateName: fixture.pageTemplateName,
+ });
+
+ await page.getByRole("tab", { name: "Navigator" }).click();
+ await expectTextHidden({ page, text: "Global Root" });
+ await expectTextHidden({ page, text: fixture.pageTemplateName });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Editor can edit text and content props but not design props", async ({
+ page,
+}) => {
+ const editedHref = "/edited-link";
+ const editedImageSrc =
+ "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='80'%3E%3Crect width='120' height='80' fill='%23dff7e8'/%3E%3C/svg%3E";
+ const editedImageAlt = "Edited image alt";
+ const editedVideoSrc = "https://example.com/edited-video.mp4";
+ const editedContent = "Edited isolated content";
+
+ await measure("content mode open editor for props", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial link" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.editableTextTemplateName,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.editableTextTemplateText,
+ });
+
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: fixture.editableTextTemplateText,
+ templateName: fixture.contentPropsTemplateName,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.contentPropsTemplateLinkText,
+ });
+ await waitForCanvasImage({
+ page,
+ alt: fixture.contentPropsTemplateImageAlt,
+ });
+ await waitForCanvasVideoSource({
+ page,
+ sourceName: fixture.contentPropsTemplateVideoName,
+ });
+
+ await measure("content mode edit text and save", async () => {
+ await replaceCanvasText({
+ page,
+ currentText: fixture.editableTextTemplateText,
+ text: editedContent,
+ });
+ });
+
+ await selectCanvasTextInstanceForProps({
+ page,
+ text: "Initial link",
+ propertyLabel: "Href",
+ });
+ await expectLocatorHidden({
+ locator: page.getByRole("tab", { name: "Style" }),
+ message: "Expected Style tab to be unavailable in content mode",
+ });
+ await expectTextHidden({ page, text: "Style sources" });
+ await page
+ .getByText("Target", { exact: true })
+ .first()
+ .waitFor({ state: "visible" });
+ await page
+ .getByText("Download", { exact: true })
+ .first()
+ .waitFor({ state: "visible" });
+
+ await selectCanvasTextInstanceForProps({
+ page,
+ text: fixture.contentPropsTemplateLinkText,
+ propertyLabel: "Href",
+ });
+ await fillSelectedStringProperty({
+ page,
+ label: "Href",
+ control: "url",
+ value: editedHref,
+ });
+
+ await selectCanvasImage({
+ page,
+ alt: fixture.contentPropsTemplateImageAlt,
+ });
+ await fillSelectedStringProperty({
+ page,
+ label: "Source",
+ control: "url",
+ value: editedImageSrc,
+ });
+ await fillSelectedStringProperty({
+ page,
+ label: "Alt",
+ control: "text",
+ value: editedImageAlt,
+ });
+ await expectTextHidden({ page, text: "Width" });
+
+ await selectCanvasVideoSource({
+ page,
+ sourceName: fixture.contentPropsTemplateVideoName,
+ });
+ await fillSelectedStringProperty({
+ page,
+ label: "Source",
+ control: "url",
+ value: editedVideoSrc,
+ });
+
+ await measure("content mode reload editor for props", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.contentPropsTemplateLinkText,
+ });
+ await waitForCanvasText({ page, text: editedContent });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await selectCanvasTextInstanceForProps({
+ page,
+ text: fixture.contentPropsTemplateLinkText,
+ propertyLabel: "Href",
+ });
+ await waitForSelectedStringPropertyValue({
+ page,
+ label: "Href",
+ control: "url",
+ value: editedHref,
+ });
+
+ await selectCanvasImage({
+ page,
+ alt: editedImageAlt,
+ });
+ await waitForSelectedStringPropertyValue({
+ page,
+ label: "Source",
+ control: "url",
+ value: editedImageSrc,
+ });
+ await waitForSelectedStringPropertyValue({
+ page,
+ label: "Alt",
+ control: "text",
+ value: editedImageAlt,
+ });
+ await expectTextHidden({ page, text: "Width" });
+
+ await selectCanvasVideoSource({
+ page,
+ sourceName: "edited-video.mp4",
+ });
+ await waitForSelectedStringPropertyValue({
+ page,
+ label: "Source",
+ control: "url",
+ value: editedVideoSrc,
+ });
+ await waitForCanvasText({ page, text: editedContent });
+});
+
+test("Editor can paste text while editing canvas content", async ({ page }) => {
+ const pastedContent = "Pasted editable content";
+
+ await measure("content mode open editor for text paste", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.editableTextTemplateName,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.editableTextTemplateText,
+ });
+
+ await measure("content mode native paste text", async () => {
+ await pasteCanvasText({
+ page,
+ currentText: fixture.editableTextTemplateText,
+ text: pastedContent,
+ });
+ });
+ await waitForCanvasText({ page, text: pastedContent });
+});
+
+test("Editor rich text formatting persists after reload", async ({ page }) => {
+ const formattedText = "Rich editor formatted copy";
+ const editedHref = "/rich-text-editor-link";
+
+ await measure(
+ "content mode open editor for rich text formatting",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: fixture.shareLinkEditableText });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode apply rich text formatting", async () => {
+ await replaceCanvasTextAndApplyInlineFormats({
+ page,
+ currentText: fixture.shareLinkEditableText,
+ text: formattedText,
+ formats: ["Bold", "Italic", "Inline link"],
+ });
+ });
+ await waitForCanvasText({ page, text: formattedText });
+
+ const boldCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "b",
+ text: formattedText,
+ });
+ const italicCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "i",
+ text: formattedText,
+ });
+ const linkCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: formattedText,
+ });
+ if (boldCount !== 1 || italicCount !== 1 || linkCount !== 1) {
+ throw new Error(
+ `Expected rich text editor to persist one bold, italic, and inline link subtree. bold=${boldCount}, italic=${italicCount}, link=${linkCount}`
+ );
+ }
+
+ await measure("content mode undo rich text formatting", async () => {
+ await undoShortcut({ page });
+ });
+ await waitForCanvasTextHidden({ page, text: formattedText });
+
+ await measure("content mode redo rich text formatting", async () => {
+ await redoShortcut({ page });
+ });
+ await waitForCanvasText({ page, text: formattedText });
+
+ await selectCanvasTextInstanceForProps({
+ page,
+ text: formattedText,
+ propertyLabel: "Href",
+ });
+ await fillSelectedStringProperty({
+ page,
+ label: "Href",
+ control: "url",
+ value: editedHref,
+ });
+ const savedHref = await getElementHrefWithText({
+ projectId: fixture.projectId,
+ text: formattedText,
+ });
+ if (savedHref !== editedHref) {
+ throw new Error(
+ `Expected rich-text link href to be saved as "${editedHref}", received "${savedHref}"`
+ );
+ }
+
+ await measure("content mode reload rich text formatting", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: formattedText });
+ const reloadedHref = await getElementHrefWithText({
+ projectId: fixture.projectId,
+ text: formattedText,
+ });
+ if (reloadedHref !== editedHref) {
+ throw new Error(
+ `Expected reloaded rich-text link href to be "${editedHref}", received "${reloadedHref}"`
+ );
+ }
+
+ const reloadedBoldCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "b",
+ text: formattedText,
+ });
+ const reloadedItalicCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "i",
+ text: formattedText,
+ });
+ const reloadedLinkCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: formattedText,
+ });
+ if (
+ reloadedBoldCount !== 1 ||
+ reloadedItalicCount !== 1 ||
+ reloadedLinkCount !== 1
+ ) {
+ throw new Error(
+ `Expected reloaded rich text formatting to persist. bold=${reloadedBoldCount}, italic=${reloadedItalicCount}, link=${reloadedLinkCount}`
+ );
+ }
+
+ await removeCanvasInlineLink({ page, text: formattedText });
+ const removedLinkCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: formattedText,
+ });
+ if (removedLinkCount !== 0) {
+ throw new Error(
+ `Expected rich-text link removal to delete the inline link subtree, received ${removedLinkCount} link instances`
+ );
+ }
+
+ await measure("content mode reload rich text link removal", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: formattedText });
+ const reloadedRemovedLinkCount = await getElementTagWithTextCount({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: formattedText,
+ });
+ if (reloadedRemovedLinkCount !== 0) {
+ throw new Error(
+ `Expected rich-text link removal to persist after reload, received ${reloadedRemovedLinkCount} link instances`
+ );
+ }
+});
diff --git a/apps/builder/e2e/tests/content-mode-content-editing.e2e.ts b/apps/builder/e2e/tests/content-mode-content-editing.e2e.ts
deleted file mode 100644
index 60611eb51e..0000000000
--- a/apps/builder/e2e/tests/content-mode-content-editing.e2e.ts
+++ /dev/null
@@ -1,648 +0,0 @@
-import type { Page } from "@playwright/test";
-import { deleteContentBlockChildAfterCanvasText } from "../flows/block-outline";
-import {
- openProjectBuilder,
- waitForCanvasFrame,
- waitForCanvasText,
- waitForCanvasTextHidden,
-} from "../flows/builder";
-import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";
-import { expectLocatorHidden, expectTextHidden } from "../flows/assertions";
-import {
- selectCanvasImage,
- selectCanvasVideoSource,
- waitForCanvasImage,
- waitForCanvasVideoSource,
-} from "../flows/canvas-media";
-import {
- pasteCanvasText,
- removeCanvasInlineLink,
- replaceCanvasText,
- replaceCanvasTextAndApplyInlineFormats,
-} from "../flows/content-editing";
-import {
- fillSelectedStringProperty,
- waitForSelectedStringPropertyValue,
-} from "../flows/props-panel";
-import {
- expectContentModeTemplateActionsUnavailable,
- openPagesPanel,
-} from "../flows/pages-panel";
-import { waitForSyncStatus } from "../flows/sync-status";
-import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-const getElementTagWithTextCount = async ({
- projectId,
- tag,
- text,
-}: {
- projectId: string;
- tag: string;
- text: string;
-}) => {
- const build = await loadDevBuild({ projectId });
- const instances = JSON.parse(build.instances) as Array<{
- id: string;
- component: string;
- tag?: string;
- children?: Array<{ type: string; value?: string }>;
- }>;
- const instancesById = new Map(
- instances.map((instance) => [instance.id, instance])
- );
-
- const instanceContainsText = (instanceId: string): boolean => {
- const instance = instancesById.get(instanceId);
- if (instance === undefined) {
- return false;
- }
- return (
- instance.children?.some((child) => {
- if (child.type === "text") {
- return child.value?.includes(text);
- }
- if (child.type === "id" && child.value !== undefined) {
- return instanceContainsText(child.value);
- }
- return false;
- }) ?? false
- );
- };
-
- return instances.filter(
- (instance) =>
- instance.component === "ws:element" &&
- instance.tag === tag &&
- instanceContainsText(instance.id)
- ).length;
-};
-
-const getElementHrefWithText = async ({
- projectId,
- text,
-}: {
- projectId: string;
- text: string;
-}) => {
- const build = await loadDevBuild({ projectId });
- const instances = JSON.parse(build.instances) as Array<{
- id: string;
- tag?: string;
- children?: Array<{ type: string; value?: string }>;
- }>;
- const props = JSON.parse(build.props) as Array<{
- instanceId: string;
- name: string;
- type: string;
- value: unknown;
- }>;
- const instancesById = new Map(
- instances.map((instance) => [instance.id, instance])
- );
-
- const instanceContainsText = (instanceId: string): boolean => {
- const instance = instancesById.get(instanceId);
- if (instance === undefined) {
- return false;
- }
- return (
- instance.children?.some((child) => {
- if (child.type === "text") {
- return child.value?.includes(text);
- }
- return (
- child.type === "id" &&
- child.value !== undefined &&
- instanceContainsText(child.value)
- );
- }) ?? false
- );
- };
-
- const link = instances.find(
- (instance) => instance.tag === "a" && instanceContainsText(instance.id)
- );
- if (link === undefined) {
- throw new Error(`Expected a link containing "${text}"`);
- }
- const href = props.find(
- (prop) => prop.instanceId === link.id && prop.name === "href"
- );
- if (href?.type !== "string" || typeof href.value !== "string") {
- throw new Error(`Expected a static href for link containing "${text}"`);
- }
- return href.value;
-};
-
-const undoShortcut = async ({ page }: { page: Page }) => {
- await page.keyboard.press("ControlOrMeta+Z");
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const redoShortcut = async ({ page }: { page: Page }) => {
- await page.keyboard.press("ControlOrMeta+Shift+Z");
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-let fixture: SeededContentModeProject;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
- );
-});
-test("Editor can delete direct children but not protected containers", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure(
- "content mode open editor for direct child delete",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode insert deletable template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.deletableTemplateName,
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.deletableTemplateText,
- });
-
- await measure("content mode delete direct child", async () => {
- await deleteContentBlockChildAfterCanvasText({
- page,
- text: fixture.deletableTemplateText,
- });
- });
- await waitForCanvasTextHidden({
- page,
- text: fixture.deletableTemplateText,
- });
-
- await measure(
- "content mode reload editor for direct child delete",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasTextHidden({
- page,
- text: fixture.deletableTemplateText,
- });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode insert nested template", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.nestedTemplateName,
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.nestedTemplateText,
- });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode try nested delete", async () => {
- const canvas = await waitForCanvasFrame({ page });
- await page.keyboard.down("Alt");
- try {
- await canvas.getByText(fixture.nestedTemplateText).hover();
- await page
- .getByRole("button", { name: "Delete block" })
- .waitFor({ state: "hidden", timeout: 1_000 });
- } finally {
- await page.keyboard.up("Alt");
- }
- });
- await waitForCanvasText({
- page,
- text: fixture.nestedTemplateText,
- });
- await waitForSyncStatus({ page, status: "idle" });
-
- await openPagesPanel({ page });
- await expectContentModeTemplateActionsUnavailable({
- page,
- templateName: fixture.pageTemplateName,
- });
-
- await page.getByRole("tab", { name: "Navigator" }).click();
- await expectTextHidden({ page, text: "Global Root" });
- await expectTextHidden({ page, text: fixture.pageTemplateName });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Editor can edit text and content props but not design props", async ({
- browser,
-}) => {
- const editedHref = "/edited-link";
- const editedImageSrc =
- "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='80'%3E%3Crect width='120' height='80' fill='%23dff7e8'/%3E%3C/svg%3E";
- const editedImageAlt = "Edited image alt";
- const editedVideoSrc = "https://example.com/edited-video.mp4";
- const editedContent = "Edited isolated content";
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure("content mode open editor for props", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: "Initial link" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.editableTextTemplateName,
- });
- await waitForCanvasText({
- page,
- text: fixture.editableTextTemplateText,
- });
-
- await insertTemplateAfterCanvasText({
- page,
- anchorText: fixture.editableTextTemplateText,
- templateName: fixture.contentPropsTemplateName,
- });
- await waitForCanvasText({
- page,
- text: fixture.contentPropsTemplateLinkText,
- });
- await waitForCanvasImage({
- page,
- alt: fixture.contentPropsTemplateImageAlt,
- });
- await waitForCanvasVideoSource({
- page,
- sourceName: fixture.contentPropsTemplateVideoName,
- });
-
- await measure("content mode edit text and save", async () => {
- await replaceCanvasText({
- page,
- currentText: fixture.editableTextTemplateText,
- text: editedContent,
- });
- });
-
- await selectCanvasTextInstanceForProps({
- page,
- text: "Initial link",
- propertyLabel: "Href",
- });
- await expectLocatorHidden({
- locator: page.getByRole("tab", { name: "Style" }),
- message: "Expected Style tab to be unavailable in content mode",
- });
- await expectTextHidden({ page, text: "Style sources" });
- await page
- .getByText("Target", { exact: true })
- .first()
- .waitFor({ state: "visible" });
- await page
- .getByText("Download", { exact: true })
- .first()
- .waitFor({ state: "visible" });
-
- await selectCanvasTextInstanceForProps({
- page,
- text: fixture.contentPropsTemplateLinkText,
- propertyLabel: "Href",
- });
- await fillSelectedStringProperty({
- page,
- label: "Href",
- control: "url",
- value: editedHref,
- });
-
- await selectCanvasImage({
- page,
- alt: fixture.contentPropsTemplateImageAlt,
- });
- await fillSelectedStringProperty({
- page,
- label: "Source",
- control: "url",
- value: editedImageSrc,
- });
- await fillSelectedStringProperty({
- page,
- label: "Alt",
- control: "text",
- value: editedImageAlt,
- });
- await expectTextHidden({ page, text: "Width" });
-
- await selectCanvasVideoSource({
- page,
- sourceName: fixture.contentPropsTemplateVideoName,
- });
- await fillSelectedStringProperty({
- page,
- label: "Source",
- control: "url",
- value: editedVideoSrc,
- });
-
- await measure("content mode reload editor for props", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.contentPropsTemplateLinkText,
- });
- await waitForCanvasText({ page, text: editedContent });
- await waitForSyncStatus({ page, status: "idle" });
-
- await selectCanvasTextInstanceForProps({
- page,
- text: fixture.contentPropsTemplateLinkText,
- propertyLabel: "Href",
- });
- await waitForSelectedStringPropertyValue({
- page,
- label: "Href",
- control: "url",
- value: editedHref,
- });
-
- await selectCanvasImage({
- page,
- alt: editedImageAlt,
- });
- await waitForSelectedStringPropertyValue({
- page,
- label: "Source",
- control: "url",
- value: editedImageSrc,
- });
- await waitForSelectedStringPropertyValue({
- page,
- label: "Alt",
- control: "text",
- value: editedImageAlt,
- });
- await expectTextHidden({ page, text: "Width" });
-
- await selectCanvasVideoSource({
- page,
- sourceName: "edited-video.mp4",
- });
- await waitForSelectedStringPropertyValue({
- page,
- label: "Source",
- control: "url",
- value: editedVideoSrc,
- });
- await waitForCanvasText({ page, text: editedContent });
- } finally {
- await close();
- }
-});
-
-test("Editor can paste text while editing canvas content", async ({
- browser,
-}) => {
- const pastedContent = "Pasted editable content";
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure("content mode open editor for text paste", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.editableTextTemplateName,
- });
- await waitForCanvasText({
- page,
- text: fixture.editableTextTemplateText,
- });
-
- await measure("content mode native paste text", async () => {
- await pasteCanvasText({
- page,
- currentText: fixture.editableTextTemplateText,
- text: pastedContent,
- });
- });
- await waitForCanvasText({ page, text: pastedContent });
- } finally {
- await close();
- }
-});
-
-test("Editor rich text formatting persists after reload", async ({
- browser,
-}) => {
- const formattedText = "Rich editor formatted copy";
- const editedHref = "/rich-text-editor-link";
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure(
- "content mode open editor for rich text formatting",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: fixture.shareLinkEditableText });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode apply rich text formatting", async () => {
- await replaceCanvasTextAndApplyInlineFormats({
- page,
- currentText: fixture.shareLinkEditableText,
- text: formattedText,
- formats: ["Bold", "Italic", "Inline link"],
- });
- });
- await waitForCanvasText({ page, text: formattedText });
-
- const boldCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "b",
- text: formattedText,
- });
- const italicCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "i",
- text: formattedText,
- });
- const linkCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "a",
- text: formattedText,
- });
- if (boldCount !== 1 || italicCount !== 1 || linkCount !== 1) {
- throw new Error(
- `Expected rich text editor to persist one bold, italic, and inline link subtree. bold=${boldCount}, italic=${italicCount}, link=${linkCount}`
- );
- }
-
- await measure("content mode undo rich text formatting", async () => {
- await undoShortcut({ page });
- });
- await waitForCanvasTextHidden({ page, text: formattedText });
-
- await measure("content mode redo rich text formatting", async () => {
- await redoShortcut({ page });
- });
- await waitForCanvasText({ page, text: formattedText });
-
- await selectCanvasTextInstanceForProps({
- page,
- text: formattedText,
- propertyLabel: "Href",
- });
- await fillSelectedStringProperty({
- page,
- label: "Href",
- control: "url",
- value: editedHref,
- });
- const savedHref = await getElementHrefWithText({
- projectId: fixture.projectId,
- text: formattedText,
- });
- if (savedHref !== editedHref) {
- throw new Error(
- `Expected rich-text link href to be saved as "${editedHref}", received "${savedHref}"`
- );
- }
-
- await measure("content mode reload rich text formatting", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: formattedText });
- const reloadedHref = await getElementHrefWithText({
- projectId: fixture.projectId,
- text: formattedText,
- });
- if (reloadedHref !== editedHref) {
- throw new Error(
- `Expected reloaded rich-text link href to be "${editedHref}", received "${reloadedHref}"`
- );
- }
-
- const reloadedBoldCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "b",
- text: formattedText,
- });
- const reloadedItalicCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "i",
- text: formattedText,
- });
- const reloadedLinkCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "a",
- text: formattedText,
- });
- if (
- reloadedBoldCount !== 1 ||
- reloadedItalicCount !== 1 ||
- reloadedLinkCount !== 1
- ) {
- throw new Error(
- `Expected reloaded rich text formatting to persist. bold=${reloadedBoldCount}, italic=${reloadedItalicCount}, link=${reloadedLinkCount}`
- );
- }
-
- await removeCanvasInlineLink({ page, text: formattedText });
- const removedLinkCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "a",
- text: formattedText,
- });
- if (removedLinkCount !== 0) {
- throw new Error(
- `Expected rich-text link removal to delete the inline link subtree, received ${removedLinkCount} link instances`
- );
- }
-
- await measure("content mode reload rich text link removal", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({ page, text: formattedText });
- const reloadedRemovedLinkCount = await getElementTagWithTextCount({
- projectId: fixture.projectId,
- tag: "a",
- text: formattedText,
- });
- if (reloadedRemovedLinkCount !== 0) {
- throw new Error(
- `Expected rich-text link removal to persist after reload, received ${reloadedRemovedLinkCount} link instances`
- );
- }
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/content-mode-pages.[shard-3].e2e.ts b/apps/builder/e2e/tests/content-mode-pages.[shard-3].e2e.ts
new file mode 100644
index 0000000000..d54fbb7e82
--- /dev/null
+++ b/apps/builder/e2e/tests/content-mode-pages.[shard-3].e2e.ts
@@ -0,0 +1,352 @@
+import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
+import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { expectLocatorHidden } from "../flows/assertions";
+import { waitForCanvasTextStyle } from "../flows/canvas-style";
+import { replaceCanvasText } from "../flows/content-editing";
+import {
+ choosePageSettingsSocialImageAsset,
+ createPageFromTemplate,
+ expectContentModePagePathError,
+ expectContentModePageSettingsRestrictions,
+ expectCustomMetadataValue,
+ fillAllowedPageSettings,
+ fillCustomMetadata,
+ getPageSettingsPathInput,
+ openPage,
+ openPageSettings,
+} from "../flows/pages-panel";
+import { waitForSyncStatus } from "../flows/sync-status";
+import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { newIsolatedPage, test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+
+let fixture: SeededContentModeProject;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createContentModeProject({ context })
+ );
+});
+test("Editor can create styled page from template in content mode", async ({
+ page,
+}) => {
+ const pageName = "Created content page";
+
+ await measure(
+ "content mode open editor for page template creation",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial link" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure("content mode create page from template", async () => {
+ await createPageFromTemplate({
+ page,
+ templateName: fixture.pageTemplateName,
+ pageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text: fixture.pageTemplateText,
+ property: "font-size",
+ value: fixture.pageTemplateFontSize,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.dataResourceStaticVariableVisibleValue,
+ });
+ await waitForCanvasText({
+ page,
+ text: "HTTP resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "GraphQL resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "2026",
+ });
+
+ await measure("content mode reload created page from template", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ await openPage({
+ page,
+ pageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.dataResourceStaticVariableVisibleValue,
+ });
+ await waitForCanvasText({
+ page,
+ text: "HTTP resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "GraphQL resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "2026",
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Editor can edit allowed page settings", async ({ page }) => {
+ const pageName = "Settings content page";
+ const editedName = "Edited settings content page";
+ const editedPath = "/edited-settings-content-page";
+ const editedTitle = "Edited settings title";
+ const editedDescription = "Edited settings description";
+ const editedLanguage = "en-US";
+ const editedSocialImage = "https://example.com/content-mode-social.png";
+
+ await measure(
+ "content mode open editor for allowed page settings",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial link" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await createPageFromTemplate({
+ page,
+ templateName: fixture.pageTemplateName,
+ pageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ await openPageSettings({ page, pageName });
+
+ await fillAllowedPageSettings({
+ page,
+ name: editedName,
+ path: editedPath,
+ title: editedTitle,
+ description: editedDescription,
+ language: editedLanguage,
+ socialImage: editedSocialImage,
+ metadata: {
+ property: "content-mode",
+ content: "edited metadata",
+ },
+ });
+ await choosePageSettingsSocialImageAsset({
+ page,
+ filename: fixture.assetTemplateImageName,
+ label: fixture.assetTemplateImageAlt,
+ });
+ await fillCustomMetadata({
+ page,
+ metadata: {
+ property: "content-mode",
+ content: "edited metadata",
+ },
+ });
+
+ await measure(
+ "content mode reload editor for allowed page settings",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ }
+ );
+ await openPageSettings({ page, pageName: editedName });
+ await page.getByLabel("Page name").waitFor();
+ if ((await page.getByLabel("Page name").inputValue()) !== editedName) {
+ throw new Error("Expected edited page name to persist");
+ }
+ if ((await getPageSettingsPathInput({ page }).inputValue()) !== editedPath) {
+ throw new Error("Expected edited page path to persist");
+ }
+ if ((await page.getByLabel("Title").inputValue()) !== editedTitle) {
+ throw new Error("Expected edited page title to persist");
+ }
+ if (
+ (await page.getByLabel("Description").inputValue()) !== editedDescription
+ ) {
+ throw new Error("Expected edited page description to persist");
+ }
+ if (
+ (await page
+ .getByLabel("Exclude this page from search results")
+ .isChecked()) === false
+ ) {
+ throw new Error("Expected edited search visibility to persist");
+ }
+ if ((await page.getByLabel("Language").inputValue()) !== editedLanguage) {
+ throw new Error("Expected edited page language to persist");
+ }
+ const socialPreviewImage = page.getByRole("img", {
+ name: "Social sharing preview image",
+ });
+ await socialPreviewImage.waitFor();
+ const socialPreviewImageSrc = await socialPreviewImage.getAttribute("src");
+ if (
+ socialPreviewImageSrc?.includes(fixture.assetTemplateImageName) !== true
+ ) {
+ throw new Error(
+ `Expected social image preview to render ${fixture.assetTemplateImageName}, received ${socialPreviewImageSrc}`
+ );
+ }
+ await expectCustomMetadataValue({
+ page,
+ property: "content-mode",
+ content: "edited metadata",
+ });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Editor is blocked from invalid paths and restricted page settings", async ({
+ page,
+}) => {
+ const pageName = "Blocked settings content page";
+ const invalidPaths = ["/posts/:slug", "/docs/*", "https://x.com"];
+
+ await measure("content mode open editor for blocked page paths", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial link" });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await createPageFromTemplate({
+ page,
+ templateName: fixture.pageTemplateName,
+ pageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ await openPageSettings({ page, pageName });
+
+ for (const path of invalidPaths) {
+ const pathInput = getPageSettingsPathInput({ page });
+ await pathInput.fill(path);
+ await pathInput.blur();
+ await expectContentModePagePathError({ page });
+ await waitForSyncStatus({ page, status: "idle" });
+ }
+ await expectContentModePageSettingsRestrictions({ page });
+ await waitForSyncStatus({ page, status: "idle" });
+});
+
+test("Edit-only and build-capable users can collaborate in content mode", async ({
+ browser,
+}) => {
+ const editor = await newIsolatedPage(browser);
+ const builder = await newIsolatedPage(browser);
+
+ try {
+ await measure("open editor and builder sessions", async () => {
+ await Promise.all([
+ openProjectBuilder({
+ page: editor.page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ }),
+ openProjectBuilder({
+ page: builder.page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ }),
+ ]);
+ });
+ await waitForCanvasText({ page: editor.page, text: "Initial content" });
+ await waitForCanvasText({ page: builder.page, text: "Initial content" });
+ await waitForSyncStatus({ page: editor.page, status: "idle" });
+ await waitForSyncStatus({ page: builder.page, status: "idle" });
+
+ await insertTemplateAfterCanvasText({
+ page: editor.page,
+ anchorText: "Initial content",
+ templateName: fixture.collaborationTemplateName,
+ });
+ await waitForCanvasText({
+ page: editor.page,
+ text: fixture.collaborationTemplateText,
+ });
+ await waitForSyncStatus({ page: editor.page, status: "idle" });
+
+ await openProjectBuilder({
+ page: builder.page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForCanvasText({
+ page: builder.page,
+ text: fixture.collaborationTemplateText,
+ });
+
+ await replaceCanvasText({
+ page: editor.page,
+ currentText: fixture.collaborationTemplateText,
+ text: "Collaborative editor text",
+ });
+ await waitForSyncStatus({ page: editor.page, status: "idle" });
+
+ await selectCanvasTextInstance({
+ page: editor.page,
+ text: "Collaborative editor text",
+ });
+ await expectLocatorHidden({
+ locator: editor.page.getByRole("tab", { name: "Style" }),
+ message:
+ "Expected edit-only collaborator to be blocked from design controls",
+ });
+
+ await openProjectBuilder({
+ page: builder.page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForCanvasText({
+ page: builder.page,
+ text: "Collaborative editor text",
+ });
+
+ await selectCanvasTextInstance({
+ page: builder.page,
+ text: "Collaborative editor text",
+ });
+ await builder.page
+ .getByRole("tab", { name: "Style" })
+ .waitFor({ state: "visible" });
+ await waitForSyncStatus({ page: editor.page, status: "idle" });
+ await waitForSyncStatus({ page: builder.page, status: "idle" });
+ } finally {
+ await editor.close();
+ await builder.close();
+ }
+});
diff --git a/apps/builder/e2e/tests/content-mode-pages.e2e.ts b/apps/builder/e2e/tests/content-mode-pages.e2e.ts
deleted file mode 100644
index 463badf841..0000000000
--- a/apps/builder/e2e/tests/content-mode-pages.e2e.ts
+++ /dev/null
@@ -1,375 +0,0 @@
-import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
-import { selectCanvasTextInstance } from "../flows/canvas-selection";
-import { expectLocatorHidden } from "../flows/assertions";
-import { waitForCanvasTextStyle } from "../flows/canvas-style";
-import { replaceCanvasText } from "../flows/content-editing";
-import {
- choosePageSettingsSocialImageAsset,
- createPageFromTemplate,
- expectContentModePagePathError,
- expectContentModePageSettingsRestrictions,
- expectCustomMetadataValue,
- fillAllowedPageSettings,
- fillCustomMetadata,
- getPageSettingsPathInput,
- openPage,
- openPageSettings,
-} from "../flows/pages-panel";
-import { waitForSyncStatus } from "../flows/sync-status";
-import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-
-let fixture: SeededContentModeProject;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
- );
-});
-test("Editor can create styled page from template in content mode", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const pageName = "Created content page";
-
- try {
- await measure(
- "content mode open editor for page template creation",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial link" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure("content mode create page from template", async () => {
- await createPageFromTemplate({
- page,
- templateName: fixture.pageTemplateName,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
- });
- await waitForCanvasTextStyle({
- page,
- text: fixture.pageTemplateText,
- property: "font-size",
- value: fixture.pageTemplateFontSize,
- });
- await waitForCanvasText({
- page,
- text: fixture.dataResourceStaticVariableVisibleValue,
- });
- await waitForCanvasText({
- page,
- text: "HTTP resource variable configured",
- });
- await waitForCanvasText({
- page,
- text: "GraphQL resource variable configured",
- });
- await waitForCanvasText({
- page,
- text: "2026",
- });
-
- await measure(
- "content mode reload created page from template",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- await openPage({
- page,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
- }
- );
- await waitForCanvasText({
- page,
- text: fixture.dataResourceStaticVariableVisibleValue,
- });
- await waitForCanvasText({
- page,
- text: "HTTP resource variable configured",
- });
- await waitForCanvasText({
- page,
- text: "GraphQL resource variable configured",
- });
- await waitForCanvasText({
- page,
- text: "2026",
- });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Editor can edit allowed page settings", async ({ browser }) => {
- const { page, close } = await newIsolatedPage(browser);
- const pageName = "Settings content page";
- const editedName = "Edited settings content page";
- const editedPath = "/edited-settings-content-page";
- const editedTitle = "Edited settings title";
- const editedDescription = "Edited settings description";
- const editedLanguage = "en-US";
- const editedSocialImage = "https://example.com/content-mode-social.png";
-
- try {
- await measure(
- "content mode open editor for allowed page settings",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial link" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await createPageFromTemplate({
- page,
- templateName: fixture.pageTemplateName,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
- await openPageSettings({ page, pageName });
-
- await fillAllowedPageSettings({
- page,
- name: editedName,
- path: editedPath,
- title: editedTitle,
- description: editedDescription,
- language: editedLanguage,
- socialImage: editedSocialImage,
- metadata: {
- property: "content-mode",
- content: "edited metadata",
- },
- });
- await choosePageSettingsSocialImageAsset({
- page,
- filename: fixture.assetTemplateImageName,
- label: fixture.assetTemplateImageAlt,
- });
- await fillCustomMetadata({
- page,
- metadata: {
- property: "content-mode",
- content: "edited metadata",
- },
- });
-
- await measure(
- "content mode reload editor for allowed page settings",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await openPageSettings({ page, pageName: editedName });
- await page.getByLabel("Page name").waitFor();
- if ((await page.getByLabel("Page name").inputValue()) !== editedName) {
- throw new Error("Expected edited page name to persist");
- }
- if (
- (await getPageSettingsPathInput({ page }).inputValue()) !== editedPath
- ) {
- throw new Error("Expected edited page path to persist");
- }
- if ((await page.getByLabel("Title").inputValue()) !== editedTitle) {
- throw new Error("Expected edited page title to persist");
- }
- if (
- (await page.getByLabel("Description").inputValue()) !== editedDescription
- ) {
- throw new Error("Expected edited page description to persist");
- }
- if (
- (await page
- .getByLabel("Exclude this page from search results")
- .isChecked()) === false
- ) {
- throw new Error("Expected edited search visibility to persist");
- }
- if ((await page.getByLabel("Language").inputValue()) !== editedLanguage) {
- throw new Error("Expected edited page language to persist");
- }
- const socialPreviewImage = page.getByRole("img", {
- name: "Social sharing preview image",
- });
- await socialPreviewImage.waitFor();
- const socialPreviewImageSrc = await socialPreviewImage.getAttribute("src");
- if (
- socialPreviewImageSrc?.includes(fixture.assetTemplateImageName) !== true
- ) {
- throw new Error(
- `Expected social image preview to render ${fixture.assetTemplateImageName}, received ${socialPreviewImageSrc}`
- );
- }
- await expectCustomMetadataValue({
- page,
- property: "content-mode",
- content: "edited metadata",
- });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Editor is blocked from invalid paths and restricted page settings", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const pageName = "Blocked settings content page";
- const invalidPaths = ["/posts/:slug", "/docs/*", "https://x.com"];
-
- try {
- await measure(
- "content mode open editor for blocked page paths",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial link" });
- await waitForSyncStatus({ page, status: "idle" });
-
- await createPageFromTemplate({
- page,
- templateName: fixture.pageTemplateName,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
- await openPageSettings({ page, pageName });
-
- for (const path of invalidPaths) {
- const pathInput = getPageSettingsPathInput({ page });
- await pathInput.fill(path);
- await pathInput.blur();
- await expectContentModePagePathError({ page });
- await waitForSyncStatus({ page, status: "idle" });
- }
- await expectContentModePageSettingsRestrictions({ page });
- await waitForSyncStatus({ page, status: "idle" });
- } finally {
- await close();
- }
-});
-
-test("Edit-only and build-capable users can collaborate in content mode", async ({
- browser,
-}) => {
- const editor = await newIsolatedPage(browser);
- const builder = await newIsolatedPage(browser);
-
- try {
- await measure("open editor and builder sessions", async () => {
- await Promise.all([
- openProjectBuilder({
- page: editor.page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- }),
- openProjectBuilder({
- page: builder.page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- }),
- ]);
- });
- await waitForCanvasText({ page: editor.page, text: "Initial content" });
- await waitForCanvasText({ page: builder.page, text: "Initial content" });
- await waitForSyncStatus({ page: editor.page, status: "idle" });
- await waitForSyncStatus({ page: builder.page, status: "idle" });
-
- await insertTemplateAfterCanvasText({
- page: editor.page,
- anchorText: "Initial content",
- templateName: fixture.collaborationTemplateName,
- });
- await waitForCanvasText({
- page: editor.page,
- text: fixture.collaborationTemplateText,
- });
- await waitForSyncStatus({ page: editor.page, status: "idle" });
-
- await openProjectBuilder({
- page: builder.page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({
- page: builder.page,
- text: fixture.collaborationTemplateText,
- });
-
- await replaceCanvasText({
- page: editor.page,
- currentText: fixture.collaborationTemplateText,
- text: "Collaborative editor text",
- });
- await waitForSyncStatus({ page: editor.page, status: "idle" });
-
- await selectCanvasTextInstance({
- page: editor.page,
- text: "Collaborative editor text",
- });
- await expectLocatorHidden({
- locator: editor.page.getByRole("tab", { name: "Style" }),
- message:
- "Expected edit-only collaborator to be blocked from design controls",
- });
-
- await openProjectBuilder({
- page: builder.page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({
- page: builder.page,
- text: "Collaborative editor text",
- });
-
- await selectCanvasTextInstance({
- page: builder.page,
- text: "Collaborative editor text",
- });
- await builder.page
- .getByRole("tab", { name: "Style" })
- .waitFor({ state: "visible" });
- await waitForSyncStatus({ page: editor.page, status: "idle" });
- await waitForSyncStatus({ page: builder.page, status: "idle" });
- } finally {
- await editor.close();
- await builder.close();
- }
-});
diff --git a/apps/builder/e2e/tests/data-variables-generated.e2e.ts b/apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.ts
similarity index 77%
rename from apps/builder/e2e/tests/data-variables-generated.e2e.ts
rename to apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.ts
index 2993ba8b66..9dbd215571 100644
--- a/apps/builder/e2e/tests/data-variables-generated.e2e.ts
+++ b/apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -1,4 +1,4 @@
-import type { BrowserContext } from "@playwright/test";
+import type { BrowserContext, Page } from "@playwright/test";
import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
import {
bindSelectedTextContentToExpression,
@@ -12,7 +12,7 @@ import {
import { loginWithSecret } from "../flows/dashboard";
import { expectGeneratedAppToRender } from "../flows/generated-app";
import { createContentModeProject } from "../fixtures/content-mode-suite";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
const openGeneratedResourceProject = async ({
@@ -23,7 +23,7 @@ const openGeneratedResourceProject = async ({
assetNamePrefix,
}: {
context: BrowserContext;
- page: Awaited<ReturnType<typeof newIsolatedPage>>["page"];
+ page: Page;
email: string;
title: string;
assetNamePrefix: string;
@@ -54,7 +54,7 @@ const reloadAndSelectContent = async ({
fixture,
phase,
}: {
- page: Awaited<ReturnType<typeof newIsolatedPage>>["page"];
+ page: Page;
fixture: { projectId: string; builderToken: string };
phase: string;
}) => {
@@ -70,10 +70,9 @@ const reloadAndSelectContent = async ({
};
test("Generated app fetches and renders a Builder-created HTTP resource", async ({
- browser,
+ page,
context,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const resource = await startJsonResourceServer({
title: "Rendered from local HTTP resource",
});
@@ -113,15 +112,13 @@ test("Generated app fetches and renders a Builder-created HTTP resource", async
});
} finally {
await resource.close();
- await close();
}
});
test("Generated app fetches and renders a Builder-created GraphQL resource", async ({
- browser,
+ page,
context,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const resource = await startGraphqlResourceServer({
title: "Rendered from local GraphQL resource",
});
@@ -160,46 +157,40 @@ test("Generated app fetches and renders a Builder-created GraphQL resource", asy
});
} finally {
await resource.close();
- await close();
}
});
test("Generated app renders a Builder-created current-date system resource", async ({
- browser,
+ page,
context,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const resourceName = "e2eGeneratedCurrentDate";
const expectedYear = String(new Date().getUTCFullYear());
- try {
- const fixture = await openGeneratedResourceProject({
- context: context,
- page,
- email: "[email protected]",
- title: "Generated System Resource",
- assetNamePrefix: "generated-system-resource-",
- });
- await createSystemResourceVariable({
- page,
- name: resourceName,
- resource: "Current date",
- });
- await reloadAndSelectContent({
- page,
- fixture,
- phase: "generated system resource reload Builder",
- });
- await bindSelectedTextContentToExpression({
- page,
- expression: `${resourceName}.data.year`,
- });
- await waitForCanvasText({ page, text: expectedYear });
- await expectGeneratedAppToRender({
- projectId: fixture.projectId,
- expectedText: expectedYear,
- });
- } finally {
- await close();
- }
+ const fixture = await openGeneratedResourceProject({
+ context: context,
+ page,
+ email: "[email protected]",
+ title: "Generated System Resource",
+ assetNamePrefix: "generated-system-resource-",
+ });
+ await createSystemResourceVariable({
+ page,
+ name: resourceName,
+ resource: "Current date",
+ });
+ await reloadAndSelectContent({
+ page,
+ fixture,
+ phase: "generated system resource reload Builder",
+ });
+ await bindSelectedTextContentToExpression({
+ page,
+ expression: `${resourceName}.data.year`,
+ });
+ await waitForCanvasText({ page, text: expectedYear });
+ await expectGeneratedAppToRender({
+ projectId: fixture.projectId,
+ expectedText: expectedYear,
+ });
});
diff --git a/apps/builder/e2e/tests/data-variables-runtime.e2e.ts b/apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
similarity index 68%
rename from apps/builder/e2e/tests/data-variables-runtime.e2e.ts
rename to apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
index 90ca4d4196..56f679345b 100644
--- a/apps/builder/e2e/tests/data-variables-runtime.e2e.ts
+++ b/apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -14,7 +14,7 @@ import {
import { createContentModeProject } from "../fixtures/content-mode-suite";
import { loginWithSecret } from "../flows/dashboard";
import { expectGeneratedAppToRender } from "../flows/generated-app";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
import { loadDevBuild } from "../db";
@@ -335,7 +335,7 @@ const expectPersistedDataVariables = async ({
};
test("Builder-created data variables and resources persist after reload", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -347,7 +347,6 @@ test("Builder-created data variables and resources persist after reload", async
editorToken: "data-variables-runtime-editor-token",
builderToken: "data-variables-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const staticName = "e2eStaticLabel";
const staticValue = "Created from Builder UI";
const editedStaticValue = "Edited from Builder UI";
@@ -364,188 +363,181 @@ test("Builder-created data variables and resources persist after reload", async
const graphqlQuery = "query Posts { posts { id title } }";
const systemName = "e2eSitemap";
- try {
- await loginWithSecret({ page, email });
+ await loginWithSecret({ page, email });
- await measure("data variables runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
- });
- await selectContentInstance({ page });
-
- await measure(
- "data variables runtime create variables through UI",
- async () => {
- await createStringVariable({
- page,
- name: staticName,
- value: staticValue,
- });
- await createHttpResourceVariable({
- page,
- name: httpName,
- url: httpUrl,
- });
- await createGraphqlResourceVariable({
- page,
- name: graphqlName,
- url: graphqlUrl,
- query: graphqlQuery,
- });
- await createSystemResourceVariable({ page, name: systemName });
- }
- );
-
- await measure(
- "data variables runtime edit resources and variables",
- async () => {
- await editStringVariable({
- page,
- fixture,
- name: staticName,
- value: editedStaticValue,
- });
- await editHttpResourceVariableWithCurl({
- page,
- fixture,
- name: httpName,
- curl: `curl '${httpCurlUrl}?${httpSearchParamName}=${httpSearchParamValue}' --request POST --header '${httpHeaderName}: ${httpHeaderValue}' --header 'Content-Type: application/json' --data '{"${httpBodyValue}":true}'`,
- });
- }
- );
-
- await expectPersistedDataVariables({
- fixture,
- staticName,
- staticValue: editedStaticValue,
- httpName,
- httpUrl,
- httpCurlUrl,
- httpSearchParamName,
- httpSearchParamValue,
- httpHeaderName,
- httpHeaderValue,
- httpBodyValue,
- graphqlName,
- graphqlUrl,
- graphqlQuery,
- systemName,
- deletedName: undefined,
- });
-
- await expectVariableListItem({
+ await measure("data variables runtime open builder", async () => {
+ await openProjectBuilder({
page,
- name: staticName,
- badge: "Static variable",
- });
- await expectVariableListItem({
- page,
- name: httpName,
- badge: "Dynamic data variable",
- });
- await expectVariableListItem({
- page,
- name: graphqlName,
- badge: "Dynamic data variable",
- });
- await expectVariableListItem({
- page,
- name: systemName,
- badge: "Dynamic data variable",
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
+ await selectContentInstance({ page });
- await measure("data variables runtime reload builder", async () => {
- await openProjectBuilder({
+ await measure(
+ "data variables runtime create variables through UI",
+ async () => {
+ await createStringVariable({
page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
+ name: staticName,
+ value: staticValue,
});
- });
- await waitForCanvasText({ page, text: "Initial content" });
- await selectContentInstance({ page });
+ await createHttpResourceVariable({
+ page,
+ name: httpName,
+ url: httpUrl,
+ });
+ await createGraphqlResourceVariable({
+ page,
+ name: graphqlName,
+ url: graphqlUrl,
+ query: graphqlQuery,
+ });
+ await createSystemResourceVariable({ page, name: systemName });
+ }
+ );
- await expectVariableListItem({
- page,
- name: staticName,
- badge: "Static variable",
- });
- await expectVariableListItem({
- page,
- name: httpName,
- badge: "Dynamic data variable",
- });
- await expectVariableListItem({
- page,
- name: graphqlName,
- badge: "Dynamic data variable",
- });
- await expectVariableListItem({
+ await measure(
+ "data variables runtime edit resources and variables",
+ async () => {
+ await editStringVariable({
+ page,
+ fixture,
+ name: staticName,
+ value: editedStaticValue,
+ });
+ await editHttpResourceVariableWithCurl({
+ page,
+ fixture,
+ name: httpName,
+ curl: `curl '${httpCurlUrl}?${httpSearchParamName}=${httpSearchParamValue}' --request POST --header '${httpHeaderName}: ${httpHeaderValue}' --header 'Content-Type: application/json' --data '{"${httpBodyValue}":true}'`,
+ });
+ }
+ );
+
+ await expectPersistedDataVariables({
+ fixture,
+ staticName,
+ staticValue: editedStaticValue,
+ httpName,
+ httpUrl,
+ httpCurlUrl,
+ httpSearchParamName,
+ httpSearchParamValue,
+ httpHeaderName,
+ httpHeaderValue,
+ httpBodyValue,
+ graphqlName,
+ graphqlUrl,
+ graphqlQuery,
+ systemName,
+ deletedName: undefined,
+ });
+
+ await expectVariableListItem({
+ page,
+ name: staticName,
+ badge: "Static variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: httpName,
+ badge: "Dynamic data variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: graphqlName,
+ badge: "Dynamic data variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: systemName,
+ badge: "Dynamic data variable",
+ });
+
+ await measure("data variables runtime reload builder", async () => {
+ await openProjectBuilder({
page,
- name: systemName,
- badge: "Dynamic data variable",
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await selectContentInstance({ page });
- await expectPersistedDataVariables({
- fixture,
- staticName,
- staticValue: editedStaticValue,
- httpName,
- httpUrl,
- httpCurlUrl,
- httpSearchParamName,
- httpSearchParamValue,
- httpHeaderName,
- httpHeaderValue,
- httpBodyValue,
- graphqlName,
- graphqlUrl,
- graphqlQuery,
- systemName,
- deletedName: undefined,
- });
+ await expectVariableListItem({
+ page,
+ name: staticName,
+ badge: "Static variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: httpName,
+ badge: "Dynamic data variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: graphqlName,
+ badge: "Dynamic data variable",
+ });
+ await expectVariableListItem({
+ page,
+ name: systemName,
+ badge: "Dynamic data variable",
+ });
- await measure(
- "data variables runtime delete graphql variable",
- async () => {
- await deleteVariable({
- page,
- fixture,
- name: graphqlName,
- });
- }
- );
- await page.getByText(graphqlName, { exact: true }).waitFor({
- state: "hidden",
- });
- await expectPersistedDataVariables({
+ await expectPersistedDataVariables({
+ fixture,
+ staticName,
+ staticValue: editedStaticValue,
+ httpName,
+ httpUrl,
+ httpCurlUrl,
+ httpSearchParamName,
+ httpSearchParamValue,
+ httpHeaderName,
+ httpHeaderValue,
+ httpBodyValue,
+ graphqlName,
+ graphqlUrl,
+ graphqlQuery,
+ systemName,
+ deletedName: undefined,
+ });
+
+ await measure("data variables runtime delete graphql variable", async () => {
+ await deleteVariable({
+ page,
fixture,
- staticName,
- staticValue: editedStaticValue,
- httpName,
- httpUrl,
- httpCurlUrl,
- httpSearchParamName,
- httpSearchParamValue,
- httpHeaderName,
- httpHeaderValue,
- httpBodyValue,
- graphqlName,
- graphqlUrl,
- graphqlQuery,
- systemName,
- deletedName: graphqlName,
+ name: graphqlName,
});
- } finally {
- await close();
- }
+ });
+ await page.getByText(graphqlName, { exact: true }).waitFor({
+ state: "hidden",
+ });
+ await expectPersistedDataVariables({
+ fixture,
+ staticName,
+ staticValue: editedStaticValue,
+ httpName,
+ httpUrl,
+ httpCurlUrl,
+ httpSearchParamName,
+ httpSearchParamValue,
+ httpHeaderName,
+ httpHeaderValue,
+ httpBodyValue,
+ graphqlName,
+ graphqlUrl,
+ graphqlQuery,
+ systemName,
+ deletedName: graphqlName,
+ });
});
test("Text Content can bind to a Builder-created variable and persist after reload", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -557,55 +549,50 @@ test("Text Content can bind to a Builder-created variable and persist after relo
editorToken: "text-content-binding-editor-token",
builderToken: "text-content-binding-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const staticName = "e2eTextBindingLabel";
const staticValue = "Bound Text Content";
- try {
- await loginWithSecret({ page, email });
+ await loginWithSecret({ page, email });
- await measure("text content binding open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
+ await measure("text content binding open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await selectContentInstance({ page });
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
+ await selectContentInstance({ page });
- await measure("text content binding create variable", async () => {
- await createStringVariable({
- page,
- name: staticName,
- value: staticValue,
- });
+ await measure("text content binding create variable", async () => {
+ await createStringVariable({
+ page,
+ name: staticName,
+ value: staticValue,
});
+ });
- await measure("text content binding bind expression", async () => {
- await bindSelectedTextContentToExpression({
- page,
- expression: staticName,
- });
- await waitForCanvasText({ page, text: staticValue });
+ await measure("text content binding bind expression", async () => {
+ await bindSelectedTextContentToExpression({
+ page,
+ expression: staticName,
});
+ await waitForCanvasText({ page, text: staticValue });
+ });
- await measure("text content binding reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
+ await measure("text content binding reload builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCanvasText({ page, text: staticValue });
+ });
+ await waitForCanvasText({ page, text: staticValue });
- await measure("text content binding generated app renders", async () => {
- await expectGeneratedAppToRender({
- projectId: fixture.projectId,
- expectedText: staticValue,
- });
+ await measure("text content binding generated app renders", async () => {
+ await expectGeneratedAppToRender({
+ projectId: fixture.projectId,
+ expectedText: staticValue,
});
- } finally {
- await close();
- }
+ });
});
diff --git a/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts b/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts
new file mode 100644
index 0000000000..f44c0c39ca
--- /dev/null
+++ b/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts
@@ -0,0 +1,771 @@
+import type { Page, Response } from "@playwright/test";
+import { parseMdxDocument } from "@webstudio-is/content-engine/mdx";
+import {
+ configureDynamicDetailContentBlock,
+ configureEmptyHeadingTemplate,
+ configureRepresentableContentBlockBody,
+ configureRepeatedContentBlock,
+} from "../fixtures/mdx-content-block-project";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import {
+ getAssetIdByFilename,
+ openAssetsPanel,
+ uploadAsset,
+} from "../flows/assets-panel";
+import {
+ openProjectBuilder,
+ waitForCanvasFrame,
+ waitForCanvasText,
+ waitForCanvasTextHidden,
+} from "../flows/builder";
+import {
+ chooseContentBlockSource,
+ disconnectContentBlockSource,
+ selectContentBlock,
+ confirmContentBlockConnection,
+} from "../flows/content-block-source";
+import { replaceCanvasText } from "../flows/content-editing";
+import { waitForContentEditMode } from "../flows/content-editing";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
+import { openNavigatorPanel } from "../flows/navigator";
+import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";
+import { fillSelectedStringProperty } from "../flows/props-panel";
+import { getProjectBuilderUrl, test } from "../test";
+
+test.describe.configure({ mode: "parallel" });
+
+const sourceFilename = "content-source.mdx";
+const alternateFilename = "alternate-source.mdx";
+const unresolvedFilename = "unresolved-source.mdx";
+const emptyFilename = "empty-source.mdx";
+
+const sourceHeading = "MDX source heading";
+const editedHeading = "Edited MDX source heading";
+const editedTemplateText = "Edited MDX template heading";
+const alternateHeading = "Alternate MDX heading";
+
+const isAssetContentResponse = (response: Response, method = "PUT") =>
+ response.request().method() === method &&
+ response.url().includes("/rest/assets/") &&
+ response.url().includes("/content");
+
+const waitForAssetWrite = (page: Page, sourceIncludes?: string) =>
+ page.waitForResponse(
+ (response) =>
+ isAssetContentResponse(response) &&
+ response.status() === 200 &&
+ (sourceIncludes === undefined ||
+ response.request().postData()?.includes(sourceIncludes) === true),
+ { timeout: 30_000 }
+ );
+
+const waitForReorderedAssetWrite = ({
+ page,
+ before,
+ after,
+}: {
+ page: Page;
+ before: string;
+ after: string;
+}) =>
+ page.waitForResponse(
+ (response) => {
+ if (isAssetContentResponse(response) === false) {
+ return false;
+ }
+ const source = response.request().postData() ?? "";
+ const beforeIndex = source.indexOf(before);
+ const afterIndex = source.indexOf(after);
+ return (
+ beforeIndex !== -1 && afterIndex !== -1 && beforeIndex < afterIndex
+ );
+ },
+ { timeout: 30_000 }
+ );
+
+const expectCanvasTextOrder = async ({
+ page,
+ before,
+ after,
+}: {
+ page: Page;
+ before: string;
+ after: string;
+}) => {
+ const canvas = await waitForCanvasFrame({ page });
+ const beforeElement = canvas.getByText(before, { exact: true });
+ const afterElement = canvas.getByText(after, { exact: true });
+ const deadline = Date.now() + 10_000;
+ while (Date.now() < deadline) {
+ const afterHandle = await afterElement.elementHandle();
+ if (afterHandle !== null) {
+ const isBefore = await beforeElement.evaluate(
+ (element, afterElement) =>
+ (element.compareDocumentPosition(afterElement) &
+ Node.DOCUMENT_POSITION_FOLLOWING) !==
+ 0,
+ afterHandle
+ );
+ if (isBefore) {
+ return;
+ }
+ }
+ await page.waitForTimeout(100);
+ }
+ throw new Error(`Expected "${before}" before "${after}" on the canvas`);
+};
+
+const insertTemplateIntoEmptyContentBlock = async ({
+ page,
+ templateName,
+}: {
+ page: Page;
+ templateName: string;
+}) => {
+ await waitForContentEditMode({ page });
+ const canvas = await waitForCanvasFrame({ page });
+ const block = canvas.locator('[data-ws-component="ws:block"]').last();
+ await block.hover();
+ const insert = page.getByRole("button", { name: "Insert block" }).last();
+ await insert.waitFor({ state: "visible" });
+ await insert.focus();
+ await insert.press("Enter");
+ await page
+ .getByRole("menuitemradio", { name: templateName })
+ .click({ force: true });
+};
+
+const openFixture = async ({
+ page,
+ projectId,
+ authToken,
+ mode,
+ pageId,
+}: {
+ page: Page;
+ projectId: string;
+ authToken: string;
+ mode?: "content" | "preview";
+ pageId?: string;
+}) => {
+ await openProjectBuilder({ page, projectId, authToken, mode, pageId });
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+test("Content Block MDX source lifecycle persists edits and resets to empty", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "MDX Content Source E2E",
+ });
+ await configureRepresentableContentBlockBody(fixture.projectId);
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: sourceFilename });
+ await uploadAsset({ page, filename: alternateFilename });
+
+ await selectContentBlock({ page });
+ await chooseContentBlockSource({ page, filename: sourceFilename });
+ await confirmContentBlockConnection({ page });
+ await waitForCanvasText({ page, text: sourceHeading });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ const templateWrite = waitForAssetWrite(page).catch((error: unknown) =>
+ error instanceof Error ? error : new Error("Asset write failed")
+ );
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: sourceHeading,
+ templateName: fixture.editableTextTemplateName,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.editableTextTemplateText,
+ });
+ const templateResponse = await templateWrite;
+ if (templateResponse instanceof Error) {
+ throw templateResponse;
+ }
+ const templateDocument = await parseMdxDocument({
+ source: templateResponse.request().postData() ?? "",
+ });
+ if (
+ templateDocument.children.some(
+ (node) =>
+ node.type === "element" &&
+ node.syntax === "markdown" &&
+ node.tag === "p" &&
+ node.children.some(
+ (child) =>
+ child.type === "text" &&
+ child.value === fixture.editableTextTemplateText
+ )
+ ) === false
+ ) {
+ throw new Error(
+ "Inserting a plain Content Block template must persist as Markdown"
+ );
+ }
+ const templateTextWrite = waitForAssetWrite(page).catch((error: unknown) =>
+ error instanceof Error ? error : new Error("Asset write failed")
+ );
+ await replaceCanvasText({
+ page,
+ currentText: fixture.editableTextTemplateText,
+ text: editedTemplateText,
+ waitForProjectSync: false,
+ });
+ const templateTextResponse = await templateTextWrite;
+ if (templateTextResponse instanceof Error) {
+ throw templateTextResponse;
+ }
+ const templateTextRequestBody = templateTextResponse.request().postData();
+ const templateTextDocument = await parseMdxDocument({
+ source: templateTextRequestBody ?? "",
+ });
+ if (
+ templateTextDocument.children.some(
+ (node) =>
+ node.type === "element" &&
+ node.syntax === "markdown" &&
+ node.tag === "p" &&
+ node.children.some(
+ (child) => child.type === "text" && child.value === editedTemplateText
+ )
+ ) === false
+ ) {
+ throw new Error(
+ "Editing a plain Content Block template must persist as Markdown"
+ );
+ }
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await selectContentBlock({ page });
+ await page.getByRole("button", { name: "Open", exact: true }).click();
+ const fileEditor = page.getByRole("dialog").locator(".cm-content");
+ await fileEditor.waitFor({ state: "visible" });
+ if ((await fileEditor.textContent())?.includes(editedTemplateText) !== true) {
+ throw new Error(
+ "Opening an MDX Asset after a canvas save must show the latest content"
+ );
+ }
+ await page.keyboard.press("Escape");
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ await Promise.all([
+ waitForAssetWrite(page),
+ replaceCanvasText({
+ page,
+ currentText: sourceHeading,
+ text: editedHeading,
+ waitForProjectSync: false,
+ }),
+ ]);
+ await openNavigatorPanel({ page });
+ const contentBlockItem = page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .filter({ hasText: "Content Block" })
+ .last();
+ await contentBlockItem.press("ArrowRight");
+ const editingCanvas = await waitForCanvasFrame({ page });
+ await editingCanvas
+ .getByText("Editable MDX source text.", { exact: true })
+ .click();
+ await page.keyboard.press("Escape");
+ await Promise.all([
+ waitForReorderedAssetWrite({
+ page,
+ before: "Editable MDX source text.",
+ after: editedTemplateText,
+ }),
+ page.keyboard.press("Control+ArrowUp"),
+ ]);
+ await expectCanvasTextOrder({
+ page,
+ before: "Editable MDX source text.",
+ after: editedTemplateText,
+ });
+ const deleteWrite = waitForAssetWrite(page);
+ const canvas = await waitForCanvasFrame({ page });
+ await page.keyboard.down("Alt");
+ try {
+ await canvas.getByText(editedTemplateText, { exact: true }).hover();
+ await page.getByRole("button", { name: "Delete block" }).last().click();
+ } finally {
+ await page.keyboard.up("Alt");
+ }
+ const deleteSource = (await deleteWrite).request().postData() ?? "";
+ if (
+ deleteSource.includes(editedTemplateText) ||
+ deleteSource.includes("Editable MDX source text.") === false
+ ) {
+ throw new Error(
+ `Deleting one instance removed the wrong content: ${deleteSource}`
+ );
+ }
+ await waitForCanvasTextHidden({ page, text: editedTemplateText });
+ await waitForCanvasText({ page, text: "Editable MDX source text." });
+ await selectCanvasTextInstanceForProps({
+ page,
+ text: "Editable MDX link",
+ propertyLabel: "Href",
+ });
+ const linkWrite = waitForAssetWrite(page);
+ await fillSelectedStringProperty({
+ page,
+ label: "Href",
+ control: "url",
+ value: "https://webstudio.is",
+ waitForProjectSync: false,
+ });
+ const linkSource = (await linkWrite).request().postData() ?? "";
+ const linkDocument = await parseMdxDocument({ source: linkSource });
+ if (
+ linkDocument.children.some(
+ (node) =>
+ node.type === "element" &&
+ node.syntax === "markdown" &&
+ node.tag === "p" &&
+ node.children.some(
+ (child) =>
+ child.type === "element" &&
+ child.syntax === "markdown" &&
+ child.tag === "a" &&
+ child.props.some(
+ (prop) =>
+ prop.name === "href" && prop.value === "https://webstudio.is/"
+ ) &&
+ child.children.some(
+ (linkChild) =>
+ linkChild.type === "text" &&
+ linkChild.value === "Editable MDX link"
+ )
+ )
+ ) === false
+ ) {
+ throw new Error(`Expected Markdown link persistence: ${linkSource}`);
+ }
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForCanvasText({ page, text: editedHeading });
+ await waitForCanvasTextHidden({ page, text: editedTemplateText });
+ await selectContentBlock({ page });
+
+ await chooseContentBlockSource({
+ page,
+ filename: alternateFilename,
+ action: "Switch file",
+ });
+ await page.getByText(alternateFilename, { exact: true }).waitFor();
+ await waitForCanvasText({ page, text: alternateHeading });
+ await waitForCanvasTextHidden({ page, text: editedHeading });
+
+ await selectContentBlock({ page });
+ await page.getByRole("button", { name: "Open", exact: true }).click();
+ const alternateEditor = page.getByRole("dialog").locator(".cm-content");
+ await alternateEditor.waitFor({ state: "visible" });
+ if (
+ (await alternateEditor.textContent())?.includes(alternateHeading) !== true
+ ) {
+ throw new Error(
+ "The selected alternate MDX Asset did not contain its expected source"
+ );
+ }
+ await page.keyboard.press("Escape");
+ await disconnectContentBlockSource({ page });
+ await waitForSyncStatus({ page, status: "idle" });
+ await waitForCanvasTextHidden({ page, text: alternateHeading });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForCanvasTextHidden({ page, text: alternateHeading });
+ await selectContentBlock({ page });
+ await page
+ .getByRole("button", { name: "Connect .mdx file", exact: true })
+ .waitFor();
+});
+
+test("Empty MDX content supports insertion and keeps the next paragraph focused", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "Empty MDX Content Source E2E",
+ });
+ await configureEmptyHeadingTemplate(fixture.projectId);
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: emptyFilename });
+ await selectContentBlock({ page });
+ await chooseContentBlockSource({ page, filename: emptyFilename });
+ await confirmContentBlockConnection({ page });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ await insertTemplateIntoEmptyContentBlock({
+ page,
+ templateName: "Empty Heading Template",
+ });
+ const canvas = await waitForCanvasFrame({ page });
+ await canvas.locator("h1").waitFor({ state: "visible" });
+ const headingEditor = canvas.locator("h1[contenteditable]");
+ await headingEditor.waitFor({ state: "visible" });
+ await page.keyboard.type("First heading");
+ await headingEditor.getByText("First heading", { exact: true }).waitFor();
+ await page.keyboard.press("Enter");
+
+ const paragraphEditor = canvas.locator("p[contenteditable]");
+ await paragraphEditor.waitFor({ state: "visible" });
+ await page.keyboard.press("/");
+ await page
+ .getByRole("menuitemradio", { name: "Empty Heading Template" })
+ .last()
+ .waitFor({ state: "visible" });
+ await page.keyboard.press("Escape");
+ const paragraphWrite = waitForAssetWrite(page, "Focused paragraph");
+ const paragraphMetadataWrite = waitForChangeToBeSaved({ page });
+ await page.keyboard.type("Focused paragraph");
+ const paragraphId = await paragraphEditor.getAttribute("data-ws-id");
+ if (paragraphId === null) {
+ throw new Error("Expected the focused paragraph instance id");
+ }
+ await page.keyboard.press("Enter");
+ const emptyParagraphEditor = canvas.locator(
+ `p[contenteditable]:not([data-ws-id="${paragraphId}"])`
+ );
+ await emptyParagraphEditor.waitFor({ state: "visible" });
+ await paragraphWrite;
+ await paragraphMetadataWrite;
+ const emptyParagraphId =
+ await emptyParagraphEditor.getAttribute("data-ws-id");
+ if (emptyParagraphId === null) {
+ throw new Error("Expected the new paragraph instance id");
+ }
+ await page.keyboard.press("ControlOrMeta+A");
+ await page.keyboard.press("Backspace");
+ await page.keyboard.press("Backspace");
+ await canvas
+ .locator(`p[data-ws-id="${emptyParagraphId}"]`)
+ .waitFor({ state: "detached" });
+ if (
+ (await paragraphEditor.evaluate(
+ (element) =>
+ element === document.activeElement ||
+ element.contains(document.activeElement)
+ )) === false
+ ) {
+ throw new Error("Expected the previous paragraph to regain focus");
+ }
+ const finalWrite = waitForAssetWrite(page);
+ await page.mouse.click(5, 5);
+ const finalSource = (await finalWrite).request().postData() ?? "";
+ if (
+ finalSource.includes("# First heading") === false ||
+ finalSource.includes("Focused paragraph") === false ||
+ finalSource.includes('ws:tag="p"')
+ ) {
+ throw new Error(`Unexpected final MDX source: ${finalSource}`);
+ }
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ await waitForCanvasText({ page, text: "First heading" });
+ await waitForCanvasText({ page, text: "Focused paragraph" });
+});
+
+test("Content Block requires a Builder reload after a stale file revision", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "MDX Content Conflict E2E",
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: sourceFilename });
+ await selectContentBlock({ page });
+ await chooseContentBlockSource({ page, filename: sourceFilename });
+ await confirmContentBlockConnection({ page });
+ await waitForCanvasText({ page, text: sourceHeading });
+ await waitForSyncStatus({ page, status: "idle" });
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+
+ await page.route("**/rest/assets/*/content?*", async (route) => {
+ if (route.request().method() === "PUT") {
+ await route.fulfill({
+ status: 409,
+ contentType: "application/json",
+ body: JSON.stringify({ message: "Asset revision conflict" }),
+ });
+ return;
+ }
+ await route.continue();
+ });
+
+ let reloadPromptMessage: string | undefined;
+ const reloadPromptHandled = new Promise<void>((resolve) => {
+ page.once("dialog", (dialog) => {
+ reloadPromptMessage = dialog.message();
+ void dialog.dismiss().then(resolve);
+ });
+ });
+ await replaceCanvasText({
+ page,
+ currentText: sourceHeading,
+ text: "Unsaved conflict heading",
+ waitForProjectSync: false,
+ });
+ await reloadPromptHandled;
+ if (
+ reloadPromptMessage !==
+ "This file changed since it was opened. Reload it before saving again."
+ ) {
+ throw new Error(
+ `Expected stale revision reload prompt: ${reloadPromptMessage}`
+ );
+ }
+ await page
+ .getByRole("status")
+ .filter({
+ hasText: "Synchronization has been paused. Please reload to continue.",
+ })
+ .first()
+ .waitFor();
+
+ await page.unroute("**/rest/assets/*/content?*");
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await waitForCanvasText({ page, text: sourceHeading });
+});
+
+test("Unresolved MDX templates are selectable only in the Builder canvas", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "MDX Content Warning E2E",
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: unresolvedFilename });
+ await selectContentBlock({ page });
+ await chooseContentBlockSource({ page, filename: unresolvedFilename });
+ await confirmContentBlockConnection({ page });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await waitForCanvasText({ page, text: "Valid MDX sibling" });
+ await waitForCanvasText({
+ page,
+ text: "Valid content after the missing template.",
+ });
+ const canvas = await waitForCanvasFrame({ page });
+ const warning = canvas.getByText("Missing template: Missing E2E Template", {
+ exact: true,
+ });
+ await warning.waitFor();
+ await warning.click();
+ await selectContentBlock({ page });
+ await page.getByRole("img", { name: /^MDX source warning:/ }).waitFor();
+ await page.getByRole("button", { name: "Open", exact: true }).waitFor();
+
+ const previewUrl = getProjectBuilderUrl({
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "preview",
+ });
+ await page.goto(previewUrl);
+ await waitForCanvasText({ page, text: "Valid MDX sibling" });
+ await waitForCanvasText({
+ page,
+ text: "Valid content after the missing template.",
+ });
+ const previewCanvas = await waitForCanvasFrame({ page });
+ await previewCanvas
+ .getByText("Missing template: Missing E2E Template", { exact: true })
+ .waitFor({ state: "hidden" });
+});
+
+test("Dynamic detail source follows the selected route parameter", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "MDX Content Detail E2E",
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: sourceFilename });
+ await uploadAsset({ page, filename: alternateFilename });
+ const sourceAssetId = await getAssetIdByFilename({
+ page,
+ filename: sourceFilename,
+ });
+ const alternateAssetId = await getAssetIdByFilename({
+ page,
+ filename: alternateFilename,
+ });
+ const detailPageId = await configureDynamicDetailContentBlock({
+ projectId: fixture.projectId,
+ initialAssetId: sourceAssetId,
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ pageId: detailPageId,
+ });
+ await waitForCanvasText({ page, text: sourceHeading });
+
+ await page
+ .getByRole("button", { name: "Toggle dynamic page address" })
+ .click();
+ const parameter = page.getByPlaceholder("assetid");
+ await parameter.fill(alternateAssetId);
+ await parameter.press("Enter");
+ await waitForCanvasText({ page, text: alternateHeading });
+ await waitForCanvasTextHidden({ page, text: sourceHeading });
+
+ await page
+ .getByRole("button", { name: "Toggle dynamic page address" })
+ .click();
+ await page.getByPlaceholder("assetid").fill(sourceAssetId);
+ await page.getByPlaceholder("assetid").press("Enter");
+ await waitForCanvasText({ page, text: sourceHeading });
+ await waitForCanvasTextHidden({ page, text: alternateHeading });
+});
+
+test("Repeated Content Block scopes edit distinct MDX files without leakage", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createContentModeProject({
+ context: context,
+ email: "[email protected]",
+ title: "MDX Content Repeated E2E",
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ });
+ await openAssetsPanel({ page });
+ await uploadAsset({ page, filename: sourceFilename });
+ await uploadAsset({ page, filename: alternateFilename });
+ const sourceAssetId = await getAssetIdByFilename({
+ page,
+ filename: sourceFilename,
+ });
+ const alternateAssetId = await getAssetIdByFilename({
+ page,
+ filename: alternateFilename,
+ });
+ await configureRepeatedContentBlock({
+ projectId: fixture.projectId,
+ assetIds: [sourceAssetId, alternateAssetId],
+ });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ });
+ await waitForCanvasText({ page, text: sourceHeading });
+ await waitForCanvasText({ page, text: alternateHeading });
+
+ const write = waitForAssetWrite(page);
+ await replaceCanvasText({
+ page,
+ currentText: sourceHeading,
+ text: editedHeading,
+ waitForProjectSync: false,
+ });
+ await write;
+ await waitForCanvasText({ page, text: editedHeading });
+ await waitForCanvasText({ page, text: alternateHeading });
+
+ await openFixture({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ });
+ await waitForCanvasText({ page, text: editedHeading });
+ await waitForCanvasText({ page, text: alternateHeading });
+});
diff --git a/apps/builder/e2e/tests/mdx-content-block.e2e.ts b/apps/builder/e2e/tests/mdx-content-block.e2e.ts
deleted file mode 100644
index d0fa8624d3..0000000000
--- a/apps/builder/e2e/tests/mdx-content-block.e2e.ts
+++ /dev/null
@@ -1,789 +0,0 @@
-import type { Page, Response } from "@playwright/test";
-import { parseMdxDocument } from "@webstudio-is/content-engine/mdx";
-import {
- configureDynamicDetailContentBlock,
- configureEmptyHeadingTemplate,
- configureRepresentableContentBlockBody,
- configureRepeatedContentBlock,
-} from "../fixtures/mdx-content-block-project";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import {
- getAssetIdByFilename,
- openAssetsPanel,
- uploadAsset,
-} from "../flows/assets-panel";
-import {
- openProjectBuilder,
- waitForCanvasFrame,
- waitForCanvasText,
- waitForCanvasTextHidden,
-} from "../flows/builder";
-import {
- chooseContentBlockSource,
- disconnectContentBlockSource,
- selectContentBlock,
- confirmContentBlockConnection,
-} from "../flows/content-block-source";
-import { replaceCanvasText } from "../flows/content-editing";
-import { waitForContentEditMode } from "../flows/content-editing";
-import { waitForSyncStatus } from "../flows/sync-status";
-import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
-import { openNavigatorPanel } from "../flows/navigator";
-import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";
-import { fillSelectedStringProperty } from "../flows/props-panel";
-import { getProjectBuilderUrl, newIsolatedPage, test } from "../test";
-
-const sourceFilename = "content-source.mdx";
-const alternateFilename = "alternate-source.mdx";
-const unresolvedFilename = "unresolved-source.mdx";
-const emptyFilename = "empty-source.mdx";
-
-const sourceHeading = "MDX source heading";
-const editedHeading = "Edited MDX source heading";
-const editedTemplateText = "Edited MDX template heading";
-const alternateHeading = "Alternate MDX heading";
-
-const isAssetContentResponse = (response: Response, method = "PUT") =>
- response.request().method() === method &&
- response.url().includes("/rest/assets/") &&
- response.url().includes("/content");
-
-const waitForAssetWrite = (page: Page) =>
- page.waitForResponse(
- (response) => isAssetContentResponse(response) && response.status() === 200,
- { timeout: 30_000 }
- );
-
-const waitForReorderedAssetWrite = ({
- page,
- before,
- after,
-}: {
- page: Page;
- before: string;
- after: string;
-}) =>
- page.waitForResponse(
- (response) => {
- if (isAssetContentResponse(response) === false) {
- return false;
- }
- const source = response.request().postData() ?? "";
- const beforeIndex = source.indexOf(before);
- const afterIndex = source.indexOf(after);
- return (
- beforeIndex !== -1 && afterIndex !== -1 && beforeIndex < afterIndex
- );
- },
- { timeout: 30_000 }
- );
-
-const expectCanvasTextOrder = async ({
- page,
- before,
- after,
-}: {
- page: Page;
- before: string;
- after: string;
-}) => {
- const canvas = await waitForCanvasFrame({ page });
- const beforeElement = canvas.getByText(before, { exact: true });
- const afterElement = canvas.getByText(after, { exact: true });
- const deadline = Date.now() + 10_000;
- while (Date.now() < deadline) {
- const afterHandle = await afterElement.elementHandle();
- if (afterHandle !== null) {
- const isBefore = await beforeElement.evaluate(
- (element, afterElement) =>
- (element.compareDocumentPosition(afterElement) &
- Node.DOCUMENT_POSITION_FOLLOWING) !==
- 0,
- afterHandle
- );
- if (isBefore) {
- return;
- }
- }
- await page.waitForTimeout(100);
- }
- throw new Error(`Expected "${before}" before "${after}" on the canvas`);
-};
-
-const insertTemplateIntoEmptyContentBlock = async ({
- page,
- templateName,
-}: {
- page: Page;
- templateName: string;
-}) => {
- await waitForContentEditMode({ page });
- const canvas = await waitForCanvasFrame({ page });
- const block = canvas.locator('[data-ws-component="ws:block"]').last();
- await block.hover();
- const insert = page.getByRole("button", { name: "Insert block" }).last();
- await insert.waitFor({ state: "visible" });
- await insert.focus();
- await insert.press("Enter");
- await page.getByRole("menuitemradio", { name: templateName }).click();
-};
-
-const openFixture = async ({
- page,
- projectId,
- authToken,
- mode,
- pageId,
-}: {
- page: Page;
- projectId: string;
- authToken: string;
- mode?: "content" | "preview";
- pageId?: string;
-}) => {
- await openProjectBuilder({ page, projectId, authToken, mode, pageId });
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-test("Content Block MDX source lifecycle persists edits and resets to empty", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "MDX Content Source E2E",
- });
- await configureRepresentableContentBlockBody(fixture.projectId);
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: sourceFilename });
- await uploadAsset({ page, filename: alternateFilename });
-
- await selectContentBlock({ page });
- await chooseContentBlockSource({ page, filename: sourceFilename });
- await confirmContentBlockConnection({ page });
- await waitForCanvasText({ page, text: sourceHeading });
- await waitForSyncStatus({ page, status: "idle" });
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- const templateWrite = waitForAssetWrite(page).catch((error: unknown) =>
- error instanceof Error ? error : new Error("Asset write failed")
- );
- await insertTemplateAfterCanvasText({
- page,
- anchorText: sourceHeading,
- templateName: fixture.editableTextTemplateName,
- });
- await waitForCanvasText({
- page,
- text: fixture.editableTextTemplateText,
- });
- const templateResponse = await templateWrite;
- if (templateResponse instanceof Error) {
- throw templateResponse;
- }
- const templateDocument = await parseMdxDocument({
- source: templateResponse.request().postData() ?? "",
- });
- if (
- templateDocument.children.some(
- (node) =>
- node.type === "element" &&
- node.syntax === "markdown" &&
- node.tag === "p" &&
- node.children.some(
- (child) =>
- child.type === "text" &&
- child.value === fixture.editableTextTemplateText
- )
- ) === false
- ) {
- throw new Error(
- "Inserting a plain Content Block template must persist as Markdown"
- );
- }
- const templateTextWrite = waitForAssetWrite(page).catch((error: unknown) =>
- error instanceof Error ? error : new Error("Asset write failed")
- );
- await replaceCanvasText({
- page,
- currentText: fixture.editableTextTemplateText,
- text: editedTemplateText,
- waitForProjectSync: false,
- });
- const templateTextResponse = await templateTextWrite;
- if (templateTextResponse instanceof Error) {
- throw templateTextResponse;
- }
- const templateTextRequestBody = templateTextResponse.request().postData();
- const templateTextDocument = await parseMdxDocument({
- source: templateTextRequestBody ?? "",
- });
- if (
- templateTextDocument.children.some(
- (node) =>
- node.type === "element" &&
- node.syntax === "markdown" &&
- node.tag === "p" &&
- node.children.some(
- (child) =>
- child.type === "text" && child.value === editedTemplateText
- )
- ) === false
- ) {
- throw new Error(
- "Editing a plain Content Block template must persist as Markdown"
- );
- }
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await selectContentBlock({ page });
- await page.getByRole("button", { name: "Open", exact: true }).click();
- const fileEditor = page.getByRole("dialog").locator(".cm-content");
- await fileEditor.waitFor({ state: "visible" });
- if (
- (await fileEditor.textContent())?.includes(editedTemplateText) !== true
- ) {
- throw new Error(
- "Opening an MDX Asset after a canvas save must show the latest content"
- );
- }
- await page.keyboard.press("Escape");
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- await Promise.all([
- waitForAssetWrite(page),
- replaceCanvasText({
- page,
- currentText: sourceHeading,
- text: editedHeading,
- waitForProjectSync: false,
- }),
- ]);
- await openNavigatorPanel({ page });
- const contentBlockItem = page
- .locator("[data-navigator-tree] [data-tree-button]")
- .filter({ hasText: "Content Block" })
- .last();
- await contentBlockItem.press("ArrowRight");
- const editingCanvas = await waitForCanvasFrame({ page });
- await editingCanvas
- .getByText("Editable MDX source text.", { exact: true })
- .click();
- await page.keyboard.press("Escape");
- await Promise.all([
- waitForReorderedAssetWrite({
- page,
- before: "Editable MDX source text.",
- after: editedTemplateText,
- }),
- page.keyboard.press("Control+ArrowUp"),
- ]);
- await expectCanvasTextOrder({
- page,
- before: "Editable MDX source text.",
- after: editedTemplateText,
- });
- const deleteWrite = waitForAssetWrite(page);
- const canvas = await waitForCanvasFrame({ page });
- await page.keyboard.down("Alt");
- try {
- await canvas.getByText(editedTemplateText, { exact: true }).hover();
- await page.getByRole("button", { name: "Delete block" }).last().click();
- } finally {
- await page.keyboard.up("Alt");
- }
- const deleteSource = (await deleteWrite).request().postData() ?? "";
- if (
- deleteSource.includes(editedTemplateText) ||
- deleteSource.includes("Editable MDX source text.") === false
- ) {
- throw new Error(
- `Deleting one instance removed the wrong content: ${deleteSource}`
- );
- }
- await waitForCanvasTextHidden({ page, text: editedTemplateText });
- await waitForCanvasText({ page, text: "Editable MDX source text." });
- await selectCanvasTextInstanceForProps({
- page,
- text: "Editable MDX link",
- propertyLabel: "Href",
- });
- const linkWrite = waitForAssetWrite(page);
- await fillSelectedStringProperty({
- page,
- label: "Href",
- control: "url",
- value: "https://webstudio.is",
- waitForProjectSync: false,
- });
- const linkSource = (await linkWrite).request().postData() ?? "";
- const linkDocument = await parseMdxDocument({ source: linkSource });
- if (
- linkDocument.children.some(
- (node) =>
- node.type === "element" &&
- node.syntax === "markdown" &&
- node.tag === "p" &&
- node.children.some(
- (child) =>
- child.type === "element" &&
- child.syntax === "markdown" &&
- child.tag === "a" &&
- child.props.some(
- (prop) =>
- prop.name === "href" && prop.value === "https://webstudio.is/"
- ) &&
- child.children.some(
- (linkChild) =>
- linkChild.type === "text" &&
- linkChild.value === "Editable MDX link"
- )
- )
- ) === false
- ) {
- throw new Error(`Expected Markdown link persistence: ${linkSource}`);
- }
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: editedHeading });
- await waitForCanvasTextHidden({ page, text: editedTemplateText });
- await selectContentBlock({ page });
-
- await chooseContentBlockSource({
- page,
- filename: alternateFilename,
- action: "Switch file",
- });
- await page.getByText(alternateFilename, { exact: true }).waitFor();
- await waitForCanvasText({ page, text: alternateHeading });
- await waitForCanvasTextHidden({ page, text: editedHeading });
-
- await selectContentBlock({ page });
- await page.getByRole("button", { name: "Open", exact: true }).click();
- const alternateEditor = page.getByRole("dialog").locator(".cm-content");
- await alternateEditor.waitFor({ state: "visible" });
- if (
- (await alternateEditor.textContent())?.includes(alternateHeading) !== true
- ) {
- throw new Error(
- "The selected alternate MDX Asset did not contain its expected source"
- );
- }
- await page.keyboard.press("Escape");
- await disconnectContentBlockSource({ page });
- await waitForSyncStatus({ page, status: "idle" });
- await waitForCanvasTextHidden({ page, text: alternateHeading });
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasTextHidden({ page, text: alternateHeading });
- await selectContentBlock({ page });
- await page
- .getByRole("button", { name: "Connect .mdx file", exact: true })
- .waitFor();
- } finally {
- await close();
- }
-});
-
-test("Empty MDX content supports insertion and keeps the next paragraph focused", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "Empty MDX Content Source E2E",
- });
- await configureEmptyHeadingTemplate(fixture.projectId);
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: emptyFilename });
- await selectContentBlock({ page });
- await chooseContentBlockSource({ page, filename: emptyFilename });
- await confirmContentBlockConnection({ page });
- await waitForSyncStatus({ page, status: "idle" });
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- await insertTemplateIntoEmptyContentBlock({
- page,
- templateName: "Empty Heading Template",
- });
- const canvas = await waitForCanvasFrame({ page });
- await canvas.locator("h1").waitFor({ state: "visible" });
- const headingEditor = canvas.locator("h1[contenteditable]");
- await headingEditor.waitFor({ state: "visible" });
- await page.keyboard.type("First heading");
- await headingEditor.getByText("First heading", { exact: true }).waitFor();
- await page.keyboard.press("Enter");
-
- const paragraphEditor = canvas.locator("p[contenteditable]");
- await paragraphEditor.waitFor({ state: "visible" });
- await page.keyboard.press("/");
- await page
- .getByRole("menuitemradio", { name: "Empty Heading Template" })
- .last()
- .waitFor({ state: "visible" });
- await page.keyboard.press("Escape");
- await page.keyboard.type("Focused paragraph");
- const paragraphId = await paragraphEditor.getAttribute("data-ws-id");
- if (paragraphId === null) {
- throw new Error("Expected the focused paragraph instance id");
- }
- await page.keyboard.press("Enter");
- const emptyParagraphEditor = canvas.locator(
- `p[contenteditable]:not([data-ws-id="${paragraphId}"])`
- );
- await emptyParagraphEditor.waitFor({ state: "visible" });
- const emptyParagraphId =
- await emptyParagraphEditor.getAttribute("data-ws-id");
- if (emptyParagraphId === null) {
- throw new Error("Expected the new paragraph instance id");
- }
- await page.keyboard.press("ControlOrMeta+A");
- await page.keyboard.press("Backspace");
- await page.keyboard.press("Backspace");
- await canvas
- .locator(`p[data-ws-id="${emptyParagraphId}"]`)
- .waitFor({ state: "detached" });
- if (
- (await paragraphEditor.evaluate(
- (element) =>
- element === document.activeElement ||
- element.contains(document.activeElement)
- )) === false
- ) {
- throw new Error("Expected the previous paragraph to regain focus");
- }
- const finalWrite = waitForAssetWrite(page);
- await page.mouse.click(5, 5);
- const finalSource = (await finalWrite).request().postData() ?? "";
- if (
- finalSource.includes("# First heading") === false ||
- finalSource.includes("Focused paragraph") === false ||
- finalSource.includes('ws:tag="p"')
- ) {
- throw new Error(`Unexpected final MDX source: ${finalSource}`);
- }
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- await waitForCanvasText({ page, text: "First heading" });
- await waitForCanvasText({ page, text: "Focused paragraph" });
- } finally {
- await close();
- }
-});
-
-test("Content Block requires a Builder reload after a stale file revision", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "MDX Content Conflict E2E",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: sourceFilename });
- await selectContentBlock({ page });
- await chooseContentBlockSource({ page, filename: sourceFilename });
- await confirmContentBlockConnection({ page });
- await waitForCanvasText({ page, text: sourceHeading });
- await waitForSyncStatus({ page, status: "idle" });
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
-
- await page.route("**/rest/assets/*/content?*", async (route) => {
- if (route.request().method() === "PUT") {
- await route.fulfill({
- status: 409,
- contentType: "application/json",
- body: JSON.stringify({ message: "Asset revision conflict" }),
- });
- return;
- }
- await route.continue();
- });
-
- let reloadPromptMessage: string | undefined;
- const reloadPromptHandled = new Promise<void>((resolve) => {
- page.once("dialog", (dialog) => {
- reloadPromptMessage = dialog.message();
- void dialog.dismiss().then(resolve);
- });
- });
- await replaceCanvasText({
- page,
- currentText: sourceHeading,
- text: "Unsaved conflict heading",
- waitForProjectSync: false,
- });
- await reloadPromptHandled;
- if (
- reloadPromptMessage !==
- "This file changed since it was opened. Reload it before saving again."
- ) {
- throw new Error(
- `Expected stale revision reload prompt: ${reloadPromptMessage}`
- );
- }
- await page
- .getByRole("status")
- .filter({
- hasText: "Synchronization has been paused. Please reload to continue.",
- })
- .first()
- .waitFor();
-
- await page.unroute("**/rest/assets/*/content?*");
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: sourceHeading });
- } finally {
- await close();
- }
-});
-
-test("Unresolved MDX templates are selectable only in the Builder canvas", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "MDX Content Warning E2E",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: unresolvedFilename });
- await selectContentBlock({ page });
- await chooseContentBlockSource({ page, filename: unresolvedFilename });
- await confirmContentBlockConnection({ page });
- await waitForSyncStatus({ page, status: "idle" });
-
- await waitForCanvasText({ page, text: "Valid MDX sibling" });
- await waitForCanvasText({
- page,
- text: "Valid content after the missing template.",
- });
- const canvas = await waitForCanvasFrame({ page });
- const warning = canvas.getByText("Missing template: Missing E2E Template", {
- exact: true,
- });
- await warning.waitFor();
- await warning.click();
- await selectContentBlock({ page });
- await page.getByRole("img", { name: /^MDX source warning:/ }).waitFor();
- await page.getByRole("button", { name: "Open", exact: true }).waitFor();
-
- const previewUrl = getProjectBuilderUrl({
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "preview",
- });
- await page.goto(previewUrl);
- await waitForCanvasText({ page, text: "Valid MDX sibling" });
- await waitForCanvasText({
- page,
- text: "Valid content after the missing template.",
- });
- const previewCanvas = await waitForCanvasFrame({ page });
- await previewCanvas
- .getByText("Missing template: Missing E2E Template", { exact: true })
- .waitFor({ state: "hidden" });
- } finally {
- await close();
- }
-});
-
-test("Dynamic detail source follows the selected route parameter", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "MDX Content Detail E2E",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: sourceFilename });
- await uploadAsset({ page, filename: alternateFilename });
- const sourceAssetId = await getAssetIdByFilename({
- page,
- filename: sourceFilename,
- });
- const alternateAssetId = await getAssetIdByFilename({
- page,
- filename: alternateFilename,
- });
- const detailPageId = await configureDynamicDetailContentBlock({
- projectId: fixture.projectId,
- initialAssetId: sourceAssetId,
- });
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- pageId: detailPageId,
- });
- await waitForCanvasText({ page, text: sourceHeading });
-
- await page
- .getByRole("button", { name: "Toggle dynamic page address" })
- .click();
- const parameter = page.getByPlaceholder("assetid");
- await parameter.fill(alternateAssetId);
- await parameter.press("Enter");
- await waitForCanvasText({ page, text: alternateHeading });
- await waitForCanvasTextHidden({ page, text: sourceHeading });
-
- await page
- .getByRole("button", { name: "Toggle dynamic page address" })
- .click();
- await page.getByPlaceholder("assetid").fill(sourceAssetId);
- await page.getByPlaceholder("assetid").press("Enter");
- await waitForCanvasText({ page, text: sourceHeading });
- await waitForCanvasTextHidden({ page, text: alternateHeading });
- } finally {
- await close();
- }
-});
-
-test("Repeated Content Block scopes edit distinct MDX files without leakage", async ({
- browser,
- context,
-}) => {
- const fixture = await createContentModeProject({
- context: context,
- email: "[email protected]",
- title: "MDX Content Repeated E2E",
- });
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- });
- await openAssetsPanel({ page });
- await uploadAsset({ page, filename: sourceFilename });
- await uploadAsset({ page, filename: alternateFilename });
- const sourceAssetId = await getAssetIdByFilename({
- page,
- filename: sourceFilename,
- });
- const alternateAssetId = await getAssetIdByFilename({
- page,
- filename: alternateFilename,
- });
- await configureRepeatedContentBlock({
- projectId: fixture.projectId,
- assetIds: [sourceAssetId, alternateAssetId],
- });
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- });
- await waitForCanvasText({ page, text: sourceHeading });
- await waitForCanvasText({ page, text: alternateHeading });
-
- const write = waitForAssetWrite(page);
- await replaceCanvasText({
- page,
- currentText: sourceHeading,
- text: editedHeading,
- waitForProjectSync: false,
- });
- await write;
- await waitForCanvasText({ page, text: editedHeading });
- await waitForCanvasText({ page, text: alternateHeading });
-
- await openFixture({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- });
- await waitForCanvasText({ page, text: editedHeading });
- await waitForCanvasText({ page, text: alternateHeading });
- } 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..ddf4a43f15
--- /dev/null
+++ b/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts
@@ -0,0 +1,76 @@
+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 { test, withBrowserContext } from "../test";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createDragProject(context, "navigator")
+ );
+});
+
+test("Navigator pointer drag reorders and reparents instances", async ({
+ page,
+}) => {
+ 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));
+});
diff --git a/apps/builder/e2e/tests/navigator-drag.e2e.ts b/apps/builder/e2e/tests/navigator-drag.e2e.ts
deleted file mode 100644
index efdf5adae9..0000000000
--- a/apps/builder/e2e/tests/navigator-drag.e2e.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-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, withBrowserContext } from "../test";
-
-let fixture: Awaited<ReturnType<typeof createDragProject>>;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createDragProject(context, "navigator")
- );
-});
-
-test("Navigator pointer drag reorders and reparents instances", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- 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-bridge.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/pages-actions-bridge.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..635bad8525
--- /dev/null
+++ b/apps/builder/e2e/tests/pages-actions-bridge.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,540 @@
+import type { Page } from "@playwright/test";
+import {
+ openProjectBuilder,
+ waitForCanvasText,
+ waitForCanvasTextHidden,
+} from "../flows/builder";
+import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { openNavigatorPanel } from "../flows/navigator";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+let fixture: SeededContentModeProject;
+
+const getInstanceComponentCount = async ({
+ fixture,
+ component,
+}: {
+ fixture: SeededContentModeProject;
+ component: string;
+}) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ const instances = JSON.parse(build.instances) as Array<{
+ component: string;
+ }>;
+ return instances.filter((instance) => instance.component === component)
+ .length;
+};
+
+const getInstanceComponentCountSummary = async (
+ fixture: SeededContentModeProject
+) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ const instances = JSON.parse(build.instances) as Array<{
+ component: string;
+ }>;
+ const counts = new Map<string, number>();
+ for (const { component } of instances) {
+ counts.set(component, (counts.get(component) ?? 0) + 1);
+ }
+ return Array.from(counts, ([component, count]) => `${component}:${count}`)
+ .sort()
+ .join(", ");
+};
+
+const selectAppMenuItem = async ({
+ page,
+ name,
+}: {
+ page: Page;
+ name: string;
+}) => {
+ await page.bringToFront();
+ await page.getByRole("button", { name: "Menu", exact: true }).click();
+ const menuItem = page.getByRole("menuitem", { name });
+ await menuItem.waitFor();
+ await menuItem.click();
+};
+
+const undoShortcut = async ({
+ page,
+ waitForSave = true,
+}: {
+ page: Page;
+ waitForSave?: boolean;
+}) => {
+ await waitForSyncStatus({ page, status: "idle" });
+ const save =
+ waitForSave === true
+ ? waitForChangeToBeSaved({ page, timeout: 30_000 })
+ : undefined;
+ await selectAppMenuItem({ page, name: "Undo" });
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const redoShortcut = async ({ page }: { page: Page }) => {
+ await waitForSyncStatus({ page, status: "idle" });
+ const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
+ await selectAppMenuItem({ page, name: "Redo" });
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const openComponentsPanel = async ({ page }: { page: Page }) => {
+ await page.getByRole("tab", { name: "Components" }).click();
+ await page.getByPlaceholder("Find components").waitFor();
+};
+
+const searchComponentsPanel = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ const search = page.getByPlaceholder("Find components");
+ await search.fill(text);
+};
+
+const expectComponentPanelOptionHidden = async ({
+ page,
+ name,
+}: {
+ page: Page;
+ name: string;
+}) => {
+ await searchComponentsPanel({ page, text: name });
+ await page
+ .getByRole("option", { name, exact: true })
+ .waitFor({ state: "hidden" });
+};
+
+const insertComponentPanelOption = async ({
+ page,
+ name,
+}: {
+ page: Page;
+ name: string;
+}) => {
+ await searchComponentsPanel({ page, text: name });
+ await page.getByRole("option", { name, exact: true }).click();
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const getNavigatorButtonSummary = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ return await page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .evaluateAll((buttons, text) => {
+ return buttons
+ .map((button, index) => ({
+ index,
+ selected: button.getAttribute("aria-selected"),
+ text: button.textContent?.replace(/\s+/g, " ").trim() ?? "",
+ }))
+ .filter((button) =>
+ button.text.toLowerCase().includes((text as string).toLowerCase())
+ );
+ }, text);
+};
+
+const selectNavigatorContextAction = async ({
+ page,
+ itemName,
+ action,
+}: {
+ page: Page;
+ itemName: string;
+ action: "Duplicate" | "Delete";
+}) => {
+ const selectedMatchingItem = page
+ .locator('[data-navigator-tree] [data-tree-button][aria-selected="true"]')
+ .filter({ hasText: itemName })
+ .first();
+ const fallbackItem = page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .filter({ hasText: itemName })
+ .first();
+ const item =
+ (await selectedMatchingItem.count()) > 0
+ ? selectedMatchingItem
+ : fallbackItem;
+ await item.waitFor({ state: "visible" });
+ // The Navigator can intentionally skip the first click after a prior
+ // pointer interaction. A second ordinary click guarantees the context menu
+ // action runs against this row's fresh single selection.
+ await item.click();
+ await item.click();
+ await item.click({ button: "right" });
+ const menuItem = page.getByRole("menuitem", { name: action });
+ await menuItem.waitFor({ state: "visible" });
+ const ariaDisabled = await menuItem.getAttribute("aria-disabled");
+ const dataDisabled = await menuItem.getAttribute("data-disabled");
+ if (ariaDisabled === "true" || dataDisabled !== null) {
+ throw new Error(
+ `Expected Navigator ${action} action to be enabled. aria-disabled=${ariaDisabled}, data-disabled=${dataDisabled}`
+ );
+ }
+ await menuItem.click();
+ await waitForChangeToBeSaved({ page });
+};
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createContentModeProject({
+ context,
+ email: "[email protected]",
+ title: "Pages Actions E2E",
+ assetNamePrefix: "pages-actions-",
+ editorToken: "pages-actions-e2e-editor-token",
+ builderToken: "pages-actions-e2e-builder-token",
+ })
+ );
+});
+
+test("Builder can insert through the engine bridge, undo, redo, and reload", async ({
+ page,
+}) => {
+ await measure("pages actions open builder for engine bridge", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ await measure("pages actions insert template through bridge", async () => {
+ await insertTemplateAfterCanvasText({
+ page,
+ anchorText: "Initial content",
+ templateName: fixture.styledHeadingTemplateName,
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ });
+
+ await measure("pages actions undo bridge insert", async () => {
+ await undoShortcut({ page, waitForSave: false });
+ });
+ await waitForCanvasTextHidden({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ });
+
+ await measure("pages actions redo bridge insert", async () => {
+ await redoShortcut({ page });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ });
+
+ await measure("pages actions reload bridge insert", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.editorToken,
+ mode: "content",
+ });
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.styledHeadingTemplateText,
+ });
+});
+
+test("Builder Components panel filters catalog-only entries and inserts a persisted component", async ({
+ page,
+}) => {
+ const insertedButtonText = "Button";
+
+ await measure("pages actions open builder for components panel", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ await measure(
+ "pages actions verify components panel catalog filters",
+ async () => {
+ await openComponentsPanel({ page });
+ await expectComponentPanelOptionHidden({ page, name: "Box" });
+ await expectComponentPanelOptionHidden({ page, name: "Body" });
+ }
+ );
+
+ await selectCanvasTextInstance({ page, text: "Initial content" });
+ await measure(
+ "pages actions insert component from components panel",
+ async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({ page, name: "Button" });
+ }
+ );
+ await waitForCanvasText({ page, text: insertedButtonText });
+
+ await measure("pages actions reload components panel insert", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: insertedButtonText });
+});
+
+test("Builder can duplicate a component through the engine bridge, undo, redo, and reload", async ({
+ page,
+}) => {
+ const componentName = "Image";
+
+ await measure("pages actions open builder for command panel", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await selectCanvasTextInstance({ page, text: "Initial content" });
+
+ const initialCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+
+ await measure(
+ "pages actions insert component before command duplicate",
+ async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({ page, name: componentName });
+ }
+ );
+ const insertedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (insertedCount !== initialCount + 1) {
+ throw new Error(
+ `Expected components panel to insert one ${componentName}. Before ${initialCount}, after ${insertedCount}`
+ );
+ }
+
+ await measure("pages actions duplicate inserted component", async () => {
+ await page.keyboard.press("ControlOrMeta+D");
+ await waitForSyncStatus({ page, status: "idle" });
+ });
+ const duplicatedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (duplicatedCount !== initialCount + 2) {
+ throw new Error(
+ `Expected duplicate command to add one ${componentName}. Before ${initialCount}, after ${duplicatedCount}`
+ );
+ }
+
+ await measure("pages actions undo duplicate command", async () => {
+ await undoShortcut({ page });
+ });
+ const undoCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (undoCount !== initialCount + 1) {
+ throw new Error(
+ `Expected undo to remove duplicated ${componentName}. Before ${initialCount}, after ${undoCount}`
+ );
+ }
+
+ await measure("pages actions redo duplicate command", async () => {
+ await redoShortcut({ page });
+ });
+ const redoCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (redoCount !== initialCount + 2) {
+ throw new Error(
+ `Expected redo to restore duplicated ${componentName}. Before ${initialCount}, after ${redoCount}`
+ );
+ }
+
+ await measure("pages actions reload duplicate command", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ const reloadedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (reloadedCount !== initialCount + 2) {
+ throw new Error(
+ `Expected reloaded project to keep duplicated ${componentName}. Before ${initialCount}, after ${reloadedCount}`
+ );
+ }
+});
+
+test("Builder can duplicate and delete a component from Navigator context menu", async ({
+ page,
+}) => {
+ const componentName = "Image";
+
+ await measure(
+ "pages actions open builder for navigator context menu",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+ await selectCanvasTextInstance({ page, text: "Initial content" });
+
+ const initialCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+
+ await measure(
+ "pages actions insert component before navigator actions",
+ async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({ page, name: componentName });
+ }
+ );
+ const insertedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (insertedCount !== initialCount + 1) {
+ throw new Error(
+ `Expected components panel to insert one ${componentName}. Before ${initialCount}, after ${insertedCount}. Components: ${await getInstanceComponentCountSummary(fixture)}`
+ );
+ }
+
+ await measure(
+ "pages actions duplicate component from navigator",
+ async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorContextAction({
+ page,
+ itemName: componentName,
+ action: "Duplicate",
+ });
+ }
+ );
+ const duplicatedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (duplicatedCount !== initialCount + 2) {
+ throw new Error(
+ `Expected Navigator duplicate to add one ${componentName}. Before ${initialCount}, after ${duplicatedCount}. Components: ${await getInstanceComponentCountSummary(fixture)}. Navigator: ${JSON.stringify(await getNavigatorButtonSummary({ page, text: componentName }))}`
+ );
+ }
+
+ await measure("pages actions undo navigator duplicate", async () => {
+ await undoShortcut({ page });
+ });
+ const undoDuplicateCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (undoDuplicateCount !== initialCount + 1) {
+ throw new Error(
+ `Expected undo to remove Navigator duplicate ${componentName}. Before ${initialCount}, after ${undoDuplicateCount}`
+ );
+ }
+
+ await measure("pages actions redo navigator duplicate", async () => {
+ await redoShortcut({ page });
+ });
+ const redoDuplicateCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (redoDuplicateCount !== initialCount + 2) {
+ throw new Error(
+ `Expected redo to restore Navigator duplicate ${componentName}. Before ${initialCount}, after ${redoDuplicateCount}`
+ );
+ }
+
+ await measure("pages actions delete component from navigator", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorContextAction({
+ page,
+ itemName: componentName,
+ action: "Delete",
+ });
+ });
+ const deletedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (deletedCount !== initialCount + 1) {
+ throw new Error(
+ `Expected Navigator delete to remove one ${componentName}. Before ${initialCount}, after ${deletedCount}`
+ );
+ }
+
+ await measure("pages actions undo navigator delete", async () => {
+ await undoShortcut({ page });
+ });
+ const undoDeleteCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (undoDeleteCount !== initialCount + 2) {
+ throw new Error(
+ `Expected undo to restore Navigator-deleted ${componentName}. Before ${initialCount}, after ${undoDeleteCount}`
+ );
+ }
+
+ await measure(
+ "pages actions reload navigator context menu mutations",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ const reloadedCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (reloadedCount !== initialCount + 2) {
+ throw new Error(
+ `Expected reload to preserve Navigator mutations for ${componentName}. Before ${initialCount}, after ${reloadedCount}`
+ );
+ }
+});
diff --git a/apps/builder/e2e/tests/pages-actions-bridge.e2e.ts b/apps/builder/e2e/tests/pages-actions-bridge.e2e.ts
deleted file mode 100644
index 288af5023c..0000000000
--- a/apps/builder/e2e/tests/pages-actions-bridge.e2e.ts
+++ /dev/null
@@ -1,564 +0,0 @@
-import type { Page } from "@playwright/test";
-import {
- openProjectBuilder,
- waitForCanvasText,
- waitForCanvasTextHidden,
-} from "../flows/builder";
-import { selectCanvasTextInstance } from "../flows/canvas-selection";
-import { openNavigatorPanel } from "../flows/navigator";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { insertTemplateAfterCanvasText } from "../flows/template-insertion";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-let fixture: SeededContentModeProject;
-
-const getInstanceComponentCount = async ({
- fixture,
- component,
-}: {
- fixture: SeededContentModeProject;
- component: string;
-}) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- const instances = JSON.parse(build.instances) as Array<{
- component: string;
- }>;
- return instances.filter((instance) => instance.component === component)
- .length;
-};
-
-const getInstanceComponentCountSummary = async (
- fixture: SeededContentModeProject
-) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- const instances = JSON.parse(build.instances) as Array<{
- component: string;
- }>;
- const counts = new Map<string, number>();
- for (const { component } of instances) {
- counts.set(component, (counts.get(component) ?? 0) + 1);
- }
- return Array.from(counts, ([component, count]) => `${component}:${count}`)
- .sort()
- .join(", ");
-};
-
-const selectAppMenuItem = async ({
- page,
- name,
-}: {
- page: Page;
- name: string;
-}) => {
- await page.bringToFront();
- await page.getByRole("button", { name: "Menu", exact: true }).click();
- const menuItem = page.getByRole("menuitem", { name });
- await menuItem.waitFor();
- await menuItem.click();
-};
-
-const undoShortcut = async ({
- page,
- waitForSave = true,
-}: {
- page: Page;
- waitForSave?: boolean;
-}) => {
- await waitForSyncStatus({ page, status: "idle" });
- const save =
- waitForSave === true
- ? waitForChangeToBeSaved({ page, timeout: 30_000 })
- : undefined;
- await selectAppMenuItem({ page, name: "Undo" });
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const redoShortcut = async ({ page }: { page: Page }) => {
- await waitForSyncStatus({ page, status: "idle" });
- const save = waitForChangeToBeSaved({ page, timeout: 30_000 });
- await selectAppMenuItem({ page, name: "Redo" });
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const openComponentsPanel = async ({ page }: { page: Page }) => {
- await page.getByRole("tab", { name: "Components" }).click();
- await page.getByPlaceholder("Find components").waitFor();
-};
-
-const searchComponentsPanel = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- const search = page.getByPlaceholder("Find components");
- await search.fill(text);
-};
-
-const expectComponentPanelOptionHidden = async ({
- page,
- name,
-}: {
- page: Page;
- name: string;
-}) => {
- await searchComponentsPanel({ page, text: name });
- await page
- .getByRole("option", { name, exact: true })
- .waitFor({ state: "hidden" });
-};
-
-const insertComponentPanelOption = async ({
- page,
- name,
-}: {
- page: Page;
- name: string;
-}) => {
- await searchComponentsPanel({ page, text: name });
- await page.getByRole("option", { name, exact: true }).click();
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const getNavigatorButtonSummary = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- return await page
- .locator("[data-navigator-tree] [data-tree-button]")
- .evaluateAll((buttons, text) => {
- return buttons
- .map((button, index) => ({
- index,
- selected: button.getAttribute("aria-selected"),
- text: button.textContent?.replace(/\s+/g, " ").trim() ?? "",
- }))
- .filter((button) =>
- button.text.toLowerCase().includes((text as string).toLowerCase())
- );
- }, text);
-};
-
-const selectNavigatorContextAction = async ({
- page,
- itemName,
- action,
-}: {
- page: Page;
- itemName: string;
- action: "Duplicate" | "Delete";
-}) => {
- const selectedMatchingItem = page
- .locator('[data-navigator-tree] [data-tree-button][aria-selected="true"]')
- .filter({ hasText: itemName })
- .first();
- const fallbackItem = page
- .locator("[data-navigator-tree] [data-tree-button]")
- .filter({ hasText: itemName })
- .first();
- const item =
- (await selectedMatchingItem.count()) > 0
- ? selectedMatchingItem
- : fallbackItem;
- await item.waitFor({ state: "visible" });
- // The Navigator can intentionally skip the first click after a prior
- // pointer interaction. A second ordinary click guarantees the context menu
- // action runs against this row's fresh single selection.
- await item.click();
- await item.click();
- await item.click({ button: "right" });
- const menuItem = page.getByRole("menuitem", { name: action });
- await menuItem.waitFor({ state: "visible" });
- const ariaDisabled = await menuItem.getAttribute("aria-disabled");
- const dataDisabled = await menuItem.getAttribute("data-disabled");
- if (ariaDisabled === "true" || dataDisabled !== null) {
- throw new Error(
- `Expected Navigator ${action} action to be enabled. aria-disabled=${ariaDisabled}, data-disabled=${dataDisabled}`
- );
- }
- await menuItem.click();
- await waitForChangeToBeSaved({ page });
-};
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({
- context,
- email: "[email protected]",
- title: "Pages Actions E2E",
- assetNamePrefix: "pages-actions-",
- editorToken: "pages-actions-e2e-editor-token",
- builderToken: "pages-actions-e2e-builder-token",
- })
- );
-});
-
-test("Builder can insert through the engine bridge, undo, redo, and reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await measure("pages actions open builder for engine bridge", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
-
- await waitForCanvasText({ page, text: "Initial content" });
-
- await measure("pages actions insert template through bridge", async () => {
- await insertTemplateAfterCanvasText({
- page,
- anchorText: "Initial content",
- templateName: fixture.styledHeadingTemplateName,
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.styledHeadingTemplateText,
- });
-
- await measure("pages actions undo bridge insert", async () => {
- await undoShortcut({ page, waitForSave: false });
- });
- await waitForCanvasTextHidden({
- page,
- text: fixture.styledHeadingTemplateText,
- });
-
- await measure("pages actions redo bridge insert", async () => {
- await redoShortcut({ page });
- });
- await waitForCanvasText({
- page,
- text: fixture.styledHeadingTemplateText,
- });
-
- await measure("pages actions reload bridge insert", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.editorToken,
- mode: "content",
- });
- });
- await waitForCanvasText({
- page,
- text: fixture.styledHeadingTemplateText,
- });
- } finally {
- await close();
- }
-});
-
-test("Builder Components panel filters catalog-only entries and inserts a persisted component", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const insertedButtonText = "Button";
-
- try {
- await measure(
- "pages actions open builder for components panel",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
-
- await measure(
- "pages actions verify components panel catalog filters",
- async () => {
- await openComponentsPanel({ page });
- await expectComponentPanelOptionHidden({ page, name: "Box" });
- await expectComponentPanelOptionHidden({ page, name: "Body" });
- }
- );
-
- await selectCanvasTextInstance({ page, text: "Initial content" });
- await measure(
- "pages actions insert component from components panel",
- async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({ page, name: "Button" });
- }
- );
- await waitForCanvasText({ page, text: insertedButtonText });
-
- await measure("pages actions reload components panel insert", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: insertedButtonText });
- } finally {
- await close();
- }
-});
-
-test("Builder can duplicate a component through the engine bridge, undo, redo, and reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const componentName = "Image";
-
- try {
- await measure("pages actions open builder for command panel", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
- await selectCanvasTextInstance({ page, text: "Initial content" });
-
- const initialCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
-
- await measure(
- "pages actions insert component before command duplicate",
- async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({ page, name: componentName });
- }
- );
- const insertedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (insertedCount !== initialCount + 1) {
- throw new Error(
- `Expected components panel to insert one ${componentName}. Before ${initialCount}, after ${insertedCount}`
- );
- }
-
- await measure("pages actions duplicate inserted component", async () => {
- await page.keyboard.press("ControlOrMeta+D");
- await waitForSyncStatus({ page, status: "idle" });
- });
- const duplicatedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (duplicatedCount !== initialCount + 2) {
- throw new Error(
- `Expected duplicate command to add one ${componentName}. Before ${initialCount}, after ${duplicatedCount}`
- );
- }
-
- await measure("pages actions undo duplicate command", async () => {
- await undoShortcut({ page });
- });
- const undoCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (undoCount !== initialCount + 1) {
- throw new Error(
- `Expected undo to remove duplicated ${componentName}. Before ${initialCount}, after ${undoCount}`
- );
- }
-
- await measure("pages actions redo duplicate command", async () => {
- await redoShortcut({ page });
- });
- const redoCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (redoCount !== initialCount + 2) {
- throw new Error(
- `Expected redo to restore duplicated ${componentName}. Before ${initialCount}, after ${redoCount}`
- );
- }
-
- await measure("pages actions reload duplicate command", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- const reloadedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (reloadedCount !== initialCount + 2) {
- throw new Error(
- `Expected reloaded project to keep duplicated ${componentName}. Before ${initialCount}, after ${reloadedCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder can duplicate and delete a component from Navigator context menu", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const componentName = "Image";
-
- try {
- await measure(
- "pages actions open builder for navigator context menu",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
- await selectCanvasTextInstance({ page, text: "Initial content" });
-
- const initialCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
-
- await measure(
- "pages actions insert component before navigator actions",
- async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({ page, name: componentName });
- }
- );
- const insertedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (insertedCount !== initialCount + 1) {
- throw new Error(
- `Expected components panel to insert one ${componentName}. Before ${initialCount}, after ${insertedCount}. Components: ${await getInstanceComponentCountSummary(fixture)}`
- );
- }
-
- await measure(
- "pages actions duplicate component from navigator",
- async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorContextAction({
- page,
- itemName: componentName,
- action: "Duplicate",
- });
- }
- );
- const duplicatedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (duplicatedCount !== initialCount + 2) {
- throw new Error(
- `Expected Navigator duplicate to add one ${componentName}. Before ${initialCount}, after ${duplicatedCount}. Components: ${await getInstanceComponentCountSummary(fixture)}. Navigator: ${JSON.stringify(await getNavigatorButtonSummary({ page, text: componentName }))}`
- );
- }
-
- await measure("pages actions undo navigator duplicate", async () => {
- await undoShortcut({ page });
- });
- const undoDuplicateCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (undoDuplicateCount !== initialCount + 1) {
- throw new Error(
- `Expected undo to remove Navigator duplicate ${componentName}. Before ${initialCount}, after ${undoDuplicateCount}`
- );
- }
-
- await measure("pages actions redo navigator duplicate", async () => {
- await redoShortcut({ page });
- });
- const redoDuplicateCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (redoDuplicateCount !== initialCount + 2) {
- throw new Error(
- `Expected redo to restore Navigator duplicate ${componentName}. Before ${initialCount}, after ${redoDuplicateCount}`
- );
- }
-
- await measure("pages actions delete component from navigator", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorContextAction({
- page,
- itemName: componentName,
- action: "Delete",
- });
- });
- const deletedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (deletedCount !== initialCount + 1) {
- throw new Error(
- `Expected Navigator delete to remove one ${componentName}. Before ${initialCount}, after ${deletedCount}`
- );
- }
-
- await measure("pages actions undo navigator delete", async () => {
- await undoShortcut({ page });
- });
- const undoDeleteCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (undoDeleteCount !== initialCount + 2) {
- throw new Error(
- `Expected undo to restore Navigator-deleted ${componentName}. Before ${initialCount}, after ${undoDeleteCount}`
- );
- }
-
- await measure(
- "pages actions reload navigator context menu mutations",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- const reloadedCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (reloadedCount !== initialCount + 2) {
- throw new Error(
- `Expected reload to preserve Navigator mutations for ${componentName}. Before ${initialCount}, after ${reloadedCount}`
- );
- }
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/pages-actions-pages.e2e.ts b/apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.ts
similarity index 53%
rename from apps/builder/e2e/tests/pages-actions-pages.e2e.ts
rename to apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.ts
index e3e8e7e847..86a892f1eb 100644
--- a/apps/builder/e2e/tests/pages-actions-pages.e2e.ts
+++ b/apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -17,13 +17,15 @@ import {
} from "../flows/sync-status";
import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
+import { test, withBrowserContext } from "../test";
import { measure } from "../perf";
import { loadDevBuild } from "../db";
let fixture: SeededContentModeProject;
let pasteFixture: SeededContentModeProject;
+test.describe.configure({ mode: "parallel" });
+
const copiedPageTransferMarker = "@webstudio/page/v0.1";
const getPageRow = ({ page, pageName }: { page: Page; pageName: string }) =>
@@ -198,340 +200,319 @@ const confirmDialogAction = async ({
await button.waitFor({ state: "hidden" });
};
-test.beforeAll(async ({ browser }) => {
+test.beforeAll(async ({ browser }, workerInfo) => {
+ const workerSuffix = `worker-${workerInfo.parallelIndex}`;
await withBrowserContext(browser, async (context) => {
fixture = await createContentModeProject({
context,
- email: "[email protected]",
+ email: `pages-actions-pages-${workerSuffix}@webstudio.test`,
title: "Pages Actions E2E",
- assetNamePrefix: "pages-actions-",
- editorToken: "pages-actions-e2e-editor-token",
- builderToken: "pages-actions-e2e-builder-token",
+ assetNamePrefix: `pages-actions-pages-${workerSuffix}-`,
+ editorToken: `pages-actions-pages-${workerSuffix}-editor-token`,
+ builderToken: `pages-actions-pages-${workerSuffix}-builder-token`,
});
pasteFixture = await createContentModeProject({
context,
- email: "[email protected]",
+ email: `pages-actions-pages-paste-${workerSuffix}@webstudio.test`,
title: "Pages Actions Paste E2E",
- assetNamePrefix: "pages-actions-paste-",
- editorToken: "pages-actions-paste-e2e-editor-token",
- builderToken: "pages-actions-paste-e2e-builder-token",
+ assetNamePrefix: `pages-actions-pages-paste-${workerSuffix}-`,
+ editorToken: `pages-actions-pages-paste-${workerSuffix}-editor-token`,
+ builderToken: `pages-actions-pages-paste-${workerSuffix}-builder-token`,
});
});
});
test("Builder can draft, stage, copy, duplicate, and delete a page from the header menu", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const pageName = "Actions Menu Page";
const renamedPageName = "Renamed Actions Menu Page";
const copiedPageName = `${renamedPageName} (1)`;
const duplicatedPageName = `${renamedPageName} (2)`;
- try {
- await measure("pages actions open builder for page actions", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- const dataResourceCountsBefore = await getDataResourceCounts(fixture);
-
- await createPageFromTemplate({
- page,
- templateName: fixture.pageTemplateName,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
- await waitForCanvasText({
- page,
- text: fixture.dataResourceStaticVariableVisibleValue,
- });
- await waitForCanvasText({
- page,
- text: "HTTP resource variable configured",
- });
- await waitForCanvasText({
+ await measure("pages actions open builder for page actions", async () => {
+ await openProjectBuilder({
page,
- text: "GraphQL resource variable configured",
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCanvasText({ page, text: "2026" });
- await expectDataResourceCopies(fixture, dataResourceCountsBefore);
- await measure(
- "pages actions generated app build for copied resources",
- async () => {
- await expectGeneratedAppBuild({ projectId: fixture.projectId });
- }
- );
-
- await openPageSettings({ page, pageName });
- const renameSave = waitForChangeToBeSaved({ page });
- await page.getByLabel("Page name", { exact: true }).fill(renamedPageName);
- await page.getByLabel("Page name", { exact: true }).blur();
- await renameSave;
- await waitForPageRow({ page, pageName: renamedPageName });
- await expectPageRowHidden({ page, pageName });
+ });
+ const dataResourceCountsBefore = await getDataResourceCounts(fixture);
- const draftSave = waitForChangeToBeSaved({ page });
- await selectHeaderAction({
- page,
- menuLabel: "Page actions",
- action: "Mark as draft",
- });
- await draftSave;
- await waitForPageRow({ page, pageName: `[Draft] ${renamedPageName}` });
+ await createPageFromTemplate({
+ page,
+ templateName: fixture.pageTemplateName,
+ pageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.dataResourceStaticVariableVisibleValue,
+ });
+ await waitForCanvasText({
+ page,
+ text: "HTTP resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "GraphQL resource variable configured",
+ });
+ await waitForCanvasText({ page, text: "2026" });
+ await expectDataResourceCopies(fixture, dataResourceCountsBefore);
+ await measure(
+ "pages actions generated app build for copied resources",
+ async () => {
+ await expectGeneratedAppBuild({ projectId: fixture.projectId });
+ }
+ );
- await openPageSettings({
- page,
- pageName: `[Draft] ${renamedPageName}`,
- });
- await page
- .getByText(
- "Stage this page for publish before setting it as the home page"
- )
- .waitFor();
- const stageSave = waitForChangeToBeSaved({ page });
- await selectHeaderAction({
- page,
- menuLabel: "Page actions",
- action: "Stage for publish",
- });
- await stageSave;
- await waitForPageRow({ page, pageName: renamedPageName });
+ await openPageSettings({ page, pageName });
+ const renameSave = waitForChangeToBeSaved({ page });
+ await page.getByLabel("Page name", { exact: true }).fill(renamedPageName);
+ await page.getByLabel("Page name", { exact: true }).blur();
+ await renameSave;
+ await waitForPageRow({ page, pageName: renamedPageName });
+ await expectPageRowHidden({ page, pageName });
+
+ const draftSave = waitForChangeToBeSaved({ page });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Page actions",
+ action: "Mark as draft",
+ });
+ await draftSave;
+ await waitForPageRow({ page, pageName: `[Draft] ${renamedPageName}` });
- await openPageSettings({ page, pageName: renamedPageName });
- await selectHeaderAction({
- page,
- menuLabel: "Page actions",
- action: "Copy",
- });
- await waitForCopiedPageTransferData({ page });
- await pasteFromClipboardShortcut({ page });
- await waitForPageRow({ page, pageName: copiedPageName });
+ await openPageSettings({
+ page,
+ pageName: `[Draft] ${renamedPageName}`,
+ });
+ await page
+ .getByText("Stage this page for publish before setting it as the home page")
+ .waitFor();
+ const stageSave = waitForChangeToBeSaved({ page });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Page actions",
+ action: "Stage for publish",
+ });
+ await stageSave;
+ await waitForPageRow({ page, pageName: renamedPageName });
+
+ await openPageSettings({ page, pageName: renamedPageName });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Page actions",
+ action: "Copy",
+ });
+ await waitForCopiedPageTransferData({ page });
+ await pasteFromClipboardShortcut({ page });
+ await waitForPageRow({ page, pageName: copiedPageName });
+
+ await openPage({
+ page,
+ pageName: copiedPageName,
+ canvasText: fixture.pageTemplateText,
+ });
- await openPage({
- page,
- pageName: copiedPageName,
- canvasText: fixture.pageTemplateText,
- });
+ await openPageSettings({ page, pageName: renamedPageName });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Page actions",
+ action: "Duplicate",
+ });
+ await waitForPageRow({ page, pageName: duplicatedPageName });
- await openPageSettings({ page, pageName: renamedPageName });
- await selectHeaderAction({
- page,
- menuLabel: "Page actions",
- action: "Duplicate",
- });
- await waitForPageRow({ page, pageName: duplicatedPageName });
+ await openPageSettings({ page, pageName: duplicatedPageName });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Page actions",
+ action: "Delete",
+ });
+ const deleteSave = waitForChangeToBeSaved({ page });
+ await confirmDialogAction({ page, action: "Delete Page" });
+ await deleteSave;
+ await waitForSyncStatus({ page, status: "idle" });
+ await expectPageRowHidden({ page, pageName: duplicatedPageName });
- await openPageSettings({ page, pageName: duplicatedPageName });
- await selectHeaderAction({
- page,
- menuLabel: "Page actions",
- action: "Delete",
- });
- const deleteSave = waitForChangeToBeSaved({ page });
- await confirmDialogAction({ page, action: "Delete Page" });
- await deleteSave;
- await waitForSyncStatus({ page, status: "idle" });
- await expectPageRowHidden({ page, pageName: duplicatedPageName });
-
- await measure(
- "pages actions reload for page action persistence",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await openPagesPanel({ page });
- await waitForPageRow({ page, pageName: renamedPageName });
- await expectPageRowHidden({ page, pageName });
- await waitForPageRow({ page, pageName: copiedPageName });
- await expectPageRowHidden({ page, pageName: duplicatedPageName });
- await openPage({
- page,
- pageName: renamedPageName,
- canvasText: fixture.pageTemplateText,
- });
- await waitForCanvasText({
- page,
- text: fixture.dataResourceStaticVariableVisibleValue,
- });
- await waitForCanvasText({
- page,
- text: "HTTP resource variable configured",
- });
- await waitForCanvasText({
- page,
- text: "GraphQL resource variable configured",
- });
- await waitForCanvasText({ page, text: "2026" });
- await expectDataResourceCopies(fixture, dataResourceCountsBefore);
- } finally {
- await close();
- }
+ await measure(
+ "pages actions reload for page action persistence",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await openPagesPanel({ page });
+ await waitForPageRow({ page, pageName: renamedPageName });
+ await expectPageRowHidden({ page, pageName });
+ await waitForPageRow({ page, pageName: copiedPageName });
+ await expectPageRowHidden({ page, pageName: duplicatedPageName });
+ await openPage({
+ page,
+ pageName: renamedPageName,
+ canvasText: fixture.pageTemplateText,
+ });
+ await waitForCanvasText({
+ page,
+ text: fixture.dataResourceStaticVariableVisibleValue,
+ });
+ await waitForCanvasText({
+ page,
+ text: "HTTP resource variable configured",
+ });
+ await waitForCanvasText({
+ page,
+ text: "GraphQL resource variable configured",
+ });
+ await waitForCanvasText({ page, text: "2026" });
+ await expectDataResourceCopies(fixture, dataResourceCountsBefore);
});
test("Builder can copy, duplicate, and delete a folder from the context menu", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const folderName = "Actions Menu Folder";
const renamedFolderName = "Renamed Actions Menu Folder";
const copiedFolderName = `${renamedFolderName} (1)`;
const duplicatedFolderName = `${renamedFolderName} (2)`;
- try {
- await measure("pages actions open builder for folder actions", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
+ await measure("pages actions open builder for folder actions", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
+ });
- await createFolder({ page, folderName });
+ await createFolder({ page, folderName });
- await openFolderSettings({ page, folderName });
- const renameSave = waitForChangeToBeSaved({ page });
- await page
- .getByLabel("Folder name", { exact: true })
- .fill(renamedFolderName);
- await page.getByLabel("Folder name", { exact: true }).blur();
- await renameSave;
- await waitForFolderRow({ page, folderName: renamedFolderName });
- await expectTextHidden({ page, text: folderName });
+ await openFolderSettings({ page, folderName });
+ const renameSave = waitForChangeToBeSaved({ page });
+ await page.getByLabel("Folder name", { exact: true }).fill(renamedFolderName);
+ await page.getByLabel("Folder name", { exact: true }).blur();
+ await renameSave;
+ await waitForFolderRow({ page, folderName: renamedFolderName });
+ await expectTextHidden({ page, text: folderName });
- await selectContextAction({
- page,
- itemName: renamedFolderName,
- action: "Copy",
- });
- await waitForCopiedPageTransferData({ page });
- const pasteSave = waitForChangeToBeSaved({ page });
- await selectContextAction({ page, itemName: "Home", action: "Paste" });
- await pasteSave;
- await waitForFolderRow({ page, folderName: copiedFolderName });
-
- const duplicateSave = waitForChangeToBeSaved({ page });
- await selectContextAction({
- page,
- itemName: renamedFolderName,
- action: "Duplicate",
- });
- await duplicateSave;
- await waitForFolderRow({ page, folderName: duplicatedFolderName });
+ await selectContextAction({
+ page,
+ itemName: renamedFolderName,
+ action: "Copy",
+ });
+ await waitForCopiedPageTransferData({ page });
+ const pasteSave = waitForChangeToBeSaved({ page });
+ await selectContextAction({ page, itemName: "Home", action: "Paste" });
+ await pasteSave;
+ await waitForFolderRow({ page, folderName: copiedFolderName });
+
+ const duplicateSave = waitForChangeToBeSaved({ page });
+ await selectContextAction({
+ page,
+ itemName: renamedFolderName,
+ action: "Duplicate",
+ });
+ await duplicateSave;
+ await waitForFolderRow({ page, folderName: duplicatedFolderName });
- await selectContextAction({
- page,
- itemName: duplicatedFolderName,
- action: "Delete",
- });
- const deleteSave = waitForChangeToBeSaved({ page });
- await confirmDialogAction({ page, action: "Delete" });
- await deleteSave;
- await expectTextHidden({ page, text: duplicatedFolderName });
-
- await measure(
- "pages actions reload for folder action persistence",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await openPagesPanel({ page });
- await waitForFolderRow({ page, folderName: renamedFolderName });
- await expectTextHidden({ page, text: folderName });
- await waitForFolderRow({ page, folderName: copiedFolderName });
- await openFolderSettings({ page, folderName: copiedFolderName });
- await expectTextHidden({ page, text: duplicatedFolderName });
- } finally {
- await close();
- }
+ await selectContextAction({
+ page,
+ itemName: duplicatedFolderName,
+ action: "Delete",
+ });
+ const deleteSave = waitForChangeToBeSaved({ page });
+ await confirmDialogAction({ page, action: "Delete" });
+ await deleteSave;
+ await expectTextHidden({ page, text: duplicatedFolderName });
+
+ await measure(
+ "pages actions reload for folder action persistence",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await openPagesPanel({ page });
+ await waitForFolderRow({ page, folderName: renamedFolderName });
+ await expectTextHidden({ page, text: folderName });
+ await waitForFolderRow({ page, folderName: copiedFolderName });
+ await openFolderSettings({ page, folderName: copiedFolderName });
+ await expectTextHidden({ page, text: duplicatedFolderName });
});
test("Builder can copy, duplicate, and delete a page template from actions menus", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const templateName = fixture.pageTemplateName;
const renamedTemplateName = "Renamed Content Page Template";
const copiedTemplateName = `${renamedTemplateName} (1)`;
const duplicatedTemplateName = `${renamedTemplateName} (2)`;
- try {
- await measure(
- "pages actions open builder for template actions",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await openPagesPanel({ page });
-
- await openTemplateSettings({ page, templateName });
- const renameSave = waitForChangeToBeSaved({ page });
- await page
- .getByLabel("Template name", { exact: true })
- .fill(renamedTemplateName);
- await page.getByLabel("Template name", { exact: true }).blur();
- await renameSave;
- await waitForTemplate({ page, templateName: renamedTemplateName });
-
- await openTemplateSettings({ page, templateName: renamedTemplateName });
- await selectHeaderAction({
+ await measure("pages actions open builder for template actions", async () => {
+ await openProjectBuilder({
page,
- menuLabel: "Template actions",
- action: "Copy",
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCopiedPageTransferData({ page });
- await pasteFromClipboardShortcut({ page });
- await waitForTemplate({ page, templateName: copiedTemplateName });
+ });
+ await openPagesPanel({ page });
- await openTemplateSettings({ page, templateName: renamedTemplateName });
- await selectHeaderAction({
- page,
- menuLabel: "Template actions",
- action: "Duplicate",
- });
- await waitForTemplate({ page, templateName: duplicatedTemplateName });
+ await openTemplateSettings({ page, templateName });
+ const renameSave = waitForChangeToBeSaved({ page });
+ await page
+ .getByLabel("Template name", { exact: true })
+ .fill(renamedTemplateName);
+ await page.getByLabel("Template name", { exact: true }).blur();
+ await renameSave;
+ await waitForTemplate({ page, templateName: renamedTemplateName });
+
+ await openTemplateSettings({ page, templateName: renamedTemplateName });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Template actions",
+ action: "Copy",
+ });
+ await waitForCopiedPageTransferData({ page });
+ await pasteFromClipboardShortcut({ page });
+ await waitForTemplate({ page, templateName: copiedTemplateName });
+
+ await openTemplateSettings({ page, templateName: renamedTemplateName });
+ await selectHeaderAction({
+ page,
+ menuLabel: "Template actions",
+ action: "Duplicate",
+ });
+ await waitForTemplate({ page, templateName: duplicatedTemplateName });
- await selectContextAction({
- page,
- itemName: duplicatedTemplateName,
- action: "Delete",
- });
- const deleteSave = waitForChangeToBeSaved({ page });
- await confirmDialogAction({ page, action: "Delete Template" });
- await deleteSave;
- await expectTextHidden({ page, text: duplicatedTemplateName });
-
- await measure(
- "pages actions reload for template action persistence",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await openPagesPanel({ page });
- await waitForTemplate({ page, templateName: renamedTemplateName });
- await waitForTemplate({ page, templateName: copiedTemplateName });
- await expectTextHidden({ page, text: duplicatedTemplateName });
- } finally {
- await close();
- }
+ await selectContextAction({
+ page,
+ itemName: duplicatedTemplateName,
+ action: "Delete",
+ });
+ const deleteSave = waitForChangeToBeSaved({ page });
+ await confirmDialogAction({ page, action: "Delete Template" });
+ await deleteSave;
+ await expectTextHidden({ page, text: duplicatedTemplateName });
+
+ await measure(
+ "pages actions reload for template action persistence",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await openPagesPanel({ page });
+ await waitForTemplate({ page, templateName: renamedTemplateName });
+ await waitForTemplate({ page, templateName: copiedTemplateName });
+ await expectTextHidden({ page, text: duplicatedTemplateName });
});
const createInstanceTransfer = ({ id, text }: { id: string; text: string }) =>
@@ -644,9 +625,8 @@ const countBuildInstancesWithText = async (text: string) => {
};
test("Builder runs paste plugins through generic browser paste events", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
const entries = [
[
"application/json",
@@ -707,35 +687,31 @@ test("Builder runs paste plugins through generic browser paste events", async ({
],
] as const;
- try {
- await openProjectBuilder({
- page,
- projectId: pasteFixture.projectId,
- authToken: pasteFixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
-
- for (const [mimeType, value, text, tag] of entries) {
- await selectPasteBody({ page });
- await pasteClipboardData({ page, data: { [mimeType]: value } });
- await waitForCanvasText({ page, text });
- if (tag === undefined) {
- const count = await countBuildInstancesWithText(text);
- if (count === 0) {
- throw new Error(
- `Expected generic Webflow paste to persist ${JSON.stringify(text)}`
- );
- }
- continue;
- }
- const count = await countPastedElements({ tag, text });
- if (count !== 1) {
+ await openProjectBuilder({
+ page,
+ projectId: pasteFixture.projectId,
+ authToken: pasteFixture.builderToken,
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ for (const [mimeType, value, text, tag] of entries) {
+ await selectPasteBody({ page });
+ await pasteClipboardData({ page, data: { [mimeType]: value } });
+ await waitForCanvasText({ page, text });
+ if (tag === undefined) {
+ const count = await countBuildInstancesWithText(text);
+ if (count === 0) {
throw new Error(
- `Expected one ${tag} containing ${JSON.stringify(text)}, found ${count}`
+ `Expected generic Webflow paste to persist ${JSON.stringify(text)}`
);
}
+ continue;
+ }
+ const count = await countPastedElements({ tag, text });
+ if (count !== 1) {
+ throw new Error(
+ `Expected one ${tag} containing ${JSON.stringify(text)}, found ${count}`
+ );
}
- } finally {
- await close();
}
});
diff --git a/apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..d7d519e11c
--- /dev/null
+++ b/apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,1243 @@
+import type { Page } from "@playwright/test";
+import {
+ openProjectBuilder,
+ waitForCanvasText,
+ waitForCanvasTextHidden,
+} from "../flows/builder";
+import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { openNavigatorPanel } from "../flows/navigator";
+import { openPage } from "../flows/pages-panel";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+let fixture: SeededContentModeProject;
+let navigatorStructuralFixture: SeededContentModeProject;
+
+test.describe.configure({ mode: "parallel" });
+
+type BuildInstanceChild = {
+ type: string;
+ value?: string;
+};
+
+type BuildInstance = {
+ id: string;
+ component?: string;
+ tag?: string;
+ label?: string;
+ children?: BuildInstanceChild[];
+};
+
+const fragmentArrays = {
+ assets: [],
+ dataSources: [],
+ resources: [],
+ props: [],
+ breakpoints: [],
+ styleSourceSelections: [],
+ styleSources: [],
+ styles: [],
+};
+
+const createInstanceTransfer = ({ id, text }: { id: string; text: string }) =>
+ JSON.stringify({
+ "@webstudio/instance/v0.1": {
+ instanceSelector: [id, "source-body"],
+ children: [{ type: "id", value: id }],
+ instances: [
+ {
+ type: "instance",
+ id,
+ component: "ws:element",
+ tag: "p",
+ children: [{ type: "text", value: text }],
+ },
+ ],
+ ...fragmentArrays,
+ },
+ });
+
+const loadBuildInstances = async (fixture: SeededContentModeProject) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ return JSON.parse(build.instances) as BuildInstance[];
+};
+
+const createBuildInspector = (instances: BuildInstance[]) => {
+ const instancesById = new Map(
+ instances.map((instance) => [instance.id, instance])
+ );
+ const parentByChildId = new Map<string, string>();
+
+ for (const instance of instances) {
+ for (const child of instance.children ?? []) {
+ if (child.type === "id" && child.value !== undefined) {
+ parentByChildId.set(child.value, instance.id);
+ }
+ }
+ }
+
+ const instanceContainsText = (instanceId: string, text: string): boolean => {
+ const instance = instancesById.get(instanceId);
+ if (instance === undefined) {
+ return false;
+ }
+ return (
+ instance.children?.some((child) => {
+ if (child.type === "text") {
+ return child.value?.includes(text);
+ }
+ if (child.type === "id" && child.value !== undefined) {
+ return instanceContainsText(child.value, text);
+ }
+ return false;
+ }) ?? false
+ );
+ };
+
+ const collectText = (instanceId: string): string => {
+ const instance = instancesById.get(instanceId);
+ if (instance === undefined) {
+ return "";
+ }
+ return (instance.children ?? [])
+ .map((child) => {
+ if (child.type === "text") {
+ return child.value ?? "";
+ }
+ if (child.type === "id" && child.value !== undefined) {
+ return collectText(child.value);
+ }
+ return "";
+ })
+ .join(" ");
+ };
+
+ return {
+ countComponent: (component: string) =>
+ instances.filter((instance) => instance.component === component).length,
+ countElementTag: (tag: string) =>
+ instances.filter(
+ (instance) =>
+ instance.component === "ws:element" && instance.tag === tag
+ ).length,
+ countElementTagWithText: ({ tag, text }: { tag: string; text: string }) =>
+ instances.filter(
+ (instance) =>
+ instance.component === "ws:element" &&
+ instance.tag === tag &&
+ instanceContainsText(instance.id, text)
+ ).length,
+ countInstancesWithText: (text: string) =>
+ instances.filter((instance) => instanceContainsText(instance.id, text))
+ .length,
+ countExactTextChildren: (text: string) =>
+ instances.reduce((count, instance) => {
+ return (
+ count +
+ (instance.children?.filter(
+ (child) => child.type === "text" && child.value === text
+ ).length ?? 0)
+ );
+ }, 0),
+ getElementWithTextParentTag: ({
+ tag,
+ text,
+ }: {
+ tag: string;
+ text: string;
+ }) => {
+ const instance = instances.find(
+ (instance) =>
+ instance.component === "ws:element" &&
+ instance.tag === tag &&
+ instanceContainsText(instance.id, text)
+ );
+ const parentId =
+ instance === undefined ? undefined : parentByChildId.get(instance.id);
+ return parentId === undefined
+ ? undefined
+ : instancesById.get(parentId)?.tag;
+ },
+ getDirectChildTextOrder: ({
+ parentTag,
+ texts,
+ }: {
+ parentTag: string;
+ texts: string[];
+ }) => {
+ const parent = instances.find(
+ (instance) =>
+ instance.component === "ws:element" && instance.tag === parentTag
+ );
+ if (parent === undefined) {
+ return [];
+ }
+ return (parent.children ?? [])
+ .flatMap((child, index) => {
+ if (child.type !== "id" || child.value === undefined) {
+ return [];
+ }
+ const content = collectText(child.value);
+ return texts
+ .filter((text) => content.includes(text))
+ .map((text) => ({ text, index }));
+ })
+ .sort((left, right) => left.index - right.index)
+ .map(({ text }) => text);
+ },
+ countLabel: (label: string) =>
+ instances.filter((instance) => instance.label === label).length,
+ };
+};
+
+const inspectBuild = async (fixture: SeededContentModeProject) =>
+ createBuildInspector(await loadBuildInstances(fixture));
+
+const getInstanceComponentCount = async ({
+ fixture,
+ component,
+}: {
+ fixture: SeededContentModeProject;
+ component: string;
+}) => {
+ return (await inspectBuild(fixture)).countComponent(component);
+};
+
+const getElementTagCount = async ({
+ fixture,
+ tag,
+}: {
+ fixture: SeededContentModeProject;
+ tag: string;
+}) => {
+ return (await inspectBuild(fixture)).countElementTag(tag);
+};
+
+const getElementTagWithTextCount = async ({
+ fixture,
+ tag,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ tag: string;
+ text: string;
+}) => {
+ return (await inspectBuild(fixture)).countElementTagWithText({ tag, text });
+};
+
+const getExactTextChildCount = async ({
+ fixture,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ text: string;
+}) => {
+ return (await inspectBuild(fixture)).countExactTextChildren(text);
+};
+
+const getElementWithTextParentTag = async ({
+ fixture,
+ tag,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ tag: string;
+ text: string;
+}) => {
+ return (await inspectBuild(fixture)).getElementWithTextParentTag({
+ tag,
+ text,
+ });
+};
+
+const getDirectChildTextOrder = async ({
+ fixture,
+ parentTag,
+ texts,
+}: {
+ fixture: SeededContentModeProject;
+ parentTag: string;
+ texts: string[];
+}) => {
+ return (await inspectBuild(fixture)).getDirectChildTextOrder({
+ parentTag,
+ texts,
+ });
+};
+
+const getInstanceLabelCount = async ({
+ fixture,
+ label,
+}: {
+ fixture: SeededContentModeProject;
+ label: string;
+}) => {
+ return (await inspectBuild(fixture)).countLabel(label);
+};
+
+const pastePlainTextFromClipboardShortcut = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ await page.evaluate(async (text) => {
+ await navigator.clipboard.writeText(text);
+ }, text);
+ const save = waitForChangeToBeSaved({ page });
+ await page.keyboard.press("ControlOrMeta+V");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const pasteFromClipboardShortcut = async ({ page }: { page: Page }) => {
+ const save = waitForChangeToBeSaved({ page }).catch(() => undefined);
+ await page.keyboard.press("ControlOrMeta+V");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const cutSelectedInstanceShortcut = async ({ page }: { page: Page }) => {
+ const save = waitForChangeToBeSaved({ page });
+ await page.keyboard.press("ControlOrMeta+X");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const pasteTextFromClipboardShortcutWithoutSave = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ await page.evaluate(async (text) => {
+ await navigator.clipboard.writeText(text);
+ }, text);
+ await page.keyboard.press("ControlOrMeta+V");
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const waitForClipboardTextIncludes = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ await page.waitForFunction(async (text) => {
+ try {
+ return (await navigator.clipboard.readText()).includes(text as string);
+ } catch {
+ return false;
+ }
+ }, text);
+};
+
+const pasteClipboardData = async ({
+ page,
+ data,
+ waitForSave = true,
+}: {
+ page: Page;
+ data: Record<string, string>;
+ waitForSave?: boolean;
+}) => {
+ const save = waitForSave ? waitForChangeToBeSaved({ page }) : undefined;
+ await page.evaluate((data) => {
+ const clipboardData = new DataTransfer();
+ for (const [mimeType, value] of Object.entries(data)) {
+ clipboardData.setData(mimeType, value);
+ }
+ document.dispatchEvent(
+ new ClipboardEvent("paste", {
+ bubbles: true,
+ cancelable: true,
+ clipboardData,
+ })
+ );
+ }, data);
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const moveSelectedNavigatorInstance = async ({
+ page,
+ shortcut,
+}: {
+ page: Page;
+ shortcut: "Control+ArrowLeft" | "Control+ArrowRight" | "Control+ArrowUp";
+}) => {
+ const save = waitForChangeToBeSaved({ page });
+ await page.keyboard.press(shortcut);
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const openComponentsPanel = async ({ page }: { page: Page }) => {
+ await page.getByRole("tab", { name: "Components" }).click();
+ await page.getByPlaceholder("Find components").waitFor();
+};
+
+const searchComponentsPanel = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ const search = page.getByPlaceholder("Find components");
+ await search.fill(text);
+};
+
+const insertComponentPanelOption = async ({
+ page,
+ name,
+}: {
+ page: Page;
+ name: string;
+}) => {
+ await searchComponentsPanel({ page, text: name });
+ await page.getByRole("option", { name, exact: true }).click();
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const openCommandPanel = async ({ page }: { page: Page }) => {
+ await page.keyboard.press("ControlOrMeta+K");
+ await page
+ .getByPlaceholder("Type a command or search...", { exact: true })
+ .waitFor();
+};
+
+const selectCommandPanelItem = async ({
+ page,
+ text,
+}: {
+ page: Page;
+ text: string;
+}) => {
+ const item = page.locator("[cmdk-item]").filter({ hasText: text }).first();
+ await item.waitFor({ state: "visible" });
+ await item.dblclick();
+};
+
+const runCommandPanelStructuralAction = async ({
+ page,
+ command,
+ option,
+}: {
+ page: Page;
+ command: "Wrap" | "Convert" | "Unwrap";
+ option?: string;
+}) => {
+ await openCommandPanel({ page });
+ const commandInput = page.getByPlaceholder("Type a command or search...", {
+ exact: true,
+ });
+ await commandInput.fill(command);
+ await selectCommandPanelItem({ page, text: command });
+ if (option === undefined) {
+ await waitForChangeToBeSaved({ page });
+ return;
+ }
+
+ const optionInput = page
+ .getByPlaceholder(
+ command === "Wrap"
+ ? "Search components to wrap with..."
+ : "Search components to convert...",
+ { exact: true }
+ )
+ .first();
+ await optionInput.waitFor();
+ await optionInput.fill(option);
+ await selectCommandPanelItem({ page, text: option });
+ await waitForChangeToBeSaved({ page });
+};
+
+const runCommandPanelTagInsertion = async ({
+ page,
+ tag,
+}: {
+ page: Page;
+ tag: string;
+}) => {
+ await openCommandPanel({ page });
+ const commandInput = page.getByPlaceholder("Type a command or search...", {
+ exact: true,
+ });
+ await commandInput.fill(tag);
+ await selectCommandPanelItem({ page, text: `<${tag}>` });
+ await waitForChangeToBeSaved({ page });
+};
+
+const selectCommandPanelInstance = async ({
+ page,
+ label,
+}: {
+ page: Page;
+ label: string;
+}) => {
+ await openCommandPanel({ page });
+ const commandInput = page.getByPlaceholder("Type a command or search...", {
+ exact: true,
+ });
+ await commandInput.fill(label);
+ await selectCommandPanelItem({ page, text: label });
+};
+
+const selectNavigatorItem = async ({
+ page,
+ itemName,
+}: {
+ page: Page;
+ itemName: string;
+}) => {
+ const item = page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .filter({ hasText: itemName })
+ .last();
+ await item.waitFor({ state: "visible" });
+ await item.click();
+ await item.click();
+};
+
+const selectBodyInNavigator = async ({ page }: { page: Page }) => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "Body" });
+};
+
+const editSelectedNavigatorLabel = async ({
+ page,
+ label,
+}: {
+ page: Page;
+ label: string;
+}) => {
+ await page.keyboard.press("ControlOrMeta+E");
+ const editableLabel = page.locator('[contenteditable="plaintext-only"]');
+ await editableLabel.waitFor({ state: "visible" });
+ await editableLabel.fill(label);
+ await editableLabel.press("Enter");
+ await waitForChangeToBeSaved({ page });
+};
+
+test.beforeAll(async ({ browser }, workerInfo) => {
+ const workerSuffix = `worker-${workerInfo.parallelIndex}`;
+ await withBrowserContext(browser, async (context) => {
+ fixture = await createContentModeProject({
+ context,
+ email: `pages-actions-${workerSuffix}@webstudio.test`,
+ title: "Pages Actions E2E",
+ assetNamePrefix: `pages-actions-${workerSuffix}-`,
+ editorToken: `pages-actions-${workerSuffix}-editor-token`,
+ builderToken: `pages-actions-${workerSuffix}-builder-token`,
+ });
+ navigatorStructuralFixture = await createContentModeProject({
+ context,
+ email: `pages-actions-navigator-structural-${workerSuffix}@webstudio.test`,
+ title: "Pages Actions Navigator Structural E2E",
+ assetNamePrefix: `pages-actions-navigator-structural-${workerSuffix}-`,
+ editorToken: `pages-actions-navigator-structural-${workerSuffix}-editor-token`,
+ builderToken: `pages-actions-navigator-structural-${workerSuffix}-builder-token`,
+ });
+ });
+});
+
+test("Builder Navigator keyboard move, reparent, and reorder persist after reload", async ({
+ page,
+}) => {
+ const sectionText = "Navigator move section";
+ const asideText = "Navigator move aside";
+ const html = `
+ <section>
+ <h2>${sectionText}</h2>
+ </section>
+ <aside>
+ <p>${asideText}</p>
+ </aside>
+ `;
+
+ await measure(
+ "pages actions open builder for navigator keyboard moves",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: navigatorStructuralFixture.projectId,
+ authToken: navigatorStructuralFixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ await measure("pages actions paste navigator move siblings", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "Body" });
+ await pastePlainTextFromClipboardShortcut({ page, text: html });
+ });
+ await waitForCanvasText({ page, text: sectionText });
+ await waitForCanvasText({ page, text: asideText });
+
+ await measure(
+ "pages actions move navigator item into previous sibling",
+ async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "aside" });
+ await moveSelectedNavigatorInstance({
+ page,
+ shortcut: "Control+ArrowRight",
+ });
+ }
+ );
+ const reparentedParentTag = await getElementWithTextParentTag({
+ fixture: navigatorStructuralFixture,
+ tag: "aside",
+ text: asideText,
+ });
+ if (reparentedParentTag !== "section") {
+ throw new Error(
+ `Expected Navigator move-in to reparent aside into section, found parent ${reparentedParentTag}`
+ );
+ }
+
+ await measure("pages actions move navigator item back out", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "aside" });
+ await moveSelectedNavigatorInstance({
+ page,
+ shortcut: "Control+ArrowLeft",
+ });
+ });
+ const outdentedParentTag = await getElementWithTextParentTag({
+ fixture: navigatorStructuralFixture,
+ tag: "aside",
+ text: asideText,
+ });
+ if (outdentedParentTag !== "body") {
+ throw new Error(
+ `Expected Navigator move-out to reparent aside back to body, found parent ${outdentedParentTag}`
+ );
+ }
+
+ await measure(
+ "pages actions reorder navigator item above previous sibling",
+ async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "aside" });
+ await moveSelectedNavigatorInstance({
+ page,
+ shortcut: "Control+ArrowUp",
+ });
+ }
+ );
+ const reorderedTextOrder = await getDirectChildTextOrder({
+ fixture: navigatorStructuralFixture,
+ parentTag: "body",
+ texts: [sectionText, asideText],
+ });
+ if (reorderedTextOrder.join("|") !== `${asideText}|${sectionText}`) {
+ throw new Error(
+ `Expected Navigator move-up to place aside before section, found order ${reorderedTextOrder.join(" -> ")}`
+ );
+ }
+
+ await measure("pages actions reload navigator keyboard moves", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: navigatorStructuralFixture.projectId,
+ authToken: navigatorStructuralFixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: sectionText });
+ await waitForCanvasText({ page, text: asideText });
+ const reloadedParentTag = await getElementWithTextParentTag({
+ fixture: navigatorStructuralFixture,
+ tag: "aside",
+ text: asideText,
+ });
+ const reloadedTextOrder = await getDirectChildTextOrder({
+ fixture: navigatorStructuralFixture,
+ parentTag: "body",
+ texts: [sectionText, asideText],
+ });
+ if (reloadedParentTag !== "body") {
+ throw new Error(
+ `Expected reload to preserve moved aside under body, found parent ${reloadedParentTag}`
+ );
+ }
+ if (reloadedTextOrder.join("|") !== `${asideText}|${sectionText}`) {
+ throw new Error(
+ `Expected reload to preserve Navigator reorder, found order ${reloadedTextOrder.join(" -> ")}`
+ );
+ }
+});
+
+test("Builder command panel structural mutations persist after reload", async ({
+ page,
+}) => {
+ const anchorText = "Initial content";
+ const componentName = "Image";
+
+ await measure(
+ "pages actions open builder for command structural actions",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: anchorText });
+ await selectCanvasTextInstance({ page, text: anchorText });
+
+ await measure(
+ "pages actions insert component before structural actions",
+ async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({ page, name: componentName });
+ }
+ );
+ const insertedImageCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+
+ const initialDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ const initialSectionCount = await getElementTagCount({
+ fixture,
+ tag: "section",
+ });
+
+ await measure(
+ "pages actions wrap selected instance from command panel",
+ async () => {
+ await runCommandPanelStructuralAction({
+ page,
+ command: "Wrap",
+ option: "div",
+ });
+ }
+ );
+ const wrappedDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ if (wrappedDivCount !== initialDivCount + 1) {
+ throw new Error(
+ `Expected command panel Wrap to add one div. Before ${initialDivCount}, after ${wrappedDivCount}`
+ );
+ }
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "div" });
+
+ await measure(
+ "pages actions convert wrapper from command panel",
+ async () => {
+ await runCommandPanelStructuralAction({
+ page,
+ command: "Convert",
+ option: "section",
+ });
+ }
+ );
+ const convertedDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ const convertedSectionCount = await getElementTagCount({
+ fixture,
+ tag: "section",
+ });
+ if (convertedDivCount !== initialDivCount) {
+ throw new Error(
+ `Expected command panel Convert to replace the wrapper div. Before ${initialDivCount}, after ${convertedDivCount}`
+ );
+ }
+ if (convertedSectionCount !== initialSectionCount + 1) {
+ throw new Error(
+ `Expected command panel Convert to add one section. Before ${initialSectionCount}, after ${convertedSectionCount}`
+ );
+ }
+ await measure("pages actions reload command structural actions", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: anchorText });
+ const reloadedSectionCount = await getElementTagCount({
+ fixture,
+ tag: "section",
+ });
+ const reloadedImageCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (reloadedSectionCount !== initialSectionCount + 1) {
+ throw new Error(
+ `Expected reload to preserve command panel converted section wrapper. Before ${initialSectionCount}, after ${reloadedSectionCount}`
+ );
+ }
+ if (reloadedImageCount !== insertedImageCount) {
+ throw new Error(
+ `Expected reload to preserve command panel target ${componentName}. Before ${insertedImageCount}, after ${reloadedImageCount}`
+ );
+ }
+});
+
+test("Builder Navigator label and command unwrap persist after reload", async ({
+ page,
+}) => {
+ const anchorText = "Initial content";
+ const componentName = "Image";
+ const renamedLabel = "Hero media";
+
+ await measure("pages actions open builder for label and unwrap", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: anchorText });
+ await selectCanvasTextInstance({ page, text: anchorText });
+
+ await measure(
+ "pages actions insert component before label and unwrap",
+ async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({ page, name: componentName });
+ }
+ );
+ const insertedImageCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ const initialDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+
+ await measure("pages actions edit navigator label", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: componentName });
+ await editSelectedNavigatorLabel({ page, label: renamedLabel });
+ });
+ const renamedCount = await getInstanceLabelCount({
+ fixture,
+ label: renamedLabel,
+ });
+ if (renamedCount !== 1) {
+ throw new Error(
+ `Expected one Navigator label "${renamedLabel}" after rename, found ${renamedCount}`
+ );
+ }
+
+ await measure(
+ "pages actions wrap renamed component before unwrap",
+ async () => {
+ await runCommandPanelStructuralAction({
+ page,
+ command: "Wrap",
+ option: "div",
+ });
+ }
+ );
+ const wrappedDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ if (wrappedDivCount !== initialDivCount + 1) {
+ throw new Error(
+ `Expected wrap before unwrap to add one div. Before ${initialDivCount}, after ${wrappedDivCount}`
+ );
+ }
+
+ await measure(
+ "pages actions unwrap renamed component from command panel",
+ async () => {
+ await selectCommandPanelInstance({ page, label: renamedLabel });
+ await runCommandPanelStructuralAction({
+ page,
+ command: "Unwrap",
+ });
+ }
+ );
+ const unwrappedDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ const unwrappedImageCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (unwrappedDivCount !== initialDivCount) {
+ throw new Error(
+ `Expected unwrap to remove the wrapper div. Before ${initialDivCount}, after ${unwrappedDivCount}`
+ );
+ }
+ if (unwrappedImageCount !== insertedImageCount) {
+ throw new Error(
+ `Expected unwrap to preserve ${componentName}. Before ${insertedImageCount}, after ${unwrappedImageCount}`
+ );
+ }
+
+ await measure("pages actions reload label and unwrap", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ const reloadedLabelCount = await getInstanceLabelCount({
+ fixture,
+ label: renamedLabel,
+ });
+ const reloadedDivCount = await getElementTagCount({
+ fixture,
+ tag: "div",
+ });
+ const reloadedImageCount = await getInstanceComponentCount({
+ fixture,
+ component: componentName,
+ });
+ if (reloadedLabelCount !== 1) {
+ throw new Error(
+ `Expected reload to preserve Navigator label "${renamedLabel}", found ${reloadedLabelCount}`
+ );
+ }
+ if (reloadedDivCount !== initialDivCount) {
+ throw new Error(
+ `Expected reload to preserve unwrapped tree. Before ${initialDivCount}, after ${reloadedDivCount}`
+ );
+ }
+ if (reloadedImageCount !== insertedImageCount) {
+ throw new Error(
+ `Expected reload to preserve unwrapped ${componentName}. Before ${insertedImageCount}, after ${reloadedImageCount}`
+ );
+ }
+});
+
+test("Builder command panel tag insertion persists after reload", async ({
+ page,
+}) => {
+ const anchorText = "Initial content";
+ const tag = "aside";
+
+ await measure(
+ "pages actions open builder for command tag insertion",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: anchorText });
+
+ const initialAsideCount = await getElementTagCount({
+ fixture,
+ tag,
+ });
+
+ await measure(
+ "pages actions select body before command tag insertion",
+ async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "Body" });
+ }
+ );
+
+ await measure("pages actions insert tag from command panel", async () => {
+ await runCommandPanelTagInsertion({ page, tag });
+ });
+ const insertedAsideCount = await getElementTagCount({
+ fixture,
+ tag,
+ });
+ if (insertedAsideCount !== initialAsideCount + 1) {
+ throw new Error(
+ `Expected command panel tag insertion to add one ${tag}. Before ${initialAsideCount}, after ${insertedAsideCount}`
+ );
+ }
+
+ await measure("pages actions reload command tag insertion", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ const reloadedAsideCount = await getElementTagCount({
+ fixture,
+ tag,
+ });
+ if (reloadedAsideCount !== initialAsideCount + 1) {
+ throw new Error(
+ `Expected reload to preserve command panel ${tag} insertion. Before ${initialAsideCount}, after ${reloadedAsideCount}`
+ );
+ }
+});
+
+test("Builder pastes external HTML fragments through clipboard and reloads them", async ({
+ page,
+}) => {
+ const pastedHeading = "External paste heading";
+ const pastedLink = "External paste link";
+ const html = `
+ <section>
+ <article>
+ <h2>${pastedHeading}</h2>
+ <p>Nested external paste paragraph.</p>
+ <a href="/external-paste">${pastedLink}</a>
+ </article>
+ </section>
+ `;
+
+ await measure(
+ "pages actions open builder for external html paste",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ const initialSectionCount = await getElementTagCount({
+ fixture,
+ tag: "section",
+ });
+ const initialArticleCount = await getElementTagCount({
+ fixture,
+ tag: "article",
+ });
+
+ await measure("pages actions paste external html into body", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "Body" });
+ await pastePlainTextFromClipboardShortcut({ page, text: html });
+ });
+ await waitForCanvasText({ page, text: pastedHeading });
+ await waitForCanvasText({ page, text: pastedLink });
+
+ const pastedSectionCount = await getElementTagWithTextCount({
+ fixture,
+ tag: "section",
+ text: pastedHeading,
+ });
+ const pastedArticleCount = await getElementTagWithTextCount({
+ fixture,
+ tag: "article",
+ text: pastedLink,
+ });
+ if (pastedSectionCount !== 1) {
+ throw new Error(
+ `Expected pasted HTML to create one section containing "${pastedHeading}", found ${pastedSectionCount}`
+ );
+ }
+ if (pastedArticleCount !== 1) {
+ throw new Error(
+ `Expected pasted HTML to create one article containing "${pastedLink}", found ${pastedArticleCount}`
+ );
+ }
+
+ await measure("pages actions reload external html paste", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: pastedHeading });
+ await waitForCanvasText({ page, text: pastedLink });
+
+ const reloadedSectionCount = await getElementTagCount({
+ fixture,
+ tag: "section",
+ });
+ const reloadedArticleCount = await getElementTagCount({
+ fixture,
+ tag: "article",
+ });
+ if (reloadedSectionCount !== initialSectionCount + 1) {
+ throw new Error(
+ `Expected reload to preserve pasted section. Before ${initialSectionCount}, after ${reloadedSectionCount}`
+ );
+ }
+ if (reloadedArticleCount !== initialArticleCount + 1) {
+ throw new Error(
+ `Expected reload to preserve pasted article. Before ${initialArticleCount}, after ${reloadedArticleCount}`
+ );
+ }
+});
+
+test("Builder copies, pastes, and cuts instances through browser shortcuts", async ({
+ page,
+}) => {
+ const text = "Initial content";
+
+ await measure(
+ "pages actions open builder for instance clipboard shortcuts",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text });
+ await waitForSyncStatus({ page, status: "idle" });
+
+ const initialTextCount = await getExactTextChildCount({ fixture, text });
+ await selectCanvasTextInstance({ page, text });
+ await page.keyboard.press("ControlOrMeta+C");
+ await waitForClipboardTextIncludes({
+ page,
+ text: "@webstudio/instance/v0.1",
+ });
+
+ await pasteFromClipboardShortcut({ page });
+ const pastedFromCanvasSelectionCount = await getExactTextChildCount({
+ fixture,
+ text,
+ });
+ if (pastedFromCanvasSelectionCount !== initialTextCount + 1) {
+ throw new Error(
+ `Expected paste from canvas selection to duplicate text. Before ${initialTextCount}, after ${pastedFromCanvasSelectionCount}`
+ );
+ }
+
+ await cutSelectedInstanceShortcut({ page });
+ const afterCutCount = await getExactTextChildCount({ fixture, text });
+ if (afterCutCount !== initialTextCount) {
+ throw new Error(
+ `Expected cut shortcut to remove selected pasted instance. Before ${initialTextCount}, after ${afterCutCount}`
+ );
+ }
+});
+
+test("Builder pastes instance data into page templates", async ({ page }) => {
+ const templatePasteText = "Template instance paste heading";
+
+ await measure("pages actions open builder for template paste", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await openPage({
+ page,
+ pageName: fixture.pageTemplateName,
+ canvasText: fixture.pageTemplateText,
+ });
+
+ await selectBodyInNavigator({ page });
+ await pasteClipboardData({
+ page,
+ data: {
+ "application/json": createInstanceTransfer({
+ id: "template-instance-json-paste",
+ text: templatePasteText,
+ }),
+ },
+ });
+ await waitForCanvasText({ page, text: templatePasteText });
+
+ const pastedTextCount = await getElementTagWithTextCount({
+ fixture,
+ tag: "p",
+ text: templatePasteText,
+ });
+ if (pastedTextCount !== 1) {
+ throw new Error(
+ `Expected template paste to create one paragraph containing "${templatePasteText}", found ${pastedTextCount}`
+ );
+ }
+});
+
+test("Builder does not insert malformed Webstudio paste data as text", async ({
+ page,
+}) => {
+ const malformedData =
+ '{"@webstudio/instance/v0.1":{"instanceSelector":["missing","body"]';
+
+ await measure("pages actions open builder for malformed paste", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
+ await selectBodyInNavigator({ page });
+
+ await pasteTextFromClipboardShortcutWithoutSave({
+ page,
+ text: malformedData,
+ });
+ await waitForCanvasTextHidden({ page, text: malformedData });
+ const malformedTextCount = await getExactTextChildCount({
+ fixture,
+ text: malformedData,
+ });
+ if (malformedTextCount !== 0) {
+ throw new Error(
+ `Expected malformed Webstudio data not to be inserted as text, found ${malformedTextCount}`
+ );
+ }
+});
+
+test("Builder allows native paste inside focused builder inputs", async ({
+ page,
+}) => {
+ const pastedText = "<section>Native input paste</section>";
+
+ await measure(
+ "pages actions open builder for native input paste",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ await openCommandPanel({ page });
+ const commandInput = page.getByPlaceholder("Type a command or search...", {
+ exact: true,
+ });
+ await page.evaluate(async (text) => {
+ await navigator.clipboard.writeText(text);
+ }, pastedText);
+ await page.keyboard.press("ControlOrMeta+V");
+ await commandInput.waitFor();
+ const value = await commandInput.inputValue();
+ if (value !== pastedText) {
+ throw new Error(
+ `Expected native input paste to preserve text "${pastedText}", got "${value}"`
+ );
+ }
+ await page.keyboard.press("Escape");
+ await waitForCanvasTextHidden({ page, text: pastedText });
+});
diff --git a/apps/builder/e2e/tests/pages-actions.e2e.ts b/apps/builder/e2e/tests/pages-actions.e2e.ts
deleted file mode 100644
index 81b99879cc..0000000000
--- a/apps/builder/e2e/tests/pages-actions.e2e.ts
+++ /dev/null
@@ -1,1296 +0,0 @@
-import type { Page } from "@playwright/test";
-import {
- openProjectBuilder,
- waitForCanvasText,
- waitForCanvasTextHidden,
-} from "../flows/builder";
-import { selectCanvasTextInstance } from "../flows/canvas-selection";
-import { openNavigatorPanel } from "../flows/navigator";
-import { openPage } from "../flows/pages-panel";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-let fixture: SeededContentModeProject;
-let navigatorStructuralFixture: SeededContentModeProject;
-
-type BuildInstanceChild = {
- type: string;
- value?: string;
-};
-
-type BuildInstance = {
- id: string;
- component?: string;
- tag?: string;
- label?: string;
- children?: BuildInstanceChild[];
-};
-
-const fragmentArrays = {
- assets: [],
- dataSources: [],
- resources: [],
- props: [],
- breakpoints: [],
- styleSourceSelections: [],
- styleSources: [],
- styles: [],
-};
-
-const createInstanceTransfer = ({ id, text }: { id: string; text: string }) =>
- JSON.stringify({
- "@webstudio/instance/v0.1": {
- instanceSelector: [id, "source-body"],
- children: [{ type: "id", value: id }],
- instances: [
- {
- type: "instance",
- id,
- component: "ws:element",
- tag: "p",
- children: [{ type: "text", value: text }],
- },
- ],
- ...fragmentArrays,
- },
- });
-
-const loadBuildInstances = async (fixture: SeededContentModeProject) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- return JSON.parse(build.instances) as BuildInstance[];
-};
-
-const createBuildInspector = (instances: BuildInstance[]) => {
- const instancesById = new Map(
- instances.map((instance) => [instance.id, instance])
- );
- const parentByChildId = new Map<string, string>();
-
- for (const instance of instances) {
- for (const child of instance.children ?? []) {
- if (child.type === "id" && child.value !== undefined) {
- parentByChildId.set(child.value, instance.id);
- }
- }
- }
-
- const instanceContainsText = (instanceId: string, text: string): boolean => {
- const instance = instancesById.get(instanceId);
- if (instance === undefined) {
- return false;
- }
- return (
- instance.children?.some((child) => {
- if (child.type === "text") {
- return child.value?.includes(text);
- }
- if (child.type === "id" && child.value !== undefined) {
- return instanceContainsText(child.value, text);
- }
- return false;
- }) ?? false
- );
- };
-
- const collectText = (instanceId: string): string => {
- const instance = instancesById.get(instanceId);
- if (instance === undefined) {
- return "";
- }
- return (instance.children ?? [])
- .map((child) => {
- if (child.type === "text") {
- return child.value ?? "";
- }
- if (child.type === "id" && child.value !== undefined) {
- return collectText(child.value);
- }
- return "";
- })
- .join(" ");
- };
-
- return {
- countComponent: (component: string) =>
- instances.filter((instance) => instance.component === component).length,
- countElementTag: (tag: string) =>
- instances.filter(
- (instance) =>
- instance.component === "ws:element" && instance.tag === tag
- ).length,
- countElementTagWithText: ({ tag, text }: { tag: string; text: string }) =>
- instances.filter(
- (instance) =>
- instance.component === "ws:element" &&
- instance.tag === tag &&
- instanceContainsText(instance.id, text)
- ).length,
- countInstancesWithText: (text: string) =>
- instances.filter((instance) => instanceContainsText(instance.id, text))
- .length,
- countExactTextChildren: (text: string) =>
- instances.reduce((count, instance) => {
- return (
- count +
- (instance.children?.filter(
- (child) => child.type === "text" && child.value === text
- ).length ?? 0)
- );
- }, 0),
- getElementWithTextParentTag: ({
- tag,
- text,
- }: {
- tag: string;
- text: string;
- }) => {
- const instance = instances.find(
- (instance) =>
- instance.component === "ws:element" &&
- instance.tag === tag &&
- instanceContainsText(instance.id, text)
- );
- const parentId =
- instance === undefined ? undefined : parentByChildId.get(instance.id);
- return parentId === undefined
- ? undefined
- : instancesById.get(parentId)?.tag;
- },
- getDirectChildTextOrder: ({
- parentTag,
- texts,
- }: {
- parentTag: string;
- texts: string[];
- }) => {
- const parent = instances.find(
- (instance) =>
- instance.component === "ws:element" && instance.tag === parentTag
- );
- if (parent === undefined) {
- return [];
- }
- return (parent.children ?? [])
- .flatMap((child, index) => {
- if (child.type !== "id" || child.value === undefined) {
- return [];
- }
- const content = collectText(child.value);
- return texts
- .filter((text) => content.includes(text))
- .map((text) => ({ text, index }));
- })
- .sort((left, right) => left.index - right.index)
- .map(({ text }) => text);
- },
- countLabel: (label: string) =>
- instances.filter((instance) => instance.label === label).length,
- };
-};
-
-const inspectBuild = async (fixture: SeededContentModeProject) =>
- createBuildInspector(await loadBuildInstances(fixture));
-
-const getInstanceComponentCount = async ({
- fixture,
- component,
-}: {
- fixture: SeededContentModeProject;
- component: string;
-}) => {
- return (await inspectBuild(fixture)).countComponent(component);
-};
-
-const getElementTagCount = async ({
- fixture,
- tag,
-}: {
- fixture: SeededContentModeProject;
- tag: string;
-}) => {
- return (await inspectBuild(fixture)).countElementTag(tag);
-};
-
-const getElementTagWithTextCount = async ({
- fixture,
- tag,
- text,
-}: {
- fixture: SeededContentModeProject;
- tag: string;
- text: string;
-}) => {
- return (await inspectBuild(fixture)).countElementTagWithText({ tag, text });
-};
-
-const getExactTextChildCount = async ({
- fixture,
- text,
-}: {
- fixture: SeededContentModeProject;
- text: string;
-}) => {
- return (await inspectBuild(fixture)).countExactTextChildren(text);
-};
-
-const getElementWithTextParentTag = async ({
- fixture,
- tag,
- text,
-}: {
- fixture: SeededContentModeProject;
- tag: string;
- text: string;
-}) => {
- return (await inspectBuild(fixture)).getElementWithTextParentTag({
- tag,
- text,
- });
-};
-
-const getDirectChildTextOrder = async ({
- fixture,
- parentTag,
- texts,
-}: {
- fixture: SeededContentModeProject;
- parentTag: string;
- texts: string[];
-}) => {
- return (await inspectBuild(fixture)).getDirectChildTextOrder({
- parentTag,
- texts,
- });
-};
-
-const getInstanceLabelCount = async ({
- fixture,
- label,
-}: {
- fixture: SeededContentModeProject;
- label: string;
-}) => {
- return (await inspectBuild(fixture)).countLabel(label);
-};
-
-const pastePlainTextFromClipboardShortcut = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- await page.evaluate(async (text) => {
- await navigator.clipboard.writeText(text);
- }, text);
- const save = waitForChangeToBeSaved({ page });
- await page.keyboard.press("ControlOrMeta+V");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const pasteFromClipboardShortcut = async ({ page }: { page: Page }) => {
- const save = waitForChangeToBeSaved({ page }).catch(() => undefined);
- await page.keyboard.press("ControlOrMeta+V");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const cutSelectedInstanceShortcut = async ({ page }: { page: Page }) => {
- const save = waitForChangeToBeSaved({ page });
- await page.keyboard.press("ControlOrMeta+X");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const pasteTextFromClipboardShortcutWithoutSave = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- await page.evaluate(async (text) => {
- await navigator.clipboard.writeText(text);
- }, text);
- await page.keyboard.press("ControlOrMeta+V");
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const waitForClipboardTextIncludes = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- await page.waitForFunction(async (text) => {
- try {
- return (await navigator.clipboard.readText()).includes(text as string);
- } catch {
- return false;
- }
- }, text);
-};
-
-const pasteClipboardData = async ({
- page,
- data,
- waitForSave = true,
-}: {
- page: Page;
- data: Record<string, string>;
- waitForSave?: boolean;
-}) => {
- const save = waitForSave ? waitForChangeToBeSaved({ page }) : undefined;
- await page.evaluate((data) => {
- const clipboardData = new DataTransfer();
- for (const [mimeType, value] of Object.entries(data)) {
- clipboardData.setData(mimeType, value);
- }
- document.dispatchEvent(
- new ClipboardEvent("paste", {
- bubbles: true,
- cancelable: true,
- clipboardData,
- })
- );
- }, data);
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const moveSelectedNavigatorInstance = async ({
- page,
- shortcut,
-}: {
- page: Page;
- shortcut: "Control+ArrowLeft" | "Control+ArrowRight" | "Control+ArrowUp";
-}) => {
- const save = waitForChangeToBeSaved({ page });
- await page.keyboard.press(shortcut);
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const openComponentsPanel = async ({ page }: { page: Page }) => {
- await page.getByRole("tab", { name: "Components" }).click();
- await page.getByPlaceholder("Find components").waitFor();
-};
-
-const searchComponentsPanel = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- const search = page.getByPlaceholder("Find components");
- await search.fill(text);
-};
-
-const insertComponentPanelOption = async ({
- page,
- name,
-}: {
- page: Page;
- name: string;
-}) => {
- await searchComponentsPanel({ page, text: name });
- await page.getByRole("option", { name, exact: true }).click();
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const openCommandPanel = async ({ page }: { page: Page }) => {
- await page.keyboard.press("ControlOrMeta+K");
- await page
- .getByPlaceholder("Type a command or search...", { exact: true })
- .waitFor();
-};
-
-const selectCommandPanelItem = async ({
- page,
- text,
-}: {
- page: Page;
- text: string;
-}) => {
- const item = page.locator("[cmdk-item]").filter({ hasText: text }).first();
- await item.waitFor({ state: "visible" });
- await item.dblclick();
-};
-
-const runCommandPanelStructuralAction = async ({
- page,
- command,
- option,
-}: {
- page: Page;
- command: "Wrap" | "Convert" | "Unwrap";
- option?: string;
-}) => {
- await openCommandPanel({ page });
- const commandInput = page.getByPlaceholder("Type a command or search...", {
- exact: true,
- });
- await commandInput.fill(command);
- await selectCommandPanelItem({ page, text: command });
- if (option === undefined) {
- await waitForChangeToBeSaved({ page });
- return;
- }
-
- const optionInput = page
- .getByPlaceholder(
- command === "Wrap"
- ? "Search components to wrap with..."
- : "Search components to convert...",
- { exact: true }
- )
- .first();
- await optionInput.waitFor();
- await optionInput.fill(option);
- await selectCommandPanelItem({ page, text: option });
- await waitForChangeToBeSaved({ page });
-};
-
-const runCommandPanelTagInsertion = async ({
- page,
- tag,
-}: {
- page: Page;
- tag: string;
-}) => {
- await openCommandPanel({ page });
- const commandInput = page.getByPlaceholder("Type a command or search...", {
- exact: true,
- });
- await commandInput.fill(tag);
- await selectCommandPanelItem({ page, text: `<${tag}>` });
- await waitForChangeToBeSaved({ page });
-};
-
-const selectCommandPanelInstance = async ({
- page,
- label,
-}: {
- page: Page;
- label: string;
-}) => {
- await openCommandPanel({ page });
- const commandInput = page.getByPlaceholder("Type a command or search...", {
- exact: true,
- });
- await commandInput.fill(label);
- await selectCommandPanelItem({ page, text: label });
-};
-
-const selectNavigatorItem = async ({
- page,
- itemName,
-}: {
- page: Page;
- itemName: string;
-}) => {
- const item = page
- .locator("[data-navigator-tree] [data-tree-button]")
- .filter({ hasText: itemName })
- .last();
- await item.waitFor({ state: "visible" });
- await item.click();
- await item.click();
-};
-
-const selectBodyInNavigator = async ({ page }: { page: Page }) => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "Body" });
-};
-
-const editSelectedNavigatorLabel = async ({
- page,
- label,
-}: {
- page: Page;
- label: string;
-}) => {
- await page.keyboard.press("ControlOrMeta+E");
- const editableLabel = page.locator('[contenteditable="plaintext-only"]');
- await editableLabel.waitFor({ state: "visible" });
- await editableLabel.fill(label);
- await editableLabel.press("Enter");
- await waitForChangeToBeSaved({ page });
-};
-
-test.beforeAll(async ({ browser }) => {
- await withBrowserContext(browser, async (context) => {
- fixture = await createContentModeProject({
- context,
- email: "[email protected]",
- title: "Pages Actions E2E",
- assetNamePrefix: "pages-actions-",
- editorToken: "pages-actions-e2e-editor-token",
- builderToken: "pages-actions-e2e-builder-token",
- });
- navigatorStructuralFixture = await createContentModeProject({
- context,
- email: "[email protected]",
- title: "Pages Actions Navigator Structural E2E",
- assetNamePrefix: "pages-actions-navigator-structural-",
- editorToken: "pages-actions-navigator-structural-e2e-editor-token",
- builderToken: "pages-actions-navigator-structural-e2e-builder-token",
- });
- });
-});
-
-test("Builder Navigator keyboard move, reparent, and reorder persist after reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const sectionText = "Navigator move section";
- const asideText = "Navigator move aside";
- const html = `
- <section>
- <h2>${sectionText}</h2>
- </section>
- <aside>
- <p>${asideText}</p>
- </aside>
- `;
-
- try {
- await measure(
- "pages actions open builder for navigator keyboard moves",
- async () => {
- await openProjectBuilder({
- page,
- projectId: navigatorStructuralFixture.projectId,
- authToken: navigatorStructuralFixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
-
- await measure("pages actions paste navigator move siblings", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "Body" });
- await pastePlainTextFromClipboardShortcut({ page, text: html });
- });
- await waitForCanvasText({ page, text: sectionText });
- await waitForCanvasText({ page, text: asideText });
-
- await measure(
- "pages actions move navigator item into previous sibling",
- async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "aside" });
- await moveSelectedNavigatorInstance({
- page,
- shortcut: "Control+ArrowRight",
- });
- }
- );
- const reparentedParentTag = await getElementWithTextParentTag({
- fixture: navigatorStructuralFixture,
- tag: "aside",
- text: asideText,
- });
- if (reparentedParentTag !== "section") {
- throw new Error(
- `Expected Navigator move-in to reparent aside into section, found parent ${reparentedParentTag}`
- );
- }
-
- await measure("pages actions move navigator item back out", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "aside" });
- await moveSelectedNavigatorInstance({
- page,
- shortcut: "Control+ArrowLeft",
- });
- });
- const outdentedParentTag = await getElementWithTextParentTag({
- fixture: navigatorStructuralFixture,
- tag: "aside",
- text: asideText,
- });
- if (outdentedParentTag !== "body") {
- throw new Error(
- `Expected Navigator move-out to reparent aside back to body, found parent ${outdentedParentTag}`
- );
- }
-
- await measure(
- "pages actions reorder navigator item above previous sibling",
- async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "aside" });
- await moveSelectedNavigatorInstance({
- page,
- shortcut: "Control+ArrowUp",
- });
- }
- );
- const reorderedTextOrder = await getDirectChildTextOrder({
- fixture: navigatorStructuralFixture,
- parentTag: "body",
- texts: [sectionText, asideText],
- });
- if (reorderedTextOrder.join("|") !== `${asideText}|${sectionText}`) {
- throw new Error(
- `Expected Navigator move-up to place aside before section, found order ${reorderedTextOrder.join(" -> ")}`
- );
- }
-
- await measure("pages actions reload navigator keyboard moves", async () => {
- await openProjectBuilder({
- page,
- projectId: navigatorStructuralFixture.projectId,
- authToken: navigatorStructuralFixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: sectionText });
- await waitForCanvasText({ page, text: asideText });
- const reloadedParentTag = await getElementWithTextParentTag({
- fixture: navigatorStructuralFixture,
- tag: "aside",
- text: asideText,
- });
- const reloadedTextOrder = await getDirectChildTextOrder({
- fixture: navigatorStructuralFixture,
- parentTag: "body",
- texts: [sectionText, asideText],
- });
- if (reloadedParentTag !== "body") {
- throw new Error(
- `Expected reload to preserve moved aside under body, found parent ${reloadedParentTag}`
- );
- }
- if (reloadedTextOrder.join("|") !== `${asideText}|${sectionText}`) {
- throw new Error(
- `Expected reload to preserve Navigator reorder, found order ${reloadedTextOrder.join(" -> ")}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder command panel structural mutations persist after reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const anchorText = "Initial content";
- const componentName = "Image";
-
- try {
- await measure(
- "pages actions open builder for command structural actions",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: anchorText });
- await selectCanvasTextInstance({ page, text: anchorText });
-
- await measure(
- "pages actions insert component before structural actions",
- async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({ page, name: componentName });
- }
- );
- const insertedImageCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
-
- const initialDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- const initialSectionCount = await getElementTagCount({
- fixture,
- tag: "section",
- });
-
- await measure(
- "pages actions wrap selected instance from command panel",
- async () => {
- await runCommandPanelStructuralAction({
- page,
- command: "Wrap",
- option: "div",
- });
- }
- );
- const wrappedDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- if (wrappedDivCount !== initialDivCount + 1) {
- throw new Error(
- `Expected command panel Wrap to add one div. Before ${initialDivCount}, after ${wrappedDivCount}`
- );
- }
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "div" });
-
- await measure(
- "pages actions convert wrapper from command panel",
- async () => {
- await runCommandPanelStructuralAction({
- page,
- command: "Convert",
- option: "section",
- });
- }
- );
- const convertedDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- const convertedSectionCount = await getElementTagCount({
- fixture,
- tag: "section",
- });
- if (convertedDivCount !== initialDivCount) {
- throw new Error(
- `Expected command panel Convert to replace the wrapper div. Before ${initialDivCount}, after ${convertedDivCount}`
- );
- }
- if (convertedSectionCount !== initialSectionCount + 1) {
- throw new Error(
- `Expected command panel Convert to add one section. Before ${initialSectionCount}, after ${convertedSectionCount}`
- );
- }
- await measure(
- "pages actions reload command structural actions",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: anchorText });
- const reloadedSectionCount = await getElementTagCount({
- fixture,
- tag: "section",
- });
- const reloadedImageCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (reloadedSectionCount !== initialSectionCount + 1) {
- throw new Error(
- `Expected reload to preserve command panel converted section wrapper. Before ${initialSectionCount}, after ${reloadedSectionCount}`
- );
- }
- if (reloadedImageCount !== insertedImageCount) {
- throw new Error(
- `Expected reload to preserve command panel target ${componentName}. Before ${insertedImageCount}, after ${reloadedImageCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder Navigator label and command unwrap persist after reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const anchorText = "Initial content";
- const componentName = "Image";
- const renamedLabel = "Hero media";
-
- try {
- await measure(
- "pages actions open builder for label and unwrap",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: anchorText });
- await selectCanvasTextInstance({ page, text: anchorText });
-
- await measure(
- "pages actions insert component before label and unwrap",
- async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({ page, name: componentName });
- }
- );
- const insertedImageCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- const initialDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
-
- await measure("pages actions edit navigator label", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: componentName });
- await editSelectedNavigatorLabel({ page, label: renamedLabel });
- });
- const renamedCount = await getInstanceLabelCount({
- fixture,
- label: renamedLabel,
- });
- if (renamedCount !== 1) {
- throw new Error(
- `Expected one Navigator label "${renamedLabel}" after rename, found ${renamedCount}`
- );
- }
-
- await measure(
- "pages actions wrap renamed component before unwrap",
- async () => {
- await runCommandPanelStructuralAction({
- page,
- command: "Wrap",
- option: "div",
- });
- }
- );
- const wrappedDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- if (wrappedDivCount !== initialDivCount + 1) {
- throw new Error(
- `Expected wrap before unwrap to add one div. Before ${initialDivCount}, after ${wrappedDivCount}`
- );
- }
-
- await measure(
- "pages actions unwrap renamed component from command panel",
- async () => {
- await selectCommandPanelInstance({ page, label: renamedLabel });
- await runCommandPanelStructuralAction({
- page,
- command: "Unwrap",
- });
- }
- );
- const unwrappedDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- const unwrappedImageCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (unwrappedDivCount !== initialDivCount) {
- throw new Error(
- `Expected unwrap to remove the wrapper div. Before ${initialDivCount}, after ${unwrappedDivCount}`
- );
- }
- if (unwrappedImageCount !== insertedImageCount) {
- throw new Error(
- `Expected unwrap to preserve ${componentName}. Before ${insertedImageCount}, after ${unwrappedImageCount}`
- );
- }
-
- await measure("pages actions reload label and unwrap", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- const reloadedLabelCount = await getInstanceLabelCount({
- fixture,
- label: renamedLabel,
- });
- const reloadedDivCount = await getElementTagCount({
- fixture,
- tag: "div",
- });
- const reloadedImageCount = await getInstanceComponentCount({
- fixture,
- component: componentName,
- });
- if (reloadedLabelCount !== 1) {
- throw new Error(
- `Expected reload to preserve Navigator label "${renamedLabel}", found ${reloadedLabelCount}`
- );
- }
- if (reloadedDivCount !== initialDivCount) {
- throw new Error(
- `Expected reload to preserve unwrapped tree. Before ${initialDivCount}, after ${reloadedDivCount}`
- );
- }
- if (reloadedImageCount !== insertedImageCount) {
- throw new Error(
- `Expected reload to preserve unwrapped ${componentName}. Before ${insertedImageCount}, after ${reloadedImageCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder command panel tag insertion persists after reload", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const anchorText = "Initial content";
- const tag = "aside";
-
- try {
- await measure(
- "pages actions open builder for command tag insertion",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: anchorText });
-
- const initialAsideCount = await getElementTagCount({
- fixture,
- tag,
- });
-
- await measure(
- "pages actions select body before command tag insertion",
- async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "Body" });
- }
- );
-
- await measure("pages actions insert tag from command panel", async () => {
- await runCommandPanelTagInsertion({ page, tag });
- });
- const insertedAsideCount = await getElementTagCount({
- fixture,
- tag,
- });
- if (insertedAsideCount !== initialAsideCount + 1) {
- throw new Error(
- `Expected command panel tag insertion to add one ${tag}. Before ${initialAsideCount}, after ${insertedAsideCount}`
- );
- }
-
- await measure("pages actions reload command tag insertion", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- const reloadedAsideCount = await getElementTagCount({
- fixture,
- tag,
- });
- if (reloadedAsideCount !== initialAsideCount + 1) {
- throw new Error(
- `Expected reload to preserve command panel ${tag} insertion. Before ${initialAsideCount}, after ${reloadedAsideCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder pastes external HTML fragments through clipboard and reloads them", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const pastedHeading = "External paste heading";
- const pastedLink = "External paste link";
- const html = `
- <section>
- <article>
- <h2>${pastedHeading}</h2>
- <p>Nested external paste paragraph.</p>
- <a href="/external-paste">${pastedLink}</a>
- </article>
- </section>
- `;
-
- try {
- await measure(
- "pages actions open builder for external html paste",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
-
- const initialSectionCount = await getElementTagCount({
- fixture,
- tag: "section",
- });
- const initialArticleCount = await getElementTagCount({
- fixture,
- tag: "article",
- });
-
- await measure("pages actions paste external html into body", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "Body" });
- await pastePlainTextFromClipboardShortcut({ page, text: html });
- });
- await waitForCanvasText({ page, text: pastedHeading });
- await waitForCanvasText({ page, text: pastedLink });
-
- const pastedSectionCount = await getElementTagWithTextCount({
- fixture,
- tag: "section",
- text: pastedHeading,
- });
- const pastedArticleCount = await getElementTagWithTextCount({
- fixture,
- tag: "article",
- text: pastedLink,
- });
- if (pastedSectionCount !== 1) {
- throw new Error(
- `Expected pasted HTML to create one section containing "${pastedHeading}", found ${pastedSectionCount}`
- );
- }
- if (pastedArticleCount !== 1) {
- throw new Error(
- `Expected pasted HTML to create one article containing "${pastedLink}", found ${pastedArticleCount}`
- );
- }
-
- await measure("pages actions reload external html paste", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: pastedHeading });
- await waitForCanvasText({ page, text: pastedLink });
-
- const reloadedSectionCount = await getElementTagCount({
- fixture,
- tag: "section",
- });
- const reloadedArticleCount = await getElementTagCount({
- fixture,
- tag: "article",
- });
- if (reloadedSectionCount !== initialSectionCount + 1) {
- throw new Error(
- `Expected reload to preserve pasted section. Before ${initialSectionCount}, after ${reloadedSectionCount}`
- );
- }
- if (reloadedArticleCount !== initialArticleCount + 1) {
- throw new Error(
- `Expected reload to preserve pasted article. Before ${initialArticleCount}, after ${reloadedArticleCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder copies, pastes, and cuts instances through browser shortcuts", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const text = "Initial content";
-
- try {
- await measure(
- "pages actions open builder for instance clipboard shortcuts",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text });
- await waitForSyncStatus({ page, status: "idle" });
-
- const initialTextCount = await getExactTextChildCount({ fixture, text });
- await selectCanvasTextInstance({ page, text });
- await page.keyboard.press("ControlOrMeta+C");
- await waitForClipboardTextIncludes({
- page,
- text: "@webstudio/instance/v0.1",
- });
-
- await pasteFromClipboardShortcut({ page });
- const pastedFromCanvasSelectionCount = await getExactTextChildCount({
- fixture,
- text,
- });
- if (pastedFromCanvasSelectionCount !== initialTextCount + 1) {
- throw new Error(
- `Expected paste from canvas selection to duplicate text. Before ${initialTextCount}, after ${pastedFromCanvasSelectionCount}`
- );
- }
-
- await cutSelectedInstanceShortcut({ page });
- const afterCutCount = await getExactTextChildCount({ fixture, text });
- if (afterCutCount !== initialTextCount) {
- throw new Error(
- `Expected cut shortcut to remove selected pasted instance. Before ${initialTextCount}, after ${afterCutCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder pastes instance data into page templates", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const templatePasteText = "Template instance paste heading";
-
- try {
- await measure("pages actions open builder for template paste", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await openPage({
- page,
- pageName: fixture.pageTemplateName,
- canvasText: fixture.pageTemplateText,
- });
-
- await selectBodyInNavigator({ page });
- await pasteClipboardData({
- page,
- data: {
- "application/json": createInstanceTransfer({
- id: "template-instance-json-paste",
- text: templatePasteText,
- }),
- },
- });
- await waitForCanvasText({ page, text: templatePasteText });
-
- const pastedTextCount = await getElementTagWithTextCount({
- fixture,
- tag: "p",
- text: templatePasteText,
- });
- if (pastedTextCount !== 1) {
- throw new Error(
- `Expected template paste to create one paragraph containing "${templatePasteText}", found ${pastedTextCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder does not insert malformed Webstudio paste data as text", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const malformedData =
- '{"@webstudio/instance/v0.1":{"instanceSelector":["missing","body"]';
-
- try {
- await measure(
- "pages actions open builder for malformed paste",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
- await selectBodyInNavigator({ page });
-
- await pasteTextFromClipboardShortcutWithoutSave({
- page,
- text: malformedData,
- });
- await waitForCanvasTextHidden({ page, text: malformedData });
- const malformedTextCount = await getExactTextChildCount({
- fixture,
- text: malformedData,
- });
- if (malformedTextCount !== 0) {
- throw new Error(
- `Expected malformed Webstudio data not to be inserted as text, found ${malformedTextCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder allows native paste inside focused builder inputs", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- const pastedText = "<section>Native input paste</section>";
-
- try {
- await measure(
- "pages actions open builder for native input paste",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
-
- await openCommandPanel({ page });
- const commandInput = page.getByPlaceholder("Type a command or search...", {
- exact: true,
- });
- await page.evaluate(async (text) => {
- await navigator.clipboard.writeText(text);
- }, pastedText);
- await page.keyboard.press("ControlOrMeta+V");
- await commandInput.waitFor();
- const value = await commandInput.inputValue();
- if (value !== pastedText) {
- throw new Error(
- `Expected native input paste to preserve text "${pastedText}", got "${value}"`
- );
- }
- await page.keyboard.press("Escape");
- await waitForCanvasTextHidden({ page, text: pastedText });
- } finally {
- await close();
- }
-});
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..09de235935
--- /dev/null
+++ b/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts
@@ -0,0 +1,48 @@
+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 { test, withBrowserContext } from "../test";
+
+let fixture: Awaited<ReturnType<typeof createDragProject>>;
+
+test.beforeAll(async ({ browser }) => {
+ fixture = await withBrowserContext(browser, (context) =>
+ createDragProject(context, "pages")
+ );
+});
+
+test("Pages panel pointer drag reorders and nests pages", async ({ page }) => {
+ 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]);
+});
diff --git a/apps/builder/e2e/tests/pages-drag.e2e.ts b/apps/builder/e2e/tests/pages-drag.e2e.ts
deleted file mode 100644
index 43c59a66f9..0000000000
--- a/apps/builder/e2e/tests/pages-drag.e2e.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-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, withBrowserContext } from "../test";
-
-let fixture: Awaited<ReturnType<typeof createDragProject>>;
-
-test.beforeAll(async ({ browser }) => {
- fixture = await withBrowserContext(browser, (context) =>
- createDragProject(context, "pages")
- );
-});
-
-test("Pages panel pointer drag reorders and nests pages", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
- 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/preview-links.e2e.ts b/apps/builder/e2e/tests/preview-links.[shard-1].e2e.ts
similarity index 72%
rename from apps/builder/e2e/tests/preview-links.e2e.ts
rename to apps/builder/e2e/tests/preview-links.[shard-1].e2e.ts
index d1b2a27be1..1c4d821cd7 100644
--- a/apps/builder/e2e/tests/preview-links.e2e.ts
+++ b/apps/builder/e2e/tests/preview-links.[shard-1].e2e.ts
@@ -6,12 +6,7 @@ import {
} from "../flows/generated-app";
import { createContentModeProject } from "../fixtures/content-mode-suite";
import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";
-import {
- getProjectBuilderUrl,
- newIsolatedPage,
- test,
- withBrowserContext,
-} from "../test";
+import { getProjectBuilderUrl, test, withBrowserContext } from "../test";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
type PageData = {
@@ -318,124 +313,113 @@ test.beforeAll(async ({ browser }) => {
});
test("Preview links expose current page state for components and element anchors", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- await openBuilderUrl({ page, url: getPreviewUrl({}) });
- let canvas = await waitForCanvasFrame({ page });
- await expectActiveLink({
- canvas,
- text: previewLinkText.homeLink,
- active: true,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageLink,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.richTextLink,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageAnchor,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageQueryLink,
- active: false,
- });
+ await openBuilderUrl({ page, url: getPreviewUrl({}) });
+ let canvas = await waitForCanvasFrame({ page });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.homeLink,
+ active: true,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageLink,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.richTextLink,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageAnchor,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageQueryLink,
+ active: false,
+ });
- await canvas.getByRole("link", { name: previewLinkText.pageLink }).click();
- canvas = await waitForCanvasFrame({ page });
- await expectActiveLink({
- canvas,
- text: previewLinkText.homeLink,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageLink,
- active: true,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.richTextLink,
- active: true,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageAnchor,
- active: true,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageQueryLink,
- active: false,
- });
+ await canvas.getByRole("link", { name: previewLinkText.pageLink }).click();
+ canvas = await waitForCanvasFrame({ page });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.homeLink,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageLink,
+ active: true,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.richTextLink,
+ active: true,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageAnchor,
+ active: true,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageQueryLink,
+ active: false,
+ });
- await canvas
- .getByRole("link", { name: previewLinkText.pageQueryLink })
- .click();
- canvas = await waitForCanvasFrame({ page });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageLink,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.richTextLink,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageAnchor,
- active: false,
- });
- await expectActiveLink({
- canvas,
- text: previewLinkText.pageQueryLink,
- active: true,
- });
+ await canvas
+ .getByRole("link", { name: previewLinkText.pageQueryLink })
+ .click();
+ canvas = await waitForCanvasFrame({ page });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageLink,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.richTextLink,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageAnchor,
+ active: false,
+ });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.pageQueryLink,
+ active: true,
+ });
- await openBuilderUrl({
- page,
- url: getPreviewUrl({ pageId: previewPageId, hash: "#section" }),
- });
- canvas = await waitForCanvasFrame({ page });
- await expectActiveLink({
- canvas,
- text: previewLinkText.hashLink,
- active: true,
- });
- } finally {
- await close();
- }
+ await openBuilderUrl({
+ page,
+ url: getPreviewUrl({ pageId: previewPageId, hash: "#section" }),
+ });
+ canvas = await waitForCanvasFrame({ page });
+ await expectActiveLink({
+ canvas,
+ text: previewLinkText.hashLink,
+ active: true,
+ });
});
test("Generated preview renders and navigates linked routes", async ({
- browser,
+ page,
}) => {
- const { page, close } = await newIsolatedPage(browser);
- try {
- await expectGeneratedAppToRender({
- projectId: fixture.projectId,
- path: "/my-page",
- expectedText: previewLinkText.pageLink,
- });
- await expectGeneratedAppNavigation({
- projectId: fixture.projectId,
- page,
- linkText: previewLinkText.pageLink,
- targetPath: "/my-page",
- });
- } finally {
- await close();
- }
+ await expectGeneratedAppToRender({
+ projectId: fixture.projectId,
+ path: "/my-page",
+ expectedText: previewLinkText.pageLink,
+ });
+ await expectGeneratedAppNavigation({
+ projectId: fixture.projectId,
+ page,
+ linkText: previewLinkText.pageLink,
+ targetPath: "/my-page",
+ });
});
diff --git a/apps/builder/e2e/tests/project-settings-runtime.e2e.ts b/apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
similarity index 55%
rename from apps/builder/e2e/tests/project-settings-runtime.e2e.ts
rename to apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
index a148859e06..41d39b9f33 100644
--- a/apps/builder/e2e/tests/project-settings-runtime.e2e.ts
+++ b/apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -18,7 +18,7 @@ import {
expectGeneratedRedirects,
} from "../flows/generated-app";
import { createContentModeProject } from "../fixtures/content-mode-suite";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
type PersistedPages = {
@@ -250,7 +250,7 @@ const expectPersistedProjectSettings = async ({
};
test("Project settings site name and redirects persist after reload", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -262,131 +262,126 @@ test("Project settings site name and redirects persist after reload", async ({
editorToken: "project-settings-runtime-editor-token",
builderToken: "project-settings-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const siteName = "Runtime Settings Site";
const redirect = {
from: "/e2e-old-route",
to: "/",
};
- try {
- await loginWithSecret({ page, email });
+ await loginWithSecret({ page, email });
- await measure("project settings runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
+ await measure("project settings runtime open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
- await measure("project settings runtime update settings", async () => {
- await openProjectSettings({ page });
- await saveSiteName({ page, siteName });
- await setAtomicStyles({ page, checked: false });
- await addRedirect({
- page,
- from: redirect.from,
- to: redirect.to,
- });
+ await measure("project settings runtime update settings", async () => {
+ await openProjectSettings({ page });
+ await saveSiteName({ page, siteName });
+ await setAtomicStyles({ page, checked: false });
+ await addRedirect({
+ page,
+ from: redirect.from,
+ to: redirect.to,
});
+ });
+
+ await expectPersistedProjectSettings({
+ projectId: fixture.projectId,
+ siteName,
+ redirect,
+ });
+ if (
+ (await getPersistedProjectSettings({ projectId: fixture.projectId }))
+ .compiler.atomicStyles !== false
+ ) {
+ throw new Error("Expected atomic CSS setting to persist as disabled.");
+ }
+ await measure(
+ "project settings runtime generated redirect response",
+ async () => {
+ await expectGeneratedAppRedirect({
+ projectId: fixture.projectId,
+ path: redirect.from,
+ status: 301,
+ location: redirect.to,
+ });
+ }
+ );
- await expectPersistedProjectSettings({
+ await measure("project settings runtime reload with redirect", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- siteName,
- redirect,
+ authToken: fixture.builderToken,
});
- if (
- (await getPersistedProjectSettings({ projectId: fixture.projectId }))
- .compiler.atomicStyles !== false
- ) {
- throw new Error("Expected atomic CSS setting to persist as disabled.");
- }
- await measure(
- "project settings runtime generated redirect response",
- async () => {
- await expectGeneratedAppRedirect({
- projectId: fixture.projectId,
- path: redirect.from,
- status: 301,
- location: redirect.to,
- });
- }
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
+ await openProjectSettings({ page });
+ await page.getByLabel("Site name").waitFor();
+ const persistedSiteName = await page.getByLabel("Site name").inputValue();
+ if (persistedSiteName !== siteName) {
+ throw new Error(
+ `Expected project settings site name "${siteName}", received "${persistedSiteName}".`
);
+ }
+ await page.getByRole("option", { name: "Redirects" }).click();
+ await page.getByText(redirect.from, { exact: true }).waitFor();
+ await page.getByRole("option", { name: "Publish" }).click();
+ if (
+ await page
+ .getByRole("checkbox", {
+ name: "Generate atomic CSS when publishing",
+ })
+ .isChecked()
+ ) {
+ throw new Error(
+ "Expected atomic CSS setting to remain disabled after reload."
+ );
+ }
+ await page.getByRole("option", { name: "Redirects" }).click();
- await measure("project settings runtime reload with redirect", async () => {
+ await measure("project settings runtime delete redirect", async () => {
+ await deleteRedirect({ page, from: redirect.from });
+ });
+ await expectPersistedProjectSettings({
+ projectId: fixture.projectId,
+ siteName,
+ });
+ await measure(
+ "project settings runtime generated redirects after delete",
+ async () => {
+ await expectGeneratedRedirects({
+ projectId: fixture.projectId,
+ expectedRedirects: [],
+ });
+ }
+ );
+
+ await measure(
+ "project settings runtime reload after redirect delete",
+ async () => {
await openProjectBuilder({
page,
projectId: fixture.projectId,
authToken: fixture.builderToken,
});
await waitForCanvasText({ page, text: "Initial content" });
- });
- await openProjectSettings({ page });
- await page.getByLabel("Site name").waitFor();
- const persistedSiteName = await page.getByLabel("Site name").inputValue();
- if (persistedSiteName !== siteName) {
- throw new Error(
- `Expected project settings site name "${siteName}", received "${persistedSiteName}".`
- );
}
- await page.getByRole("option", { name: "Redirects" }).click();
- await page.getByText(redirect.from, { exact: true }).waitFor();
- await page.getByRole("option", { name: "Publish" }).click();
- if (
- await page
- .getByRole("checkbox", {
- name: "Generate atomic CSS when publishing",
- })
- .isChecked()
- ) {
- throw new Error(
- "Expected atomic CSS setting to remain disabled after reload."
- );
- }
- await page.getByRole("option", { name: "Redirects" }).click();
-
- await measure("project settings runtime delete redirect", async () => {
- await deleteRedirect({ page, from: redirect.from });
- });
- await expectPersistedProjectSettings({
- projectId: fixture.projectId,
- siteName,
- });
- await measure(
- "project settings runtime generated redirects after delete",
- async () => {
- await expectGeneratedRedirects({
- projectId: fixture.projectId,
- expectedRedirects: [],
- });
- }
- );
-
- await measure(
- "project settings runtime reload after redirect delete",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
- }
- );
- await openProjectSettings({ page });
- await page.getByRole("option", { name: "Redirects" }).click();
- await page.getByText(redirect.from, { exact: true }).waitFor({
- state: "hidden",
- });
- } finally {
- await close();
- }
+ );
+ await openProjectSettings({ page });
+ await page.getByRole("option", { name: "Redirects" }).click();
+ await page.getByText(redirect.from, { exact: true }).waitFor({
+ state: "hidden",
+ });
});
test("Marketplace page settings persist after reload", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -398,7 +393,6 @@ test("Marketplace page settings persist after reload", async ({
editorToken: "marketplace-page-settings-runtime-editor-token",
builderToken: "marketplace-page-settings-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const pageName = "Marketplace Runtime Page";
const category = "Runtime Examples";
@@ -406,105 +400,100 @@ test("Marketplace page settings persist after reload", async ({
marketplaceApprovalStatus: "PENDING",
});
- try {
- await loginWithSecret({ page, email });
+ await loginWithSecret({ page, email });
- await measure("marketplace page settings open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
+ await measure("marketplace page settings open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
- await measure("marketplace page settings create page", async () => {
- await createPageFromTemplate({
- page,
- templateName: fixture.pageTemplateName,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
+ await measure("marketplace page settings create page", async () => {
+ await createPageFromTemplate({
+ page,
+ templateName: fixture.pageTemplateName,
+ pageName,
+ canvasText: fixture.pageTemplateText,
});
+ });
- await measure(
- "marketplace page settings update marketplace fields",
- async () => {
- await openPageSettings({ page, pageName });
- const includeSave = waitForChangeToBeSaved({ page });
- await page.getByLabel("Include in the marketplace").click();
- await includeSave;
- await waitForSyncStatus({ page, status: "idle" });
-
- const categorySave = waitForChangeToBeSaved({ page });
- await page.getByLabel("Category").fill(category);
- await page.getByLabel("Category").blur();
- await categorySave;
- await waitForSyncStatus({ page, status: "idle" });
- }
+ await measure(
+ "marketplace page settings update marketplace fields",
+ async () => {
+ await openPageSettings({ page, pageName });
+ const includeSave = waitForChangeToBeSaved({ page });
+ await page.getByLabel("Include in the marketplace").click();
+ await includeSave;
+ await waitForSyncStatus({ page, status: "idle" });
+
+ const categorySave = waitForChangeToBeSaved({ page });
+ await page.getByLabel("Category").fill(category);
+ await page.getByLabel("Category").blur();
+ await categorySave;
+ await waitForSyncStatus({ page, status: "idle" });
+ }
+ );
+
+ let persistedPage = await getPersistedPageByName({
+ projectId: fixture.projectId,
+ name: pageName,
+ });
+ if (
+ persistedPage.marketplace?.include !== true ||
+ persistedPage.marketplace.category !== category
+ ) {
+ throw new Error(
+ `Expected marketplace settings to persist. Received ${JSON.stringify(
+ persistedPage.marketplace
+ )}`
);
+ }
- let persistedPage = await getPersistedPageByName({
+ await measure("marketplace page settings reload builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- name: pageName,
+ authToken: fixture.builderToken,
});
- if (
- persistedPage.marketplace?.include !== true ||
- persistedPage.marketplace.category !== category
- ) {
- throw new Error(
- `Expected marketplace settings to persist. Received ${JSON.stringify(
- persistedPage.marketplace
- )}`
- );
- }
-
- await measure("marketplace page settings reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await openPage({
- page,
- pageName,
- canvasText: fixture.pageTemplateText,
- });
+ await openPage({
+ page,
+ pageName,
+ canvasText: fixture.pageTemplateText,
});
- await openPageSettings({ page, pageName });
- if (
- (await page.getByLabel("Include in the marketplace").isChecked()) ===
- false
- ) {
- throw new Error("Expected marketplace include switch to stay checked");
- }
- const categoryValue = await page.getByLabel("Category").inputValue();
- if (categoryValue !== category) {
- throw new Error(
- `Expected marketplace category "${category}", received "${categoryValue}"`
- );
- }
- persistedPage = await getPersistedPageByName({
- projectId: fixture.projectId,
- name: pageName,
- });
- if (
- persistedPage.marketplace?.include !== true ||
- persistedPage.marketplace.category !== category
- ) {
- throw new Error(
- `Expected reload to preserve marketplace settings. Received ${JSON.stringify(
- persistedPage.marketplace
- )}`
- );
- }
- } finally {
- await close();
+ });
+ await openPageSettings({ page, pageName });
+ if (
+ (await page.getByLabel("Include in the marketplace").isChecked()) === false
+ ) {
+ throw new Error("Expected marketplace include switch to stay checked");
+ }
+ const categoryValue = await page.getByLabel("Category").inputValue();
+ if (categoryValue !== category) {
+ throw new Error(
+ `Expected marketplace category "${category}", received "${categoryValue}"`
+ );
+ }
+ persistedPage = await getPersistedPageByName({
+ projectId: fixture.projectId,
+ name: pageName,
+ });
+ if (
+ persistedPage.marketplace?.include !== true ||
+ persistedPage.marketplace.category !== category
+ ) {
+ throw new Error(
+ `Expected reload to preserve marketplace settings. Received ${JSON.stringify(
+ persistedPage.marketplace
+ )}`
+ );
}
});
test("Project authentication routes persist after reload and deletion", async ({
- browser,
+ page,
context,
}) => {
const email = "[email protected]";
@@ -516,63 +505,58 @@ test("Project authentication routes persist after reload and deletion", async ({
editorToken: "project-auth-runtime-editor-token",
builderToken: "project-auth-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const route = "/private";
const login = "editor";
const password = "e2e-secret";
- try {
- await loginWithSecret({ page, email });
- await measure("project auth runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
- });
-
- await measure("project auth runtime add route", async () => {
- await openProjectSettings({ page });
- await page.getByRole("option", { name: "Authentication" }).click();
- await page.getByPlaceholder("/private or /docs/*").fill("private");
- if (
- (await page.getByRole("button", { name: "Add" }).isDisabled()) === false
- ) {
- throw new Error("Expected invalid auth route to disable Add.");
- }
- await addBasicAuth({ page, route, login, password });
- });
- await expectPersistedBasicAuth({
+ await loginWithSecret({ page, email });
+ await measure("project auth runtime open builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- route,
- login,
- exists: true,
+ authToken: fixture.builderToken,
});
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
- await measure("project auth runtime reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- await waitForCanvasText({ page, text: "Initial content" });
- });
+ await measure("project auth runtime add route", async () => {
await openProjectSettings({ page });
await page.getByRole("option", { name: "Authentication" }).click();
- await page.getByText(route, { exact: true }).waitFor();
- await page.getByText(login, { exact: true }).waitFor();
+ await page.getByPlaceholder("/private or /docs/*").fill("private");
+ if (
+ (await page.getByRole("button", { name: "Add" }).isDisabled()) === false
+ ) {
+ throw new Error("Expected invalid auth route to disable Add.");
+ }
+ await addBasicAuth({ page, route, login, password });
+ });
+ await expectPersistedBasicAuth({
+ projectId: fixture.projectId,
+ route,
+ login,
+ exists: true,
+ });
- await measure("project auth runtime delete route", async () => {
- await deleteBasicAuth({ page, route });
- });
- await expectPersistedBasicAuth({
+ await measure("project auth runtime reload builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- route,
- login,
- exists: false,
+ authToken: fixture.builderToken,
});
- } finally {
- await close();
- }
+ await waitForCanvasText({ page, text: "Initial content" });
+ });
+ await openProjectSettings({ page });
+ await page.getByRole("option", { name: "Authentication" }).click();
+ await page.getByText(route, { exact: true }).waitFor();
+ await page.getByText(login, { exact: true }).waitFor();
+
+ await measure("project auth runtime delete route", async () => {
+ await deleteBasicAuth({ page, route });
+ });
+ await expectPersistedBasicAuth({
+ projectId: fixture.projectId,
+ route,
+ login,
+ exists: false,
+ });
});
diff --git a/apps/builder/e2e/tests/props-runtime.e2e.ts b/apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
similarity index 78%
rename from apps/builder/e2e/tests/props-runtime.e2e.ts
rename to apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
index 0066140378..39d679a1cc 100644
--- a/apps/builder/e2e/tests/props-runtime.e2e.ts
+++ b/apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -15,7 +15,7 @@ import {
} from "../flows/sync-status";
import { createContentModeProject } from "../fixtures/content-mode-suite";
import { withGeneratedPreview } from "../flows/generated-app";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
const openComponentsPanel = async ({ page }: { page: Page }) => {
@@ -388,7 +388,7 @@ const expectBooleanPropDeleted = async ({
};
test("Webhook Form action submits once and persists after reload", async ({
- browser,
+ page,
context,
}) => {
const fixture = await createContentModeProject({
@@ -399,7 +399,6 @@ test("Webhook Form action submits once and persists after reload", async ({
editorToken: "props-runtime-editor-token",
builderToken: "props-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const webhook = await startWebhookServer();
const text = "Initial content";
const actionUrl = webhook.url;
@@ -478,12 +477,11 @@ test("Webhook Form action submits once and persists after reload", async ({
}
} finally {
await webhook.close();
- await close();
}
});
test("Props panel expression binding persists after reload", async ({
- browser,
+ page,
context,
}) => {
const fixture = await createContentModeProject({
@@ -494,68 +492,63 @@ test("Props panel expression binding persists after reload", async ({
editorToken: "props-expression-runtime-editor-token",
builderToken: "props-expression-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
const anchorText = "Expression-bound link";
const expression = '"/props-expression-link"';
- try {
- await measure("props expression runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
+ await measure("props expression runtime open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCanvasText({ page, text: "Initial content" });
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
- await measure("props expression runtime paste anchor", async () => {
- await openNavigatorPanel({ page });
- await selectNavigatorItem({ page, itemName: "Body" });
- await pastePlainTextFromClipboardShortcut({
- page,
- text: `<a href="/initial-props-link">${anchorText}</a>`,
- });
+ await measure("props expression runtime paste anchor", async () => {
+ await openNavigatorPanel({ page });
+ await selectNavigatorItem({ page, itemName: "Body" });
+ await pastePlainTextFromClipboardShortcut({
+ page,
+ text: `<a href="/initial-props-link">${anchorText}</a>`,
});
- await waitForCanvasText({ page, text: anchorText });
+ });
+ await waitForCanvasText({ page, text: anchorText });
- await measure("props expression runtime bind href", async () => {
- await selectNavigatorItem({ page, itemName: "a" });
- await bindSelectedPropertyToExpression({
- page,
- label: "Href",
- expression,
- });
- });
- await expectPersistedExpressionProp({
- projectId: fixture.projectId,
- tag: "a",
- text: anchorText,
- name: "href",
+ await measure("props expression runtime bind href", async () => {
+ await selectNavigatorItem({ page, itemName: "a" });
+ await bindSelectedPropertyToExpression({
+ page,
+ label: "Href",
expression,
});
+ });
+ await expectPersistedExpressionProp({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: anchorText,
+ name: "href",
+ expression,
+ });
- await measure("props expression runtime reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: anchorText });
- await expectPersistedExpressionProp({
+ await measure("props expression runtime reload builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- tag: "a",
- text: anchorText,
- name: "href",
- expression,
+ authToken: fixture.builderToken,
});
- } finally {
- await close();
- }
+ });
+ await waitForCanvasText({ page, text: anchorText });
+ await expectPersistedExpressionProp({
+ projectId: fixture.projectId,
+ tag: "a",
+ text: anchorText,
+ name: "href",
+ expression,
+ });
});
test("Props panel boolean prop persists after reload", async ({
- browser,
+ page,
context,
}) => {
const fixture = await createContentModeProject({
@@ -566,102 +559,97 @@ test("Props panel boolean prop persists after reload", async ({
editorToken: "props-boolean-runtime-editor-token",
builderToken: "props-boolean-runtime-builder-token",
});
- const { page, close } = await newIsolatedPage(browser);
- try {
- await measure("props boolean runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasText({ page, text: "Initial content" });
-
- await measure("props boolean runtime insert checkbox", async () => {
- await openComponentsPanel({ page });
- await insertComponentPanelOption({
- page,
- name: "Checkbox",
- component: "@webstudio-is/sdk-components-react-radix:Checkbox",
- });
- });
- await selectFirstNavigatorChild({
+ await measure("props boolean runtime open builder", async () => {
+ await openProjectBuilder({
page,
- parentLabel: "Checkbox Field",
- });
- await page.getByRole("tab", { name: "Settings" }).click();
-
- await measure("props boolean runtime set checked", async () => {
- await setSelectedBooleanProperty({
- page,
- label: "Checked",
- checked: true,
- });
- });
- await expectPersistedBooleanProp({
projectId: fixture.projectId,
- component: "@webstudio-is/sdk-components-react-radix:Checkbox",
- name: "checked",
- value: true,
+ authToken: fixture.builderToken,
});
+ });
+ await waitForCanvasText({ page, text: "Initial content" });
- await measure("props boolean runtime reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await selectFirstNavigatorChild({
+ await measure("props boolean runtime insert checkbox", async () => {
+ await openComponentsPanel({ page });
+ await insertComponentPanelOption({
page,
- parentLabel: "Checkbox Field",
+ name: "Checkbox",
+ component: "@webstudio-is/sdk-components-react-radix:Checkbox",
});
- await page.getByRole("tab", { name: "Settings" }).click();
- await waitForSelectedBooleanPropertyValue({
+ });
+ await selectFirstNavigatorChild({
+ page,
+ parentLabel: "Checkbox Field",
+ });
+ await page.getByRole("tab", { name: "Settings" }).click();
+
+ await measure("props boolean runtime set checked", async () => {
+ await setSelectedBooleanProperty({
page,
label: "Checked",
checked: true,
});
- await expectPersistedBooleanProp({
- projectId: fixture.projectId,
- component: "@webstudio-is/sdk-components-react-radix:Checkbox",
- name: "checked",
- value: true,
- });
+ });
+ await expectPersistedBooleanProp({
+ projectId: fixture.projectId,
+ component: "@webstudio-is/sdk-components-react-radix:Checkbox",
+ name: "checked",
+ value: true,
+ });
- await measure("props boolean runtime reset checked", async () => {
- await resetSelectedProperty({ page, label: "Checked" });
- });
- await expectBooleanPropDeleted({
+ await measure("props boolean runtime reload builder", async () => {
+ await openProjectBuilder({
+ page,
projectId: fixture.projectId,
- component: "@webstudio-is/sdk-components-react-radix:Checkbox",
- name: "checked",
+ authToken: fixture.builderToken,
});
+ });
+ await selectFirstNavigatorChild({
+ page,
+ parentLabel: "Checkbox Field",
+ });
+ await page.getByRole("tab", { name: "Settings" }).click();
+ await waitForSelectedBooleanPropertyValue({
+ page,
+ label: "Checked",
+ checked: true,
+ });
+ await expectPersistedBooleanProp({
+ projectId: fixture.projectId,
+ component: "@webstudio-is/sdk-components-react-radix:Checkbox",
+ name: "checked",
+ value: true,
+ });
- await measure("props boolean runtime reload after reset", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await selectFirstNavigatorChild({
- page,
- parentLabel: "Checkbox Field",
- });
- await page.getByRole("tab", { name: "Settings" }).click();
- await waitForSelectedBooleanPropertyValue({
+ await measure("props boolean runtime reset checked", async () => {
+ await resetSelectedProperty({ page, label: "Checked" });
+ });
+ await expectBooleanPropDeleted({
+ projectId: fixture.projectId,
+ component: "@webstudio-is/sdk-components-react-radix:Checkbox",
+ name: "checked",
+ });
+
+ await measure("props boolean runtime reload after reset", async () => {
+ await openProjectBuilder({
page,
- label: "Checked",
- checked: false,
- });
- await expectBooleanPropDeleted({
projectId: fixture.projectId,
- component: "@webstudio-is/sdk-components-react-radix:Checkbox",
- name: "checked",
+ authToken: fixture.builderToken,
});
- } finally {
- await close();
- }
+ });
+ await selectFirstNavigatorChild({
+ page,
+ parentLabel: "Checkbox Field",
+ });
+ await page.getByRole("tab", { name: "Settings" }).click();
+ await waitForSelectedBooleanPropertyValue({
+ page,
+ label: "Checked",
+ checked: false,
+ });
+ await expectBooleanPropDeleted({
+ projectId: fixture.projectId,
+ component: "@webstudio-is/sdk-components-react-radix:Checkbox",
+ name: "checked",
+ });
});
diff --git a/apps/builder/e2e/tests/share-link-permissions.e2e.ts b/apps/builder/e2e/tests/share-link-permissions.[shard-1].e2e.ts
similarity index 100%
rename from apps/builder/e2e/tests/share-link-permissions.e2e.ts
rename to apps/builder/e2e/tests/share-link-permissions.[shard-1].e2e.ts
diff --git a/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts b/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts
new file mode 100644
index 0000000000..3efa5a02ad
--- /dev/null
+++ b/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts
@@ -0,0 +1,787 @@
+import type { Frame, Page } from "@playwright/test";
+import {
+ getCanvasInstance,
+ getCanvasInstanceSelector,
+ openProjectBuilder,
+} from "../flows/builder";
+import { openNavigatorPanel } from "../flows/navigator";
+import { waitForSyncStatus } from "../flows/sync-status";
+import {
+ createSlotKeyboardProject,
+ type SeededSlotKeyboardProject,
+} from "../fixtures/slot-keyboard-project";
+import { test, withBrowserContext } from "../test";
+import { measure } from "../perf";
+
+let fixture: SeededSlotKeyboardProject;
+let detachFixture: SeededSlotKeyboardProject;
+let navigatorFixture: SeededSlotKeyboardProject;
+let navigatorOutdentFixture: SeededSlotKeyboardProject;
+let topChildFixture: SeededSlotKeyboardProject;
+let bottomChildFixture: SeededSlotKeyboardProject;
+let navigatorTopChildFixture: SeededSlotKeyboardProject;
+let navigatorBottomChildFixture: SeededSlotKeyboardProject;
+let multiSelectFixture: SeededSlotKeyboardProject;
+
+const slotASelector = getCanvasInstanceSelector([
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+]);
+
+const expectCanvasInstanceVisible = async ({
+ canvas,
+ instanceSelector,
+}: {
+ canvas: Frame;
+ instanceSelector: string[];
+}) => {
+ await getCanvasInstance({ canvas, instanceSelector }).waitFor({
+ state: "visible",
+ timeout: 30_000,
+ });
+};
+
+test.beforeAll(async ({ browser }) => {
+ await withBrowserContext(browser, async (context) => {
+ fixture = await createSlotKeyboardProject({ context });
+ detachFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Detach E2E",
+ builderToken: "slot-keyboard-detach-e2e-builder-token",
+ });
+ navigatorFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Navigator E2E",
+ builderToken: "slot-keyboard-navigator-e2e-builder-token",
+ });
+ navigatorOutdentFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Navigator Outdent E2E",
+ builderToken: "slot-keyboard-navigator-outdent-e2e-builder-token",
+ });
+ topChildFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Top Child E2E",
+ builderToken: "slot-keyboard-top-child-e2e-builder-token",
+ });
+ bottomChildFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Bottom Child E2E",
+ builderToken: "slot-keyboard-bottom-child-e2e-builder-token",
+ });
+ navigatorTopChildFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Navigator Top Child E2E",
+ builderToken: "slot-keyboard-navigator-top-child-e2e-builder-token",
+ });
+ navigatorBottomChildFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Navigator Bottom Child E2E",
+ builderToken: "slot-keyboard-navigator-bottom-child-e2e-builder-token",
+ });
+ multiSelectFixture = await createSlotKeyboardProject({
+ context,
+ email: "[email protected]",
+ title: "Slot Keyboard Multi Select E2E",
+ builderToken: "slot-keyboard-navigator-multi-select-e2e-builder-token",
+ });
+ });
+});
+
+const expectCanvasInstancePrecedes = async ({
+ canvas,
+ beforeSelector,
+ afterSelector,
+}: {
+ canvas: Frame;
+ beforeSelector: string[];
+ afterSelector: string[];
+}) => {
+ const beforeLocator = getCanvasInstance({
+ canvas,
+ instanceSelector: beforeSelector,
+ });
+ const afterLocator = getCanvasInstance({
+ canvas,
+ instanceSelector: afterSelector,
+ });
+ await beforeLocator.waitFor({ state: "visible", timeout: 30_000 });
+ await afterLocator.waitFor({ state: "visible", timeout: 30_000 });
+ const precedes = await beforeLocator.evaluate((beforeElement, after) => {
+ const afterElement = document.querySelector(after);
+ if (afterElement === null) {
+ return false;
+ }
+ return Boolean(
+ beforeElement.compareDocumentPosition(afterElement) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ );
+ }, getCanvasInstanceSelector(afterSelector));
+ if (precedes === false) {
+ throw new Error(
+ `Expected ${beforeSelector.join(",")} to precede ${afterSelector.join(",")}`
+ );
+ }
+};
+
+const getFocusedTreeButtonText = async ({ page }: { page: Page }) => {
+ return await page.evaluate(() => {
+ const activeElement = document.activeElement;
+ if (activeElement?.hasAttribute("data-tree-button") === false) {
+ return;
+ }
+ return activeElement?.textContent?.trim();
+ });
+};
+
+const getSelectedTreeButtonTexts = async ({ page }: { page: Page }) => {
+ return await page
+ .locator("[data-tree-button][aria-selected='true']")
+ .evaluateAll((buttons) =>
+ buttons.map((button) => button.textContent?.trim() ?? "")
+ );
+};
+
+const expectSelectedTreeButtonTexts = async ({
+ page,
+ expectedTexts,
+}: {
+ page: Page;
+ expectedTexts: string[];
+}) => {
+ await page.waitForFunction(
+ (expected) => {
+ const selectedTexts = Array.from(
+ document.querySelectorAll("[data-tree-button][aria-selected='true']")
+ ).map((button) => button.textContent?.trim() ?? "");
+ return (
+ selectedTexts.length === expected.length &&
+ expected.every((expectedText) =>
+ selectedTexts.some((selectedText) =>
+ selectedText.includes(expectedText)
+ )
+ )
+ );
+ },
+ expectedTexts,
+ { timeout: 10_000 }
+ );
+};
+
+test("Keyboard shortcut moves a shared slot child into the previous sibling", async ({
+ page,
+}) => {
+ const canvas = await measure("slot keyboard open builder", async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ });
+
+ const headingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: headingSelector,
+ });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: headingSelector,
+ }).click();
+
+ await page.keyboard.press("Control+ArrowRight");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ });
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ });
+});
+
+test("Keyboard shortcut keeps Navigator arrows working after outdenting a row", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard navigator outdent open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: navigatorOutdentFixture.projectId,
+ authToken: navigatorOutdentFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+ await openNavigatorPanel({ page });
+ await page.getByRole("button", { name: "Slot Heading" }).first().click();
+
+ await page.keyboard.press("Control+ArrowLeft");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ const focusedTextAfterMove = await getFocusedTreeButtonText({ page });
+ if (focusedTextAfterMove?.includes("Slot Heading") !== true) {
+ throw new Error(
+ `Expected moved Navigator row to keep focus, received ${focusedTextAfterMove}`
+ );
+ }
+
+ await page.keyboard.press("ArrowUp");
+ const focusedTextAfterArrow = await getFocusedTreeButtonText({ page });
+ if (
+ focusedTextAfterArrow === undefined ||
+ focusedTextAfterArrow === focusedTextAfterMove
+ ) {
+ throw new Error(
+ `Expected ArrowUp to move Navigator focus from ${focusedTextAfterMove}, received ${focusedTextAfterArrow}`
+ );
+ }
+});
+
+test("Shift+ArrowDown in Navigator selects exactly one additional row", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard navigator multi-select open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: multiSelectFixture.projectId,
+ authToken: multiSelectFixture.builderToken,
+ });
+ }
+ );
+
+ const slotADivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotADivSelector,
+ }).click();
+ await openNavigatorPanel({ page });
+ await page.getByRole("button", { name: "Drop Div" }).first().click();
+ await expectSelectedTreeButtonTexts({
+ page,
+ expectedTexts: ["Drop Div"],
+ });
+
+ await page.keyboard.press("Shift+ArrowDown");
+
+ await expectSelectedTreeButtonTexts({
+ page,
+ expectedTexts: ["Drop Div", "Slot Heading"],
+ });
+ const focusedText = await getFocusedTreeButtonText({ page });
+ if (focusedText?.includes("Slot Heading") !== true) {
+ throw new Error(
+ `Expected Shift+ArrowDown to focus Slot Heading, received ${focusedText}`
+ );
+ }
+});
+
+test("Control/Command+A after canvas selection selects sibling rows", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard canvas multi-select open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: multiSelectFixture.projectId,
+ authToken: multiSelectFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+
+ await page.keyboard.press("Control+A");
+
+ await openNavigatorPanel({ page });
+ await expectSelectedTreeButtonTexts({
+ page,
+ expectedTexts: ["Drop Div", "Slot Heading"],
+ });
+
+ const selectedTexts = await getSelectedTreeButtonTexts({ page });
+ if (selectedTexts.some((selectedText) => selectedText.includes("Slot A"))) {
+ throw new Error(
+ `Expected Command+A to select only siblings, received ${selectedTexts.join(", ")}`
+ );
+ }
+});
+
+test("Keyboard shortcut moves a direct shared slot child out of all slot occurrences", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard detach open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: detachFixture.projectId,
+ authToken: detachFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+
+ await page.keyboard.press("Control+ArrowLeft");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ });
+});
+
+test("Keyboard shortcut moves the first shared slot child above all slot occurrences", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard top child open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: navigatorTopChildFixture.projectId,
+ authToken: navigatorTopChildFixture.builderToken,
+ });
+ }
+ );
+
+ const slotADivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: slotADivSelector,
+ });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotADivSelector,
+ }).click();
+
+ await page.keyboard.press("Control+ArrowUp");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotADivSelector,
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+
+ const movedDivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: movedDivSelector,
+ });
+
+ const movedDivPrecedesSlotA = await canvas
+ .locator(getCanvasInstanceSelector(movedDivSelector))
+ .evaluate((movedElement, selector) => {
+ const slotA = document.querySelector(selector);
+ if (slotA === null) {
+ return false;
+ }
+ return Boolean(
+ movedElement.compareDocumentPosition(slotA) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ );
+ }, slotASelector);
+ if (movedDivPrecedesSlotA === false) {
+ throw new Error("Expected moved div to be positioned before Slot A");
+ }
+});
+
+test("Keyboard shortcut moves the last shared slot child below all slot occurrences", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard bottom child open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: navigatorBottomChildFixture.projectId,
+ authToken: navigatorBottomChildFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+
+ await page.keyboard.press("Control+ArrowDown");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+
+ const movedHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: movedHeadingSelector,
+ });
+
+ const slotAPrecedesMovedHeading = await canvas
+ .locator(slotASelector)
+ .evaluate((slotA, movedSelector) => {
+ const movedElement = document.querySelector(movedSelector);
+ if (movedElement === null) {
+ return false;
+ }
+ return Boolean(
+ slotA.compareDocumentPosition(movedElement) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ );
+ }, getCanvasInstanceSelector(movedHeadingSelector));
+ if (slotAPrecedesMovedHeading === false) {
+ throw new Error("Expected moved heading to be positioned after Slot A");
+ }
+});
+
+test("Keyboard shortcut reorders a shared slot child from navigator focus", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard navigator open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: navigatorFixture.projectId,
+ authToken: navigatorFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+ await openNavigatorPanel({ page });
+ await page.getByRole("button", { name: "Slot Heading" }).first().click();
+ await page.keyboard.press("Control+ArrowUp");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ const slotADivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ const slotBHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ const slotBDivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+
+ await expectCanvasInstancePrecedes({
+ canvas,
+ beforeSelector: slotAHeadingSelector,
+ afterSelector: slotADivSelector,
+ });
+ await expectCanvasInstancePrecedes({
+ canvas,
+ beforeSelector: slotBHeadingSelector,
+ afterSelector: slotBDivSelector,
+ });
+});
+
+test("Keyboard shortcut moves the first shared slot child above all slot occurrences from navigator focus", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard navigator top child open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: topChildFixture.projectId,
+ authToken: topChildFixture.builderToken,
+ });
+ }
+ );
+
+ const slotADivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotADivSelector,
+ }).click();
+ await openNavigatorPanel({ page });
+ await page.getByRole("button", { name: "Drop Div" }).first().click();
+
+ await page.keyboard.press("Control+ArrowUp");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotADivSelector,
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-div",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+
+ const movedDivSelector = [
+ "slot-keyboard-div",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: movedDivSelector,
+ });
+
+ const movedDivPrecedesSlotA = await canvas
+ .locator(getCanvasInstanceSelector(movedDivSelector))
+ .evaluate((movedElement, selector) => {
+ const slotA = document.querySelector(selector);
+ if (slotA === null) {
+ return false;
+ }
+ return Boolean(
+ movedElement.compareDocumentPosition(slotA) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ );
+ }, slotASelector);
+ if (movedDivPrecedesSlotA === false) {
+ throw new Error("Expected moved div to be positioned before Slot A");
+ }
+});
+
+test("Keyboard shortcut moves the last shared slot child below all slot occurrences from navigator focus", async ({
+ page,
+}) => {
+ const canvas = await measure(
+ "slot keyboard navigator bottom child open builder",
+ async () => {
+ return await openProjectBuilder({
+ page,
+ projectId: bottomChildFixture.projectId,
+ authToken: bottomChildFixture.builderToken,
+ });
+ }
+ );
+
+ const slotAHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-a",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).click();
+ await openNavigatorPanel({ page });
+ await page.getByRole("button", { name: "Slot Heading" }).first().click();
+
+ await page.keyboard.press("Control+ArrowDown");
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: slotAHeadingSelector,
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+ await getCanvasInstance({
+ canvas,
+ instanceSelector: [
+ "slot-keyboard-heading",
+ "slot-keyboard-fragment",
+ "slot-keyboard-slot-b",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ],
+ }).waitFor({ state: "hidden", timeout: 30_000 });
+
+ const movedHeadingSelector = [
+ "slot-keyboard-heading",
+ "slot-keyboard-wrapper",
+ "slot-keyboard-body",
+ ];
+ await expectCanvasInstanceVisible({
+ canvas,
+ instanceSelector: movedHeadingSelector,
+ });
+
+ const slotAPrecedesMovedHeading = await canvas
+ .locator(slotASelector)
+ .evaluate((slotA, movedSelector) => {
+ const movedElement = document.querySelector(movedSelector);
+ if (movedElement === null) {
+ return false;
+ }
+ return Boolean(
+ slotA.compareDocumentPosition(movedElement) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ );
+ }, getCanvasInstanceSelector(movedHeadingSelector));
+ if (slotAPrecedesMovedHeading === false) {
+ throw new Error("Expected moved heading to be positioned after Slot A");
+ }
+});
diff --git a/apps/builder/e2e/tests/slot-keyboard.e2e.ts b/apps/builder/e2e/tests/slot-keyboard.e2e.ts
deleted file mode 100644
index 5dc3137693..0000000000
--- a/apps/builder/e2e/tests/slot-keyboard.e2e.ts
+++ /dev/null
@@ -1,847 +0,0 @@
-import type { Frame, Page } from "@playwright/test";
-import {
- getCanvasInstance,
- getCanvasInstanceSelector,
- openProjectBuilder,
-} from "../flows/builder";
-import { openNavigatorPanel } from "../flows/navigator";
-import { waitForSyncStatus } from "../flows/sync-status";
-import {
- createSlotKeyboardProject,
- type SeededSlotKeyboardProject,
-} from "../fixtures/slot-keyboard-project";
-import { newIsolatedPage, test, withBrowserContext } from "../test";
-import { measure } from "../perf";
-
-let fixture: SeededSlotKeyboardProject;
-let detachFixture: SeededSlotKeyboardProject;
-let navigatorFixture: SeededSlotKeyboardProject;
-let navigatorOutdentFixture: SeededSlotKeyboardProject;
-let topChildFixture: SeededSlotKeyboardProject;
-let bottomChildFixture: SeededSlotKeyboardProject;
-let navigatorTopChildFixture: SeededSlotKeyboardProject;
-let navigatorBottomChildFixture: SeededSlotKeyboardProject;
-let multiSelectFixture: SeededSlotKeyboardProject;
-
-const slotASelector = getCanvasInstanceSelector([
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
-]);
-
-const expectCanvasInstanceVisible = async ({
- canvas,
- instanceSelector,
-}: {
- canvas: Frame;
- instanceSelector: string[];
-}) => {
- await getCanvasInstance({ canvas, instanceSelector }).waitFor({
- state: "visible",
- timeout: 30_000,
- });
-};
-
-test.beforeAll(async ({ browser }) => {
- await withBrowserContext(browser, async (context) => {
- fixture = await createSlotKeyboardProject({ context });
- detachFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Detach E2E",
- builderToken: "slot-keyboard-detach-e2e-builder-token",
- });
- navigatorFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Navigator E2E",
- builderToken: "slot-keyboard-navigator-e2e-builder-token",
- });
- navigatorOutdentFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Navigator Outdent E2E",
- builderToken: "slot-keyboard-navigator-outdent-e2e-builder-token",
- });
- topChildFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Top Child E2E",
- builderToken: "slot-keyboard-top-child-e2e-builder-token",
- });
- bottomChildFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Bottom Child E2E",
- builderToken: "slot-keyboard-bottom-child-e2e-builder-token",
- });
- navigatorTopChildFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Navigator Top Child E2E",
- builderToken: "slot-keyboard-navigator-top-child-e2e-builder-token",
- });
- navigatorBottomChildFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Navigator Bottom Child E2E",
- builderToken: "slot-keyboard-navigator-bottom-child-e2e-builder-token",
- });
- multiSelectFixture = await createSlotKeyboardProject({
- context,
- email: "[email protected]",
- title: "Slot Keyboard Multi Select E2E",
- builderToken: "slot-keyboard-navigator-multi-select-e2e-builder-token",
- });
- });
-});
-
-const expectCanvasInstancePrecedes = async ({
- canvas,
- beforeSelector,
- afterSelector,
-}: {
- canvas: Frame;
- beforeSelector: string[];
- afterSelector: string[];
-}) => {
- const beforeLocator = getCanvasInstance({
- canvas,
- instanceSelector: beforeSelector,
- });
- const afterLocator = getCanvasInstance({
- canvas,
- instanceSelector: afterSelector,
- });
- await beforeLocator.waitFor({ state: "visible", timeout: 30_000 });
- await afterLocator.waitFor({ state: "visible", timeout: 30_000 });
- const precedes = await beforeLocator.evaluate((beforeElement, after) => {
- const afterElement = document.querySelector(after);
- if (afterElement === null) {
- return false;
- }
- return Boolean(
- beforeElement.compareDocumentPosition(afterElement) &
- Node.DOCUMENT_POSITION_FOLLOWING
- );
- }, getCanvasInstanceSelector(afterSelector));
- if (precedes === false) {
- throw new Error(
- `Expected ${beforeSelector.join(",")} to precede ${afterSelector.join(",")}`
- );
- }
-};
-
-const getFocusedTreeButtonText = async ({ page }: { page: Page }) => {
- return await page.evaluate(() => {
- const activeElement = document.activeElement;
- if (activeElement?.hasAttribute("data-tree-button") === false) {
- return;
- }
- return activeElement?.textContent?.trim();
- });
-};
-
-const getSelectedTreeButtonTexts = async ({ page }: { page: Page }) => {
- return await page
- .locator("[data-tree-button][aria-selected='true']")
- .evaluateAll((buttons) =>
- buttons.map((button) => button.textContent?.trim() ?? "")
- );
-};
-
-const expectSelectedTreeButtonTexts = async ({
- page,
- expectedTexts,
-}: {
- page: Page;
- expectedTexts: string[];
-}) => {
- await page.waitForFunction(
- (expected) => {
- const selectedTexts = Array.from(
- document.querySelectorAll("[data-tree-button][aria-selected='true']")
- ).map((button) => button.textContent?.trim() ?? "");
- return (
- selectedTexts.length === expected.length &&
- expected.every((expectedText) =>
- selectedTexts.some((selectedText) =>
- selectedText.includes(expectedText)
- )
- )
- );
- },
- expectedTexts,
- { timeout: 10_000 }
- );
-};
-
-test("Keyboard shortcut moves a shared slot child into the previous sibling", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure("slot keyboard open builder", async () => {
- return await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
-
- const headingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: headingSelector,
- });
- await getCanvasInstance({
- canvas,
- instanceSelector: headingSelector,
- }).click();
-
- await page.keyboard.press("Control+ArrowRight");
- await waitForSyncStatus({ page, status: "idle" });
-
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- });
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- });
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut keeps Navigator arrows working after outdenting a row", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard navigator outdent open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: navigatorOutdentFixture.projectId,
- authToken: navigatorOutdentFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
- await openNavigatorPanel({ page });
- await page.getByRole("button", { name: "Slot Heading" }).first().click();
-
- await page.keyboard.press("Control+ArrowLeft");
- await waitForSyncStatus({ page, status: "idle" });
-
- const focusedTextAfterMove = await getFocusedTreeButtonText({ page });
- if (focusedTextAfterMove?.includes("Slot Heading") !== true) {
- throw new Error(
- `Expected moved Navigator row to keep focus, received ${focusedTextAfterMove}`
- );
- }
-
- await page.keyboard.press("ArrowUp");
- const focusedTextAfterArrow = await getFocusedTreeButtonText({ page });
- if (
- focusedTextAfterArrow === undefined ||
- focusedTextAfterArrow === focusedTextAfterMove
- ) {
- throw new Error(
- `Expected ArrowUp to move Navigator focus from ${focusedTextAfterMove}, received ${focusedTextAfterArrow}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Shift+ArrowDown in Navigator selects exactly one additional row", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard navigator multi-select open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: multiSelectFixture.projectId,
- authToken: multiSelectFixture.builderToken,
- });
- }
- );
-
- const slotADivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotADivSelector,
- }).click();
- await openNavigatorPanel({ page });
- await page.getByRole("button", { name: "Drop Div" }).first().click();
- await expectSelectedTreeButtonTexts({
- page,
- expectedTexts: ["Drop Div"],
- });
-
- await page.keyboard.press("Shift+ArrowDown");
-
- await expectSelectedTreeButtonTexts({
- page,
- expectedTexts: ["Drop Div", "Slot Heading"],
- });
- const focusedText = await getFocusedTreeButtonText({ page });
- if (focusedText?.includes("Slot Heading") !== true) {
- throw new Error(
- `Expected Shift+ArrowDown to focus Slot Heading, received ${focusedText}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Control/Command+A after canvas selection selects sibling rows", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard canvas multi-select open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: multiSelectFixture.projectId,
- authToken: multiSelectFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
-
- await page.keyboard.press("Control+A");
-
- await openNavigatorPanel({ page });
- await expectSelectedTreeButtonTexts({
- page,
- expectedTexts: ["Drop Div", "Slot Heading"],
- });
-
- const selectedTexts = await getSelectedTreeButtonTexts({ page });
- if (selectedTexts.some((selectedText) => selectedText.includes("Slot A"))) {
- throw new Error(
- `Expected Command+A to select only siblings, received ${selectedTexts.join(", ")}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut moves a direct shared slot child out of all slot occurrences", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard detach open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: detachFixture.projectId,
- authToken: detachFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: slotAHeadingSelector,
- });
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
-
- await page.keyboard.press("Control+ArrowLeft");
- await waitForSyncStatus({ page, status: "idle" });
-
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).waitFor({ state: "hidden", timeout: 30_000 });
- await getCanvasInstance({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- }).waitFor({ state: "hidden", timeout: 30_000 });
-
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- });
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut moves the first shared slot child above all slot occurrences", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard top child open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: navigatorTopChildFixture.projectId,
- authToken: navigatorTopChildFixture.builderToken,
- });
- }
- );
-
- const slotADivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: slotADivSelector,
- });
- await getCanvasInstance({
- canvas,
- instanceSelector: slotADivSelector,
- }).click();
-
- await page.keyboard.press("Control+ArrowUp");
- await waitForSyncStatus({ page, status: "idle" });
-
- await getCanvasInstance({
- canvas,
- instanceSelector: slotADivSelector,
- }).waitFor({ state: "hidden", timeout: 30_000 });
- await getCanvasInstance({
- canvas,
- instanceSelector: [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- }).waitFor({ state: "hidden", timeout: 30_000 });
-
- const movedDivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: movedDivSelector,
- });
-
- const movedDivPrecedesSlotA = await canvas
- .locator(getCanvasInstanceSelector(movedDivSelector))
- .evaluate((movedElement, selector) => {
- const slotA = document.querySelector(selector);
- if (slotA === null) {
- return false;
- }
- return Boolean(
- movedElement.compareDocumentPosition(slotA) &
- Node.DOCUMENT_POSITION_FOLLOWING
- );
- }, slotASelector);
- if (movedDivPrecedesSlotA === false) {
- throw new Error("Expected moved div to be positioned before Slot A");
- }
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut moves the last shared slot child below all slot occurrences", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard bottom child open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: navigatorBottomChildFixture.projectId,
- authToken: navigatorBottomChildFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: slotAHeadingSelector,
- });
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
-
- await page.keyboard.press("Control+ArrowDown");
- await waitForSyncStatus({ page, status: "idle" });
-
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).waitFor({ state: "hidden", timeout: 30_000 });
- await getCanvasInstance({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- }).waitFor({ state: "hidden", timeout: 30_000 });
-
- const movedHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: movedHeadingSelector,
- });
-
- const slotAPrecedesMovedHeading = await canvas
- .locator(slotASelector)
- .evaluate((slotA, movedSelector) => {
- const movedElement = document.querySelector(movedSelector);
- if (movedElement === null) {
- return false;
- }
- return Boolean(
- slotA.compareDocumentPosition(movedElement) &
- Node.DOCUMENT_POSITION_FOLLOWING
- );
- }, getCanvasInstanceSelector(movedHeadingSelector));
- if (slotAPrecedesMovedHeading === false) {
- throw new Error("Expected moved heading to be positioned after Slot A");
- }
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut reorders a shared slot child from navigator focus", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard navigator open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: navigatorFixture.projectId,
- authToken: navigatorFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
- await openNavigatorPanel({ page });
- await page.getByRole("button", { name: "Slot Heading" }).first().click();
- await page.keyboard.press("Control+ArrowUp");
- await waitForSyncStatus({ page, status: "idle" });
-
- const slotADivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- const slotBHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- const slotBDivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
-
- await expectCanvasInstancePrecedes({
- canvas,
- beforeSelector: slotAHeadingSelector,
- afterSelector: slotADivSelector,
- });
- await expectCanvasInstancePrecedes({
- canvas,
- beforeSelector: slotBHeadingSelector,
- afterSelector: slotBDivSelector,
- });
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut moves the first shared slot child above all slot occurrences from navigator focus", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard navigator top child open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: topChildFixture.projectId,
- authToken: topChildFixture.builderToken,
- });
- }
- );
-
- const slotADivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotADivSelector,
- }).click();
- await openNavigatorPanel({ page });
- await page.getByRole("button", { name: "Drop Div" }).first().click();
-
- await page.keyboard.press("Control+ArrowUp");
- await waitForSyncStatus({ page, status: "idle" });
-
- await getCanvasInstance({
- canvas,
- instanceSelector: slotADivSelector,
- }).waitFor({ state: "hidden", timeout: 30_000 });
- await getCanvasInstance({
- canvas,
- instanceSelector: [
- "slot-keyboard-div",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- }).waitFor({ state: "hidden", timeout: 30_000 });
-
- const movedDivSelector = [
- "slot-keyboard-div",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: movedDivSelector,
- });
-
- const movedDivPrecedesSlotA = await canvas
- .locator(getCanvasInstanceSelector(movedDivSelector))
- .evaluate((movedElement, selector) => {
- const slotA = document.querySelector(selector);
- if (slotA === null) {
- return false;
- }
- return Boolean(
- movedElement.compareDocumentPosition(slotA) &
- Node.DOCUMENT_POSITION_FOLLOWING
- );
- }, slotASelector);
- if (movedDivPrecedesSlotA === false) {
- throw new Error("Expected moved div to be positioned before Slot A");
- }
- } finally {
- await close();
- }
-});
-
-test("Keyboard shortcut moves the last shared slot child below all slot occurrences from navigator focus", async ({
- browser,
-}) => {
- const { page, close } = await newIsolatedPage(browser);
-
- try {
- const canvas = await measure(
- "slot keyboard navigator bottom child open builder",
- async () => {
- return await openProjectBuilder({
- page,
- projectId: bottomChildFixture.projectId,
- authToken: bottomChildFixture.builderToken,
- });
- }
- );
-
- const slotAHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-a",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).click();
- await openNavigatorPanel({ page });
- await page.getByRole("button", { name: "Slot Heading" }).first().click();
-
- await page.keyboard.press("Control+ArrowDown");
- await waitForSyncStatus({ page, status: "idle" });
-
- await getCanvasInstance({
- canvas,
- instanceSelector: slotAHeadingSelector,
- }).waitFor({ state: "hidden", timeout: 30_000 });
- await getCanvasInstance({
- canvas,
- instanceSelector: [
- "slot-keyboard-heading",
- "slot-keyboard-fragment",
- "slot-keyboard-slot-b",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ],
- }).waitFor({ state: "hidden", timeout: 30_000 });
-
- const movedHeadingSelector = [
- "slot-keyboard-heading",
- "slot-keyboard-wrapper",
- "slot-keyboard-body",
- ];
- await expectCanvasInstanceVisible({
- canvas,
- instanceSelector: movedHeadingSelector,
- });
-
- const slotAPrecedesMovedHeading = await canvas
- .locator(slotASelector)
- .evaluate((slotA, movedSelector) => {
- const movedElement = document.querySelector(movedSelector);
- if (movedElement === null) {
- return false;
- }
- return Boolean(
- slotA.compareDocumentPosition(movedElement) &
- Node.DOCUMENT_POSITION_FOLLOWING
- );
- }, getCanvasInstanceSelector(movedHeadingSelector));
- if (slotAPrecedesMovedHeading === false) {
- throw new Error("Expected moved heading to be positioned after Slot A");
- }
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/style-panel-layout.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/style-panel-layout.[shard-2].[shard-5].[shard-6].e2e.ts
new file mode 100644
index 0000000000..1423c88a96
--- /dev/null
+++ b/apps/builder/e2e/tests/style-panel-layout.[shard-2].[shard-5].[shard-6].e2e.ts
@@ -0,0 +1,363 @@
+import type { BrowserContext, Page } from "@playwright/test";
+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,
+} from "../flows/sync-status";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+const createStylePanelRuntimeProject = async (
+ context: BrowserContext,
+ name: string
+) => {
+ return await createContentModeProject({
+ context,
+ email: `style-panel-runtime-${name}@webstudio.test`,
+ title: `Style Panel Runtime ${name}`,
+ assetNamePrefix: `style-panel-runtime-${name}-`,
+ editorToken: `style-panel-runtime-${name}-editor-token`,
+ builderToken: `style-panel-runtime-${name}-builder-token`,
+ });
+};
+
+const setCssValue = async ({
+ page,
+ property,
+ value,
+}: {
+ page: Page;
+ property: string;
+ value: string;
+}) => {
+ const input = page.getByLabel(property, { exact: true }).first();
+ await input.fill(value);
+ const save = waitForChangeToBeSaved({ page });
+ await input.press("Enter");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const addCssDeclaration = async ({
+ page,
+ css,
+}: {
+ page: Page;
+ css: string;
+}) => {
+ const input = page.getByLabel("Add styles", { exact: true }).first();
+ await input.fill(css);
+ const save = waitForChangeToBeSaved({ page });
+ await input.press("Enter");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const selectNavigatorItem = async ({
+ page,
+ itemName,
+}: {
+ page: Page;
+ itemName: string;
+}) => {
+ await openNavigatorPanel({ page });
+ const item = page
+ .locator("[data-navigator-tree] [data-tree-button]")
+ .filter({ hasText: itemName })
+ .last();
+ await item.waitFor({ state: "visible" });
+ await item.click();
+ await item.click();
+};
+
+const readBuildStylesText = async (fixture: SeededContentModeProject) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ return JSON.stringify(JSON.parse(build.styles));
+};
+
+const getInstanceChildCount = async ({
+ fixture,
+ instanceId,
+}: {
+ fixture: SeededContentModeProject;
+ instanceId: string;
+}) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ const instances = JSON.parse(build.instances) as Array<{
+ id: string;
+ children?: Array<{ type: string }>;
+ }>;
+ return (
+ instances
+ .find((instance) => instance.id === instanceId)
+ ?.children?.filter((child) => child.type === "id").length ?? 0
+ );
+};
+
+const expectBuildStylesToContain = async ({
+ fixture,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ text: string;
+}) => {
+ const styles = await readBuildStylesText(fixture);
+ if (styles.includes(text) === false) {
+ throw new Error(`Expected build styles to contain "${text}".`);
+ }
+};
+
+test("Builder grid generator fills selected grid and persists after reload", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createStylePanelRuntimeProject(
+ context,
+ "grid-generator"
+ );
+ const bodyInstanceId = "body";
+
+ await measure(
+ "style panel runtime open builder for grid generator",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+
+ const initialBodyChildCount = await getInstanceChildCount({
+ fixture,
+ instanceId: bodyInstanceId,
+ });
+
+ await selectNavigatorItem({ page, itemName: "Body" });
+ await page.getByRole("tab", { name: "Style" }).click();
+
+ await measure("style panel runtime enable body grid", async () => {
+ await addCssDeclaration({ page, css: "display: grid" });
+ });
+ await page.getByRole("button", { name: /Grid layout:/ }).waitFor();
+
+ await measure("style panel runtime fill body grid", async () => {
+ await page.getByRole("button", { name: /Grid layout:/ }).click();
+ const save = waitForChangeToBeSaved({ page });
+ await page.getByRole("button", { name: "Fill grid" }).click();
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+ });
+
+ const filledBodyChildCount = await getInstanceChildCount({
+ fixture,
+ instanceId: bodyInstanceId,
+ });
+ const expectedBodyChildCount = Math.max(initialBodyChildCount, 4);
+ if (filledBodyChildCount !== expectedBodyChildCount) {
+ throw new Error(
+ `Expected Fill grid to grow Body children to ${expectedBodyChildCount}. Before ${initialBodyChildCount}, after ${filledBodyChildCount}`
+ );
+ }
+ await expectBuildStylesToContain({ fixture, text: `"display"` });
+ await expectBuildStylesToContain({ fixture, text: `"grid"` });
+ await expectBuildStylesToContain({ fixture, text: `"flexDirection"` });
+ await expectBuildStylesToContain({ fixture, text: `"column"` });
+
+ await measure(
+ "style panel runtime reload grid generator result",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text: "Initial content" });
+ await selectNavigatorItem({ page, itemName: "Body" });
+ await page.getByRole("tab", { name: "Style" }).click();
+ await page.getByRole("button", { name: /Grid layout:/ }).waitFor();
+
+ const reloadedBodyChildCount = await getInstanceChildCount({
+ fixture,
+ instanceId: bodyInstanceId,
+ });
+ if (reloadedBodyChildCount !== expectedBodyChildCount) {
+ throw new Error(
+ `Expected reloaded Fill grid result to keep ${expectedBodyChildCount} Body children. Got ${reloadedBodyChildCount}`
+ );
+ }
+});
+
+test("Builder breakpoint styles persist after create, update, reload, and delete", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createStylePanelRuntimeProject(context, "breakpoints");
+ const text = "Initial content";
+ const breakpointName = "E2E Tablet";
+ const updatedBreakpointName = "E2E Tablet Updated";
+
+ await measure(
+ "style panel runtime open builder for breakpoints",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text });
+
+ await page
+ .getByRole("button", { name: "Breakpoints with custom conditions" })
+ .click();
+ await page.getByRole("button", { name: "Edit breakpoints" }).click();
+ await page.getByRole("button", { name: "Add breakpoint" }).click();
+
+ const nameInput = page.getByPlaceholder("Breakpoint name").first();
+ const nameSave = waitForChangeToBeSaved({ page });
+ await nameInput.fill(breakpointName);
+ await nameInput.blur();
+ await nameSave;
+
+ const renameSave = waitForChangeToBeSaved({ page });
+ await nameInput.fill(updatedBreakpointName);
+ await nameInput.blur();
+ await renameSave;
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await page.keyboard.press("Escape");
+ await page
+ .getByRole("button", { name: "Breakpoints with custom conditions" })
+ .click();
+ await page.getByText(updatedBreakpointName, { exact: true }).click();
+
+ await selectCanvasTextInstance({ page, text });
+ await page.getByRole("tab", { name: "Style" }).click();
+ await setCssValue({ page, property: "font-size", value: "31px" });
+
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "font-size",
+ value: "31px",
+ });
+
+ await measure(
+ "style panel runtime reload builder for breakpoint",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await page
+ .getByRole("button", { name: "Breakpoints with custom conditions" })
+ .click();
+ await page.getByText(updatedBreakpointName, { exact: true }).click();
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "font-size",
+ value: "31px",
+ });
+
+ await page
+ .getByRole("button", { name: "Breakpoints with custom conditions" })
+ .click();
+ await page.getByRole("button", { name: "Edit breakpoints" }).click();
+ await page.locator("[data-breakpoint-delete]").first().click({
+ force: true,
+ });
+ const deleteSave = waitForChangeToBeSaved({ page });
+ await page.getByRole("button", { name: "Delete" }).click();
+ await deleteSave;
+ await waitForSyncStatus({ page, status: "idle" });
+
+ await measure(
+ "style panel runtime reload builder after breakpoint delete",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await page.getByText(updatedBreakpointName, { exact: true }).waitFor({
+ state: "hidden",
+ timeout: 30_000,
+ });
+});
+
+test("Builder design token styles persist after create and reload", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createStylePanelRuntimeProject(context, "tokens");
+ const text = "Initial content";
+ const tokenName = "E2E Brand Token";
+
+ await measure(
+ "style panel runtime open builder for design tokens",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text });
+
+ await selectCanvasTextInstance({ page, text });
+ await page.getByRole("tab", { name: "Style" }).click();
+
+ const styleSourceInput = page.getByLabel("New style source input");
+ await styleSourceInput.fill(tokenName);
+ const createSave = waitForChangeToBeSaved({ page });
+ await page.getByText(`Create ${tokenName}`, { exact: false }).click();
+ await createSave;
+ await waitForSyncStatus({ page, status: "idle" });
+ await page.getByText(tokenName, { exact: true }).waitFor();
+
+ await setCssValue({ page, property: "color", value: "#b4234c" });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(180, 35, 76)",
+ });
+
+ await measure(
+ "style panel runtime reload builder for design token",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await selectCanvasTextInstance({ page, text });
+ await page.getByRole("tab", { name: "Style" }).click();
+ await page.getByText(tokenName, { exact: true }).waitFor();
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(180, 35, 76)",
+ });
+});
diff --git a/apps/builder/e2e/tests/style-panel-layout.e2e.ts b/apps/builder/e2e/tests/style-panel-layout.e2e.ts
deleted file mode 100644
index 8ff506d896..0000000000
--- a/apps/builder/e2e/tests/style-panel-layout.e2e.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-import type { BrowserContext, Page } from "@playwright/test";
-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,
-} from "../flows/sync-status";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-const createStylePanelRuntimeProject = async (
- context: BrowserContext,
- name: string
-) => {
- return await createContentModeProject({
- context,
- email: `style-panel-runtime-${name}@webstudio.test`,
- title: `Style Panel Runtime ${name}`,
- assetNamePrefix: `style-panel-runtime-${name}-`,
- editorToken: `style-panel-runtime-${name}-editor-token`,
- builderToken: `style-panel-runtime-${name}-builder-token`,
- });
-};
-
-const setCssValue = async ({
- page,
- property,
- value,
-}: {
- page: Page;
- property: string;
- value: string;
-}) => {
- const input = page.getByLabel(property, { exact: true }).first();
- await input.fill(value);
- const save = waitForChangeToBeSaved({ page });
- await input.press("Enter");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const addCssDeclaration = async ({
- page,
- css,
-}: {
- page: Page;
- css: string;
-}) => {
- const input = page.getByLabel("Add styles", { exact: true }).first();
- await input.fill(css);
- const save = waitForChangeToBeSaved({ page });
- await input.press("Enter");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const selectNavigatorItem = async ({
- page,
- itemName,
-}: {
- page: Page;
- itemName: string;
-}) => {
- await openNavigatorPanel({ page });
- const item = page
- .locator("[data-navigator-tree] [data-tree-button]")
- .filter({ hasText: itemName })
- .last();
- await item.waitFor({ state: "visible" });
- await item.click();
- await item.click();
-};
-
-const readBuildStylesText = async (fixture: SeededContentModeProject) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- return JSON.stringify(JSON.parse(build.styles));
-};
-
-const getInstanceChildCount = async ({
- fixture,
- instanceId,
-}: {
- fixture: SeededContentModeProject;
- instanceId: string;
-}) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- const instances = JSON.parse(build.instances) as Array<{
- id: string;
- children?: Array<{ type: string }>;
- }>;
- return (
- instances
- .find((instance) => instance.id === instanceId)
- ?.children?.filter((child) => child.type === "id").length ?? 0
- );
-};
-
-const expectBuildStylesToContain = async ({
- fixture,
- text,
-}: {
- fixture: SeededContentModeProject;
- text: string;
-}) => {
- const styles = await readBuildStylesText(fixture);
- if (styles.includes(text) === false) {
- throw new Error(`Expected build styles to contain "${text}".`);
- }
-};
-
-test("Builder grid generator fills selected grid and persists after reload", async ({
- browser,
- context,
-}) => {
- const fixture = await createStylePanelRuntimeProject(
- context,
- "grid-generator"
- );
- const { page, close } = await newIsolatedPage(browser);
- const bodyInstanceId = "body";
-
- try {
- await measure(
- "style panel runtime open builder for grid generator",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
-
- const initialBodyChildCount = await getInstanceChildCount({
- fixture,
- instanceId: bodyInstanceId,
- });
-
- await selectNavigatorItem({ page, itemName: "Body" });
- await page.getByRole("tab", { name: "Style" }).click();
-
- await measure("style panel runtime enable body grid", async () => {
- await addCssDeclaration({ page, css: "display: grid" });
- });
- await page.getByRole("button", { name: /Grid layout:/ }).waitFor();
-
- await measure("style panel runtime fill body grid", async () => {
- await page.getByRole("button", { name: /Grid layout:/ }).click();
- const save = waitForChangeToBeSaved({ page });
- await page.getByRole("button", { name: "Fill grid" }).click();
- await save;
- await waitForSyncStatus({ page, status: "idle" });
- });
-
- const filledBodyChildCount = await getInstanceChildCount({
- fixture,
- instanceId: bodyInstanceId,
- });
- const expectedBodyChildCount = Math.max(initialBodyChildCount, 4);
- if (filledBodyChildCount !== expectedBodyChildCount) {
- throw new Error(
- `Expected Fill grid to grow Body children to ${expectedBodyChildCount}. Before ${initialBodyChildCount}, after ${filledBodyChildCount}`
- );
- }
- await expectBuildStylesToContain({ fixture, text: `"display"` });
- await expectBuildStylesToContain({ fixture, text: `"grid"` });
- await expectBuildStylesToContain({ fixture, text: `"flexDirection"` });
- await expectBuildStylesToContain({ fixture, text: `"column"` });
-
- await measure(
- "style panel runtime reload grid generator result",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text: "Initial content" });
- await selectNavigatorItem({ page, itemName: "Body" });
- await page.getByRole("tab", { name: "Style" }).click();
- await page.getByRole("button", { name: /Grid layout:/ }).waitFor();
-
- const reloadedBodyChildCount = await getInstanceChildCount({
- fixture,
- instanceId: bodyInstanceId,
- });
- if (reloadedBodyChildCount !== expectedBodyChildCount) {
- throw new Error(
- `Expected reloaded Fill grid result to keep ${expectedBodyChildCount} Body children. Got ${reloadedBodyChildCount}`
- );
- }
- } finally {
- await close();
- }
-});
-
-test("Builder breakpoint styles persist after create, update, reload, and delete", async ({
- browser,
- context,
-}) => {
- const fixture = await createStylePanelRuntimeProject(context, "breakpoints");
- const { page, close } = await newIsolatedPage(browser);
- const text = "Initial content";
- const breakpointName = "E2E Tablet";
- const updatedBreakpointName = "E2E Tablet Updated";
-
- try {
- await measure(
- "style panel runtime open builder for breakpoints",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text });
-
- await page
- .getByRole("button", { name: "Breakpoints with custom conditions" })
- .click();
- await page.getByRole("button", { name: "Edit breakpoints" }).click();
- await page.getByRole("button", { name: "Add breakpoint" }).click();
-
- const nameInput = page.getByPlaceholder("Breakpoint name").first();
- const nameSave = waitForChangeToBeSaved({ page });
- await nameInput.fill(breakpointName);
- await nameInput.blur();
- await nameSave;
-
- const renameSave = waitForChangeToBeSaved({ page });
- await nameInput.fill(updatedBreakpointName);
- await nameInput.blur();
- await renameSave;
- await waitForSyncStatus({ page, status: "idle" });
-
- await page.keyboard.press("Escape");
- await page
- .getByRole("button", { name: "Breakpoints with custom conditions" })
- .click();
- await page.getByText(updatedBreakpointName, { exact: true }).click();
-
- await selectCanvasTextInstance({ page, text });
- await page.getByRole("tab", { name: "Style" }).click();
- await setCssValue({ page, property: "font-size", value: "31px" });
-
- await waitForCanvasTextStyle({
- page,
- text,
- property: "font-size",
- value: "31px",
- });
-
- await measure(
- "style panel runtime reload builder for breakpoint",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await page
- .getByRole("button", { name: "Breakpoints with custom conditions" })
- .click();
- await page.getByText(updatedBreakpointName, { exact: true }).click();
- await waitForCanvasTextStyle({
- page,
- text,
- property: "font-size",
- value: "31px",
- });
-
- await page
- .getByRole("button", { name: "Breakpoints with custom conditions" })
- .click();
- await page.getByRole("button", { name: "Edit breakpoints" }).click();
- await page.locator("[data-breakpoint-delete]").first().click({
- force: true,
- });
- const deleteSave = waitForChangeToBeSaved({ page });
- await page.getByRole("button", { name: "Delete" }).click();
- await deleteSave;
- await waitForSyncStatus({ page, status: "idle" });
-
- await measure(
- "style panel runtime reload builder after breakpoint delete",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await page.getByText(updatedBreakpointName, { exact: true }).waitFor({
- state: "hidden",
- timeout: 30_000,
- });
- } finally {
- await close();
- }
-});
-
-test("Builder design token styles persist after create and reload", async ({
- browser,
- context,
-}) => {
- const fixture = await createStylePanelRuntimeProject(context, "tokens");
- const { page, close } = await newIsolatedPage(browser);
- const text = "Initial content";
- const tokenName = "E2E Brand Token";
-
- try {
- await measure(
- "style panel runtime open builder for design tokens",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text });
-
- await selectCanvasTextInstance({ page, text });
- await page.getByRole("tab", { name: "Style" }).click();
-
- const styleSourceInput = page.getByLabel("New style source input");
- await styleSourceInput.fill(tokenName);
- const createSave = waitForChangeToBeSaved({ page });
- await page.getByText(`Create ${tokenName}`, { exact: false }).click();
- await createSave;
- await waitForSyncStatus({ page, status: "idle" });
- await page.getByText(tokenName, { exact: true }).waitFor();
-
- await setCssValue({ page, property: "color", value: "#b4234c" });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(180, 35, 76)",
- });
-
- await measure(
- "style panel runtime reload builder for design token",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await selectCanvasTextInstance({ page, text });
- await page.getByRole("tab", { name: "Style" }).click();
- await page.getByText(tokenName, { exact: true }).waitFor();
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(180, 35, 76)",
- });
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/e2e/tests/style-panel-properties.e2e.ts b/apps/builder/e2e/tests/style-panel-properties.[shard-1].e2e.ts
similarity index 50%
rename from apps/builder/e2e/tests/style-panel-properties.e2e.ts
rename to apps/builder/e2e/tests/style-panel-properties.[shard-1].e2e.ts
index 733062457f..9f82147e26 100644
--- a/apps/builder/e2e/tests/style-panel-properties.e2e.ts
+++ b/apps/builder/e2e/tests/style-panel-properties.[shard-1].e2e.ts
@@ -11,7 +11,7 @@ import {
} from "../flows/sync-status";
import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test } from "../test";
+import { test } from "../test";
import { measure } from "../perf";
import { loadDevBuild } from "../db";
@@ -110,133 +110,128 @@ const expectBuildStylesNotToContain = async ({
};
test("Builder style panel edits representative styles and persists after reload", async ({
- browser,
+ page,
context,
}) => {
const fixture = await createStylePanelRuntimeProject(context, "styles");
- const { page, close } = await newIsolatedPage(browser);
const text = "Initial content";
- try {
- await measure("style panel runtime open builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
+ await measure("style panel runtime open builder", async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- await waitForCanvasText({ page, text });
+ });
+ await waitForCanvasText({ page, text });
- await selectCanvasTextInstance({ page, text });
- await page.getByRole("tab", { name: "Style" }).click();
+ await selectCanvasTextInstance({ page, text });
+ await page.getByRole("tab", { name: "Style" }).click();
- await measure("style panel runtime edit css values", async () => {
- await setCssValue({ page, property: "font-size", value: "44px" });
- await setCssValue({ page, property: "line-height", value: "1.25" });
- await setCssValue({ page, property: "letter-spacing", value: "2px" });
- await setCssValue({ page, property: "color", value: "#2255ff" });
- await setCssValue({ page, property: "width", value: "420px" });
- await selectStyleSourceState({ page, state: ":hover" });
- await setCssValue({ page, property: "color", value: "#ca126b" });
- await selectStyleSourceState({ page, state: ":hover" });
- });
+ await measure("style panel runtime edit css values", async () => {
+ await setCssValue({ page, property: "font-size", value: "44px" });
+ await setCssValue({ page, property: "line-height", value: "1.25" });
+ await setCssValue({ page, property: "letter-spacing", value: "2px" });
+ await setCssValue({ page, property: "color", value: "#2255ff" });
+ await setCssValue({ page, property: "width", value: "420px" });
+ await selectStyleSourceState({ page, state: ":hover" });
+ await setCssValue({ page, property: "color", value: "#ca126b" });
+ await selectStyleSourceState({ page, state: ":hover" });
+ });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "font-size",
- value: "44px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "line-height",
- value: "55px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "letter-spacing",
- value: "2px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(34, 85, 255)",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "width",
- value: "420px",
- });
- await waitForHoveredCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(202, 18, 107)",
- });
- await expectBuildStylesToContain({
- fixture,
- text: `"state":":hover"`,
- });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "font-size",
+ value: "44px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "line-height",
+ value: "55px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "letter-spacing",
+ value: "2px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(34, 85, 255)",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "width",
+ value: "420px",
+ });
+ await waitForHoveredCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(202, 18, 107)",
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `"state":":hover"`,
+ });
- await page.getByRole("tab", { name: "Style" }).click();
- await measure("style panel runtime reset css value", async () => {
- await resetCssValue({ page, property: "width" });
- });
- await expectBuildStylesNotToContain({
- fixture,
- text: `"property":"width"`,
- });
+ await page.getByRole("tab", { name: "Style" }).click();
+ await measure("style panel runtime reset css value", async () => {
+ await resetCssValue({ page, property: "width" });
+ });
+ await expectBuildStylesNotToContain({
+ fixture,
+ text: `"property":"width"`,
+ });
- await measure("style panel runtime reload builder", async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "font-size",
- value: "44px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "line-height",
- value: "55px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "letter-spacing",
- value: "2px",
- });
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(34, 85, 255)",
- });
- await waitForHoveredCanvasTextStyle({
+ await measure("style panel runtime reload builder", async () => {
+ await openProjectBuilder({
page,
- text,
- property: "color",
- value: "rgb(202, 18, 107)",
- });
- await expectBuildStylesNotToContain({
- fixture,
- text: `"property":"width"`,
- });
- await expectBuildStylesToContain({
- fixture,
- text: `"state":":hover"`,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
});
- } finally {
- await close();
- }
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "font-size",
+ value: "44px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "line-height",
+ value: "55px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "letter-spacing",
+ value: "2px",
+ });
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(34, 85, 255)",
+ });
+ await waitForHoveredCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(202, 18, 107)",
+ });
+ await expectBuildStylesNotToContain({
+ fixture,
+ text: `"property":"width"`,
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `"state":":hover"`,
+ });
});
diff --git a/apps/builder/e2e/tests/style-panel-variables.[shard-3].e2e.ts b/apps/builder/e2e/tests/style-panel-variables.[shard-3].e2e.ts
new file mode 100644
index 0000000000..c848246a0a
--- /dev/null
+++ b/apps/builder/e2e/tests/style-panel-variables.[shard-3].e2e.ts
@@ -0,0 +1,260 @@
+import type { BrowserContext, Page } from "@playwright/test";
+import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
+import { selectCanvasTextInstance } from "../flows/canvas-selection";
+import { waitForCanvasTextStyle } from "../flows/canvas-style";
+import {
+ waitForChangeToBeSaved,
+ waitForSyncStatus,
+} from "../flows/sync-status";
+import { createContentModeProject } from "../fixtures/content-mode-suite";
+import type { SeededContentModeProject } from "../fixtures/content-mode-project";
+import { test } from "../test";
+import { measure } from "../perf";
+import { loadDevBuild } from "../db";
+
+const createStylePanelRuntimeProject = async (
+ context: BrowserContext,
+ name: string
+) => {
+ return await createContentModeProject({
+ context,
+ email: `style-panel-runtime-${name}@webstudio.test`,
+ title: `Style Panel Runtime ${name}`,
+ assetNamePrefix: `style-panel-runtime-${name}-`,
+ editorToken: `style-panel-runtime-${name}-editor-token`,
+ builderToken: `style-panel-runtime-${name}-builder-token`,
+ });
+};
+
+const addCssDeclaration = async ({
+ page,
+ css,
+}: {
+ page: Page;
+ css: string;
+}) => {
+ const input = page.getByLabel("Add styles", { exact: true }).first();
+ await input.fill(css);
+ const save = waitForChangeToBeSaved({ page });
+ await input.press("Enter");
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+};
+
+const readBuildStylesText = async (fixture: SeededContentModeProject) => {
+ const build = await loadDevBuild({ projectId: fixture.projectId });
+ return JSON.stringify(JSON.parse(build.styles));
+};
+
+const expectBuildStylesToContain = async ({
+ fixture,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ text: string;
+}) => {
+ const styles = await readBuildStylesText(fixture);
+ if (styles.includes(text) === false) {
+ throw new Error(`Expected build styles to contain "${text}".`);
+ }
+};
+
+const expectBuildStylesNotToContain = async ({
+ fixture,
+ text,
+}: {
+ fixture: SeededContentModeProject;
+ text: string;
+}) => {
+ const styles = await readBuildStylesText(fixture);
+ if (styles.includes(text)) {
+ throw new Error(`Expected build styles not to contain "${text}".`);
+ }
+};
+
+const runCssVariableCommandAction = async ({
+ page,
+ variable,
+ action,
+}: {
+ page: Page;
+ variable: string;
+ action: "Rename" | "Delete";
+}) => {
+ await page.getByRole("button", { name: "Menu", exact: true }).click();
+ await page.getByRole("menuitem", { name: "Search & commands" }).click();
+ const input = page
+ .getByPlaceholder("Type a command or search...", { exact: true })
+ .first();
+ await input.waitFor();
+ await input.fill(variable);
+ await page
+ .locator("[cmdk-item]")
+ .filter({ hasText: variable })
+ .first()
+ .waitFor();
+ await input.press("Tab");
+ await page
+ .locator("[data-action-list]")
+ .getByText(action, { exact: true })
+ .click();
+};
+
+test("Builder CSS variables persist across create, bind, rename, delete, and reload", async ({
+ page,
+ context,
+}) => {
+ const fixture = await createStylePanelRuntimeProject(
+ context,
+ "css-variables"
+ );
+ const text = "Initial content";
+ const variableName = "--e2e-brand-color";
+ const renamedVariableName = "--e2e-brand-color-renamed";
+
+ await measure(
+ "style panel runtime open builder for css variables",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasText({ page, text });
+
+ await selectCanvasTextInstance({ page, text });
+ await page.getByRole("tab", { name: "Style" }).click();
+
+ await measure(
+ "style panel runtime create and bind css variable",
+ async () => {
+ await addCssDeclaration({
+ page,
+ css: `${variableName}: #126bca`,
+ });
+ await addCssDeclaration({
+ page,
+ css: `color: var(${variableName})`,
+ });
+ }
+ );
+
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(18, 107, 202)",
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `"property":"${variableName}"`,
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `var","value":"${variableName.slice(2)}`,
+ });
+
+ await measure(
+ "style panel runtime reload builder for css variable",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(18, 107, 202)",
+ });
+
+ await measure("style panel runtime rename css variable", async () => {
+ await runCssVariableCommandAction({
+ page,
+ variable: variableName,
+ action: "Rename",
+ });
+ const dialog = page.getByRole("dialog", { name: "Rename CSS variable" });
+ await dialog.getByRole("textbox").fill(renamedVariableName);
+ const save = waitForChangeToBeSaved({ page });
+ await dialog.getByRole("button", { name: "Rename" }).click();
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+ });
+
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(18, 107, 202)",
+ });
+ await expectBuildStylesNotToContain({
+ fixture,
+ text: `"property":"${variableName}"`,
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `"property":"${renamedVariableName}"`,
+ });
+ await expectBuildStylesToContain({
+ fixture,
+ text: `var","value":"${renamedVariableName.slice(2)}`,
+ });
+
+ await measure(
+ "style panel runtime reload builder after css variable rename",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await waitForCanvasTextStyle({
+ page,
+ text,
+ property: "color",
+ value: "rgb(18, 107, 202)",
+ });
+
+ await measure("style panel runtime delete css variable", async () => {
+ await runCssVariableCommandAction({
+ page,
+ variable: renamedVariableName,
+ action: "Delete",
+ });
+ const save = waitForChangeToBeSaved({ page });
+ await page
+ .getByRole("dialog", { name: "Delete confirmation" })
+ .getByRole("button", { name: "Delete" })
+ .click();
+ await save;
+ await waitForSyncStatus({ page, status: "idle" });
+ });
+
+ await expectBuildStylesNotToContain({
+ fixture,
+ text: renamedVariableName,
+ });
+
+ await measure(
+ "style panel runtime reload builder after css variable delete",
+ async () => {
+ await openProjectBuilder({
+ page,
+ projectId: fixture.projectId,
+ authToken: fixture.builderToken,
+ });
+ }
+ );
+ await expectBuildStylesNotToContain({
+ fixture,
+ text: renamedVariableName,
+ });
+});
diff --git a/apps/builder/e2e/tests/style-panel-variables.e2e.ts b/apps/builder/e2e/tests/style-panel-variables.e2e.ts
deleted file mode 100644
index a0327ef0a9..0000000000
--- a/apps/builder/e2e/tests/style-panel-variables.e2e.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import type { BrowserContext, Page } from "@playwright/test";
-import { openProjectBuilder, waitForCanvasText } from "../flows/builder";
-import { selectCanvasTextInstance } from "../flows/canvas-selection";
-import { waitForCanvasTextStyle } from "../flows/canvas-style";
-import {
- waitForChangeToBeSaved,
- waitForSyncStatus,
-} from "../flows/sync-status";
-import { createContentModeProject } from "../fixtures/content-mode-suite";
-import type { SeededContentModeProject } from "../fixtures/content-mode-project";
-import { newIsolatedPage, test } from "../test";
-import { measure } from "../perf";
-import { loadDevBuild } from "../db";
-
-const createStylePanelRuntimeProject = async (
- context: BrowserContext,
- name: string
-) => {
- return await createContentModeProject({
- context,
- email: `style-panel-runtime-${name}@webstudio.test`,
- title: `Style Panel Runtime ${name}`,
- assetNamePrefix: `style-panel-runtime-${name}-`,
- editorToken: `style-panel-runtime-${name}-editor-token`,
- builderToken: `style-panel-runtime-${name}-builder-token`,
- });
-};
-
-const addCssDeclaration = async ({
- page,
- css,
-}: {
- page: Page;
- css: string;
-}) => {
- const input = page.getByLabel("Add styles", { exact: true }).first();
- await input.fill(css);
- const save = waitForChangeToBeSaved({ page });
- await input.press("Enter");
- await save;
- await waitForSyncStatus({ page, status: "idle" });
-};
-
-const readBuildStylesText = async (fixture: SeededContentModeProject) => {
- const build = await loadDevBuild({ projectId: fixture.projectId });
- return JSON.stringify(JSON.parse(build.styles));
-};
-
-const expectBuildStylesToContain = async ({
- fixture,
- text,
-}: {
- fixture: SeededContentModeProject;
- text: string;
-}) => {
- const styles = await readBuildStylesText(fixture);
- if (styles.includes(text) === false) {
- throw new Error(`Expected build styles to contain "${text}".`);
- }
-};
-
-const expectBuildStylesNotToContain = async ({
- fixture,
- text,
-}: {
- fixture: SeededContentModeProject;
- text: string;
-}) => {
- const styles = await readBuildStylesText(fixture);
- if (styles.includes(text)) {
- throw new Error(`Expected build styles not to contain "${text}".`);
- }
-};
-
-const runCssVariableCommandAction = async ({
- page,
- variable,
- action,
-}: {
- page: Page;
- variable: string;
- action: "Rename" | "Delete";
-}) => {
- await page.getByRole("button", { name: "Menu", exact: true }).click();
- await page.getByRole("menuitem", { name: "Search & commands" }).click();
- const input = page
- .getByPlaceholder("Type a command or search...", { exact: true })
- .first();
- await input.waitFor();
- await input.fill(variable);
- await page
- .locator("[cmdk-item]")
- .filter({ hasText: variable })
- .first()
- .waitFor();
- await input.press("Tab");
- await page
- .locator("[data-action-list]")
- .getByText(action, { exact: true })
- .click();
-};
-
-test("Builder CSS variables persist across create, bind, rename, delete, and reload", async ({
- browser,
- context,
-}) => {
- const fixture = await createStylePanelRuntimeProject(
- context,
- "css-variables"
- );
- const { page, close } = await newIsolatedPage(browser);
- const text = "Initial content";
- const variableName = "--e2e-brand-color";
- const renamedVariableName = "--e2e-brand-color-renamed";
-
- try {
- await measure(
- "style panel runtime open builder for css variables",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasText({ page, text });
-
- await selectCanvasTextInstance({ page, text });
- await page.getByRole("tab", { name: "Style" }).click();
-
- await measure(
- "style panel runtime create and bind css variable",
- async () => {
- await addCssDeclaration({
- page,
- css: `${variableName}: #126bca`,
- });
- await addCssDeclaration({
- page,
- css: `color: var(${variableName})`,
- });
- }
- );
-
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(18, 107, 202)",
- });
- await expectBuildStylesToContain({
- fixture,
- text: `"property":"${variableName}"`,
- });
- await expectBuildStylesToContain({
- fixture,
- text: `var","value":"${variableName.slice(2)}`,
- });
-
- await measure(
- "style panel runtime reload builder for css variable",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(18, 107, 202)",
- });
-
- await measure("style panel runtime rename css variable", async () => {
- await runCssVariableCommandAction({
- page,
- variable: variableName,
- action: "Rename",
- });
- const dialog = page.getByRole("dialog", { name: "Rename CSS variable" });
- await dialog.getByRole("textbox").fill(renamedVariableName);
- const save = waitForChangeToBeSaved({ page });
- await dialog.getByRole("button", { name: "Rename" }).click();
- await save;
- await waitForSyncStatus({ page, status: "idle" });
- });
-
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(18, 107, 202)",
- });
- await expectBuildStylesNotToContain({
- fixture,
- text: `"property":"${variableName}"`,
- });
- await expectBuildStylesToContain({
- fixture,
- text: `"property":"${renamedVariableName}"`,
- });
- await expectBuildStylesToContain({
- fixture,
- text: `var","value":"${renamedVariableName.slice(2)}`,
- });
-
- await measure(
- "style panel runtime reload builder after css variable rename",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await waitForCanvasTextStyle({
- page,
- text,
- property: "color",
- value: "rgb(18, 107, 202)",
- });
-
- await measure("style panel runtime delete css variable", async () => {
- await runCssVariableCommandAction({
- page,
- variable: renamedVariableName,
- action: "Delete",
- });
- const save = waitForChangeToBeSaved({ page });
- await page
- .getByRole("dialog", { name: "Delete confirmation" })
- .getByRole("button", { name: "Delete" })
- .click();
- await save;
- await waitForSyncStatus({ page, status: "idle" });
- });
-
- await expectBuildStylesNotToContain({
- fixture,
- text: renamedVariableName,
- });
-
- await measure(
- "style panel runtime reload builder after css variable delete",
- async () => {
- await openProjectBuilder({
- page,
- projectId: fixture.projectId,
- authToken: fixture.builderToken,
- });
- }
- );
- await expectBuildStylesNotToContain({
- fixture,
- text: renamedVariableName,
- });
- } finally {
- await close();
- }
-});
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 8f5a6ebc72..9a592185ca 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -19,7 +19,8 @@
"e2e:dev:backend": "E2E_SKIP_CLEANUP=true E2E_RUN_TESTS=false E2E_START_POSTGREST=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false bash ./e2e/run-local.sh",
"e2e:dev": "E2E_SKIP_CLEANUP=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false E2E_BUILDER_URL=${E2E_BUILDER_URL:-https://127.0.0.1:3000} bash ./e2e/run-local.sh",
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
- "test": "vitest run"
+ "test": "vitest run",
+ "test:browser": "vitest run --project '*-browser-*'"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.4",
@@ -68,9 +69,9 @@
"@tus/server": "^2.4.1",
"@unocss/core": "66.6.8",
"@vercel/remix": "2.15.3",
- "@webstudio-is/content-engine": "workspace:*",
"@webstudio-is/asset-uploader": "workspace:*",
"@webstudio-is/authorization-token": "workspace:*",
+ "@webstudio-is/content-engine": "workspace:*",
"@webstudio-is/css-data": "workspace:*",
"@webstudio-is/css-engine": "workspace:*",
"@webstudio-is/dashboard": "workspace:*",
@@ -146,26 +147,28 @@
"zod-validation-error": "^5.0.0"
},
"devDependencies": {
- "@remix-run/dev": "^2.16.5",
"@playwright/test": "1.50.1",
+ "@remix-run/dev": "^2.16.5",
"@types/debug": "^4.1.12",
"@types/dom-navigation": "^1.0.5",
"@types/express": "^4.17.21",
+ "@types/range-parser": "^1.2.7",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
- "@types/range-parser": "^1.2.7",
"@unocss/preset-wind4": "^66.6.8",
- "@vitest/coverage-v8": "3.1.2",
+ "@vitest/browser": "3.1.1",
+ "@vitest/coverage-v8": "3.1.1",
"@webstudio-is/tsconfig": "workspace:*",
"css.escape": "^1.5.1",
"fast-glob": "^3.3.2",
"msw": "^2.13.2",
+ "playwright": "1.50.1",
"react-router-dom": "^6.30.0",
"react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
"type-fest": "^4.37.0",
"typescript": "7.0.2",
"vite": "^6.3.4",
- "vitest": "^3.1.2"
+ "vitest": "3.1.1"
},
"sideEffects": false,
"license": "AGPL-3.0-or-later"
diff --git a/apps/builder/playwright.config.ts b/apps/builder/playwright.config.ts
index 2b899b76a2..4bc20c2930 100644
--- a/apps/builder/playwright.config.ts
+++ b/apps/builder/playwright.config.ts
@@ -1,5 +1,10 @@
import { defineConfig } from "@playwright/test";
-import { builderUrl, getBrowserLaunchOptions } from "./e2e/test";
+import {
+ browserContextOptions,
+ builderUrl,
+ getBrowserLaunchOptions,
+} from "./e2e/test";
+import { getE2eTestMatch } from "./e2e/test-shards";
const testTimeout =
Number.parseInt(process.env.E2E_TEST_TIMEOUT_MS ?? "", 10) || 120_000;
@@ -14,8 +19,9 @@ export default defineConfig({
retries: 0,
reporter: process.env.CI ? [["line"], ["html", { open: "never" }]] : "line",
use: {
- ignoreHTTPSErrors: true,
- permissions: ["clipboard-read", "clipboard-write"],
+ ...browserContextOptions,
+ actionTimeout: 20_000,
+ navigationTimeout: 45_000,
launchOptions: getBrowserLaunchOptions(),
trace: "retain-on-failure",
screenshot: "only-on-failure",
@@ -28,7 +34,7 @@ export default defineConfig({
},
{
name: "chromium",
- testMatch: /tests\/.*\.e2e\.ts/,
+ testMatch: getE2eTestMatch(process.env.E2E_TEST_SHARD),
dependencies: ["setup"],
use: { browserName: "chromium" },
},
diff --git a/apps/builder/vitest.config.ts b/apps/builder/vitest.config.ts
index 39bcbc445b..d9b6e8c280 100644
--- a/apps/builder/vitest.config.ts
+++ b/apps/builder/vitest.config.ts
@@ -1,7 +1,92 @@
import { resolve } from "node:path";
import { defineConfig } from "vitest/config";
+import { browserTestPorts } from "../../scripts/vitest-browser-workspace";
+
+const nodeTestGlob = "**/*.{server,node}.{test,spec}.{ts,tsx}";
+
+const browserProject = (
+ group: "core" | "app",
+ name: string,
+ port: number,
+ include: string[],
+ exclude: string[] = []
+) => ({
+ extends: "./vitest.config.ts",
+ test: {
+ name: `${group}-browser-${name}`,
+ include,
+ exclude: [nodeTestGlob, ...exclude],
+ browser: {
+ provider: "playwright" as const,
+ enabled: true,
+ headless: true,
+ screenshotFailures: false,
+ api: { port },
+ instances: [{ browser: "chromium" as const }],
+ },
+ },
+});
+
+const serverProject = {
+ extends: "./vitest.config.ts",
+ test: {
+ name: "core-server",
+ include: [nodeTestGlob],
+ environment: "node",
+ },
+};
+
+const projects = [
+ serverProject,
+ browserProject("core", "builder-settings", browserTestPorts.builderSettings, [
+ "app/builder/features/{settings-panel,style-panel}/**/*.{test,spec}.{ts,tsx}",
+ ]),
+ browserProject(
+ "core",
+ "builder-features",
+ browserTestPorts.builderFeatures,
+ ["app/builder/features/**/*.{test,spec}.{ts,tsx}"],
+ [
+ "app/builder/features/{settings-panel,style-panel}/**/*.{test,spec}.{ts,tsx}",
+ ]
+ ),
+ browserProject("app", "builder-shared", browserTestPorts.builderShared, [
+ "app/builder/shared/**/*.{test,spec}.{ts,tsx}",
+ "app/builder/*.{test,spec}.{ts,tsx}",
+ ]),
+ browserProject("app", "shared-heavy", browserTestPorts.builderSharedHeavy, [
+ "app/shared/{copy-paste,instance-utils,sync}/**/*.{test,spec}.{ts,tsx}",
+ ]),
+ browserProject(
+ "app",
+ "shared",
+ browserTestPorts.builderSharedGeneral,
+ ["app/shared/**/*.{test,spec}.{ts,tsx}"],
+ ["app/shared/{copy-paste,instance-utils,sync}/**/*.{test,spec}.{ts,tsx}"]
+ ),
+ browserProject(
+ "app",
+ "canvas-dashboard",
+ browserTestPorts.builderCanvasDashboard,
+ ["app/{canvas,dashboard}/**/*.{test,spec}.{ts,tsx}"]
+ ),
+];
export default defineConfig({
+ optimizeDeps: {
+ entries: ["app/**/*.{test,spec}.{ts,tsx}"],
+ include: [
+ "react/jsx-dev-runtime",
+ "react-router-dom",
+ "css.escape",
+ "@lexical/react/LexicalComposer",
+ "@lexical/react/LexicalContentEditable",
+ "@lexical/react/LexicalErrorBoundary",
+ "@lexical/react/LexicalHistoryPlugin",
+ "@lexical/react/LexicalLinkPlugin",
+ "@lexical/react/LexicalRichTextPlugin",
+ ],
+ },
resolve: {
alias: [
{
@@ -17,8 +102,7 @@ export default defineConfig({
},
},
test: {
- environment: "jsdom",
- environmentMatchGlobs: [["**/*.server.test.*", "node"]],
- setupFiles: ["@webstudio-is/design-system/test-setup"],
+ silent: "passed-only",
+ workspace: projects,
},
});
diff --git a/package.json b/package.json
index 9e8494fe8e..faa79aff69 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"e2e:builder:dev:backend": "E2E_SKIP_CLEANUP=true E2E_RUN_TESTS=false E2E_START_POSTGREST=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false bash ./apps/builder/e2e/run-local.sh",
"e2e:builder:dev": "E2E_SKIP_CLEANUP=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false E2E_BUILDER_URL=${E2E_BUILDER_URL:-https://127.0.0.1:3000} bash ./apps/builder/e2e/run-local.sh",
"e2e:builder:refresh-schema-cache": "E2E_DB_BOOTSTRAP=migrations E2E_WRITE_SCHEMA_SNAPSHOT=true E2E_RUN_TESTS=false bash ./apps/builder/e2e/run-local.sh",
+ "e2e:builder:check-supabase-migrations": "E2E_BUILD_DATABASE_IMAGE=false E2E_COMPOSE_OVERRIDE_FILE=./apps/builder/docker-compose.e2e-supabase.yaml E2E_DB_BOOTSTRAP=migrations E2E_RUN_TESTS=false bash ./apps/builder/e2e/run-local.sh",
"playwright": "pnpm -r playwright-init",
"format": "oxfmt",
"storybook:dev": "storybook dev -p 6006",
diff --git a/packages/cli/evaluations/high-impact/fixture-api.test.ts b/packages/cli/evaluations/high-impact/fixture-api.test.ts
index 896ebd340b..fc4388b1f6 100644
--- a/packages/cli/evaluations/high-impact/fixture-api.test.ts
+++ b/packages/cli/evaluations/high-impact/fixture-api.test.ts
@@ -188,18 +188,24 @@ describe("high-impact fixture API", () => {
assetsDir: ".webstudio/assets",
});
expect(upload.ok).toBe(true);
- expect(fixtureApi.getProject()).toMatchObject({
+ const project = fixtureApi.getProject();
+ expect(project).toMatchObject({
assetFolders: [expect.objectContaining({ id: folderId, name: "Blog" })],
- assets: markdownBlogFixtureDocuments.map(({ name, format }) =>
- expect.objectContaining({
- name,
- filename: name.slice(0, name.lastIndexOf(".")),
- type: "file",
- format,
- folderId,
- })
- ),
});
+ expect(project.assets).toHaveLength(markdownBlogFixtureDocuments.length);
+ expect(project.assets).toEqual(
+ expect.arrayContaining(
+ markdownBlogFixtureDocuments.map(({ name, format }) =>
+ expect.objectContaining({
+ name,
+ filename: name.slice(0, name.lastIndexOf(".")),
+ type: "file",
+ format,
+ folderId,
+ })
+ )
+ )
+ );
await expect(
readFile(
join(projectDirectory, ".webstudio/assets/aurora-trails.md"),
diff --git a/packages/cli/src/prebuild.test.ts b/packages/cli/src/prebuild.test.ts
index d6009f085c..2d0303351e 100644
--- a/packages/cli/src/prebuild.test.ts
+++ b/packages/cli/src/prebuild.test.ts
@@ -1506,7 +1506,7 @@ describe("prebuild", () => {
).toMatchObject({ class: "w-code-text", lang: "en" });
expect(findElementsByTagName(legacyCode, "span").length).toBeGreaterThan(0);
expect(getTextContent(legacyCode)).toBe("legacy <code>");
- }, 30_000);
+ }, 60_000);
test("prerenders bound Code Text while keeping catalog chunks lazy", async () => {
await writeSiteData(
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index d883a9c46a..d7d33f52de 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -14,14 +14,14 @@
"@babel/parser": "^7.29.7",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
- "@vitest/browser": "^3.1.2",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"css-tree": "^3.2.1",
+ "playwright": "1.50.1",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
- "playwright": "1.50.1",
- "vitest": "^3.1.2",
+ "vitest": "3.1.1",
"zod": "^4.4.3"
},
"peerDependencies": {
@@ -83,8 +83,7 @@
"./colors": {
"webstudio": "./src/colors.ts"
},
- "./colors.css": "./src/colors/colors.css",
- "./test-setup": "./src/test-setup.ts"
+ "./colors.css": "./src/colors/colors.css"
},
"license": "AGPL-3.0-or-later",
"private": true,
diff --git a/packages/design-system/src/colors/color-contrast.browser.test.ts b/packages/design-system/src/colors/color-contrast.browser.test.ts
index c4879e5425..8e6ee8e5a3 100644
--- a/packages/design-system/src/colors/color-contrast.browser.test.ts
+++ b/packages/design-system/src/colors/color-contrast.browser.test.ts
@@ -1,8 +1,10 @@
import { describe, expect, test } from "vitest";
import "./colors.css";
-import { getColorContrast } from "./color-contrast";
+import { __testing__, getColorContrast } from "./color-contrast";
import type { ColorMode } from "./color-source-utils";
+const { createColorContrastReader } = __testing__;
+
const readColor = (name: string) => {
const sample = document.createElement("span");
sample.style.color = `var(${name})`;
@@ -443,6 +445,7 @@ describe("Craft color contrast", () => {
test("supported theme parameter range preserves every contrast contract", () => {
const root = document.documentElement;
+ const contrastReader = createColorContrastReader();
const chromaticColors = [
"accent",
"positive",
@@ -454,9 +457,9 @@ describe("Craft color contrast", () => {
const violations = new Map<string, { ratio: number; message: string }>();
const recordFailures = (scenario: string, mode: ColorMode) => {
- const failures = getColorContrast(mode).filter(
- ({ ratio, minimum }) => ratio < minimum
- );
+ const failures = contrastReader
+ .read(mode)
+ .filter(({ ratio, minimum }) => ratio < minimum);
for (const failure of failures) {
const relationship = `${failure.foreground} on ${failure.background}`;
const previous = violations.get(relationship);
@@ -513,6 +516,7 @@ describe("Craft color contrast", () => {
}
}
} finally {
+ contrastReader.dispose();
for (const color of chromaticColors) {
root.style.removeProperty(`--theme-color-${color}`);
}
diff --git a/packages/design-system/src/colors/color-contrast.ts b/packages/design-system/src/colors/color-contrast.ts
index 6c28b89322..9c4602f3e7 100644
--- a/packages/design-system/src/colors/color-contrast.ts
+++ b/packages/design-system/src/colors/color-contrast.ts
@@ -37,6 +37,13 @@ const contrastContracts = [
number,
])[];
+const contrastColorNames = new Set<CssVariableName>(
+ contrastContracts.flatMap(([foreground, background]) => [
+ foreground,
+ background,
+ ])
+);
+
export const colorContrastContractCount = contrastContracts.length;
const toLinearChannel = (channel: number) => {
@@ -50,21 +57,31 @@ const getLuminance = (color: Uint8ClampedArray) =>
0.0722 * toLinearChannel(color[2]);
const createColorReader = () => {
- const sample = document.createElement("span");
- sample.hidden = true;
- document.body.append(sample);
+ const samples = new Map<CssVariableName, HTMLElement>();
+ const container = document.createElement("div");
+ container.hidden = true;
+ for (const name of contrastColorNames) {
+ const sample = document.createElement("span");
+ sample.style.color = cssVar(name);
+ container.append(sample);
+ samples.set(name, sample);
+ }
+ document.body.append(container);
const canvas = document.createElement("canvas");
canvas.width = 1;
canvas.height = 1;
const context = canvas.getContext("2d", { willReadFrequently: true });
if (context === null) {
- sample.remove();
+ container.remove();
throw new Error("Canvas color evaluation is unavailable");
}
const read = (name: CssVariableName) => {
- sample.style.color = cssVar(name);
+ const sample = samples.get(name);
+ if (sample === undefined) {
+ throw new Error(`Unknown contrast color: ${name}`);
+ }
context.clearRect(0, 0, 1, 1);
context.fillStyle = getComputedStyle(sample).color;
context.fillRect(0, 0, 1, 1);
@@ -75,26 +92,27 @@ const createColorReader = () => {
return color;
};
- return { read, dispose: () => sample.remove() };
+ return { read, dispose: () => container.remove() };
};
-export const getColorContrast = (mode: ColorMode): ColorContrastResult[] => {
+const createColorContrastReader = () => {
const root = document.documentElement;
const previousMode = root.getAttribute("data-color-scheme");
- root.setAttribute("data-color-scheme", mode);
const reader = createColorReader();
- const luminances = new Map<CssVariableName, number>();
- const readLuminance = (name: CssVariableName) => {
- const cached = luminances.get(name);
- if (cached !== undefined) {
- return cached;
- }
- const value = getLuminance(reader.read(name));
- luminances.set(name, value);
- return value;
- };
- try {
+ const read = (mode: ColorMode): ColorContrastResult[] => {
+ root.setAttribute("data-color-scheme", mode);
+ const luminances = new Map<CssVariableName, number>();
+ const readLuminance = (name: CssVariableName) => {
+ const cached = luminances.get(name);
+ if (cached !== undefined) {
+ return cached;
+ }
+ const value = getLuminance(reader.read(name));
+ luminances.set(name, value);
+ return value;
+ };
+
return contrastContracts.map(([foreground, background, minimum]) => {
const foregroundLuminance = readLuminance(foreground);
const backgroundLuminance = readLuminance(background);
@@ -107,12 +125,27 @@ export const getColorContrast = (mode: ColorMode): ColorContrastResult[] => {
ratio: (lighter + 0.05) / (darker + 0.05),
};
});
- } finally {
+ };
+
+ const dispose = () => {
reader.dispose();
if (previousMode === null) {
root.removeAttribute("data-color-scheme");
} else {
root.setAttribute("data-color-scheme", previousMode);
}
+ };
+
+ return { read, dispose };
+};
+
+export const getColorContrast = (mode: ColorMode): ColorContrastResult[] => {
+ const reader = createColorContrastReader();
+ try {
+ return reader.read(mode);
+ } finally {
+ reader.dispose();
}
};
+
+export const __testing__ = { createColorContrastReader };
diff --git a/packages/design-system/src/components/split-button.browser.test.tsx b/packages/design-system/src/components/split-button.browser.test.tsx
index 39b5108d8f..a5389e27f8 100644
--- a/packages/design-system/src/components/split-button.browser.test.tsx
+++ b/packages/design-system/src/components/split-button.browser.test.tsx
@@ -93,7 +93,9 @@ test("split button segments share hover in the real menu composition", async ()
await page.elementLocator(button).hover();
const backgrounds = buttons.map(
- (segment) => getComputedStyle(segment).backgroundColor
+ (segment, index) =>
+ getComputedStyle(segment, index === 0 ? undefined : "::before")
+ .backgroundColor
);
expect(backgrounds[0]).toBe(backgrounds[1]);
expect(backgrounds[0]).not.toBe("rgba(0, 0, 0, 0)");
@@ -106,20 +108,38 @@ test("split button segments share hover in the real menu composition", async ()
},
});
const gapHoverBackgrounds = buttons.map(
- (segment) => getComputedStyle(segment).backgroundColor
+ (segment, index) =>
+ getComputedStyle(segment, index === 0 ? undefined : "::before")
+ .backgroundColor
);
expect(gapHoverBackgrounds[0]).toBe(gapHoverBackgrounds[1]);
expect(gapHoverBackgrounds[0]).not.toBe("rgba(0, 0, 0, 0)");
- expect(buttons[1].getBoundingClientRect().width).toBeLessThan(
- buttons[0].getBoundingClientRect().width
- );
const chevron = buttons[1].querySelector("svg");
expect(chevron).not.toBeNull();
+ const menuRect = buttons[1].getBoundingClientRect();
+ const menuVisualStyle = getComputedStyle(buttons[1], "::before");
+ expect(Number.parseFloat(menuVisualStyle.width)).toBe(
+ chevron?.getBoundingClientRect().width
+ );
+ expect(Number.parseFloat(menuVisualStyle.width)).toBeLessThan(
+ buttons[0].getBoundingClientRect().width
+ );
+ expect(menuRect.width).toBe(24);
+
+ const firstStyle = getComputedStyle(buttons[0]);
+ const secondStyle = getComputedStyle(buttons[1]);
+ expect(firstStyle.borderTopRightRadius).toBe("0px");
+ expect(firstStyle.borderBottomRightRadius).toBe("0px");
+ expect(secondStyle.borderTopLeftRadius).toBe("0px");
+ expect(secondStyle.borderBottomLeftRadius).toBe("0px");
+
+ expect(document.elementFromPoint(menuRect.left + 1, menuRect.top + 2)).toBe(
+ buttons[1]
+ );
expect(
- buttons[1].getBoundingClientRect().width -
- (chevron?.getBoundingClientRect().width ?? 0)
- ).toBe(2);
+ document.elementFromPoint(menuRect.right - 1, menuRect.top + 2)
+ ).toBe(buttons[1]);
act(() => root?.unmount());
root = undefined;
diff --git a/packages/design-system/src/components/split-button.tsx b/packages/design-system/src/components/split-button.tsx
index 556cfd1338..2cf7013a02 100644
--- a/packages/design-system/src/components/split-button.tsx
+++ b/packages/design-system/src/components/split-button.tsx
@@ -6,16 +6,59 @@ export const SplitButton = styled("div", {
display: "inline-flex",
alignItems: "center",
gap: theme.spacing[1],
+ "> button:first-of-type": {
+ borderTopRightRadius: 0,
+ borderBottomRightRadius: 0,
+ },
+ "> button:last-of-type": {
+ borderTopLeftRadius: 0,
+ borderBottomLeftRadius: 0,
+ },
"&:hover:not(:has(> button:disabled:hover, > button[aria-disabled=true]:hover))":
{
- "> button:not(:disabled):not([aria-disabled=true])": {
+ "> button:first-of-type:not(:disabled):not([aria-disabled=true])": {
background: cssVar("--overlay-interaction-hover"),
},
+ "> button:last-of-type:not(:disabled):not([aria-disabled=true])::before":
+ {
+ background: cssVar("--overlay-interaction-hover"),
+ },
},
});
export const SplitButtonMenuButton = styled(IconButton, {
- minWidth: "auto",
- width: "auto",
+ position: "relative",
+ minWidth: theme.sizes.controlHeight,
+ width: theme.sizes.controlHeight,
+ marginInline: `-${theme.spacing[3]}`,
paddingInline: 0,
+ border: 0,
+ background: "transparent !important",
+ "> svg": {
+ flexShrink: 0,
+ position: "relative",
+ zIndex: 1,
+ },
+ "&::before": {
+ content: '""',
+ position: "absolute",
+ insetBlock: 0,
+ insetInline: theme.spacing[3],
+ backgroundColor: "transparent",
+ borderTopRightRadius: theme.borderRadius[3],
+ borderBottomRightRadius: theme.borderRadius[3],
+ },
+ "&:hover::before, &[data-hovered=true]::before, &[data-state=open]::before": {
+ background: cssVar("--overlay-interaction-hover"),
+ },
+ "&:active::before": {
+ background: cssVar("--overlay-interaction-pressed"),
+ },
+ "&[data-focused=true], &:focus-visible": {
+ outline: `1px solid ${cssVar("--border-focus")}`,
+ outlineOffset: "-1px",
+ },
+ "&:disabled::before, &[aria-disabled=true]::before": {
+ background: "transparent",
+ },
});
diff --git a/packages/design-system/src/test-setup.ts b/packages/design-system/src/test-setup.ts
deleted file mode 100644
index b7567cd4bb..0000000000
--- a/packages/design-system/src/test-setup.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Polyfill CSS.supports for jsdom (not available natively).
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const g = globalThis as any;
-
-if (typeof g.CSS === "undefined") {
- g.CSS = { supports: () => false };
-}
-
-// jsdom does not implement canvas, while hdr-color-input touches getContext
-// during module evaluation through the design-system barrel import.
-if (
- g.HTMLCanvasElement !== undefined &&
- g.navigator?.userAgent.includes("jsdom")
-) {
- g.HTMLCanvasElement.prototype.getContext = () => null;
-}
diff --git a/packages/design-system/vitest.config.ts b/packages/design-system/vitest.config.ts
index d64a7b6bbe..7f0235b70e 100644
--- a/packages/design-system/vitest.config.ts
+++ b/packages/design-system/vitest.config.ts
@@ -1,44 +1,9 @@
import { defineConfig } from "vitest/config";
+import {
+ browserTestPorts,
+ createBrowserTestConfig,
+} from "../../scripts/vitest-browser-workspace";
-export default defineConfig({
- optimizeDeps: {
- include: ["react/jsx-dev-runtime"],
- },
- resolve: {
- conditions: ["webstudio", "browser", "development|production"],
- },
- ssr: {
- resolve: {
- conditions: ["webstudio", "node", "development|production"],
- },
- },
- test: {
- workspace: [
- {
- extends: "./vitest.config.ts",
- test: {
- name: "browser",
- include: ["**/*.browser.{test,spec}.{ts,tsx}"],
- browser: {
- provider: "playwright",
- enabled: true,
- headless: true,
- screenshotFailures: false,
- instances: [{ browser: "chromium" }],
- },
- },
- },
- {
- extends: "./vitest.config.ts",
- test: {
- name: "unit",
- include: [
- "!**/*.browser.{test,spec}.{ts,tsx}",
- "**/*.{test,spec}.{ts,tsx}",
- ],
- environment: "node",
- },
- },
- ],
- },
-});
+export default defineConfig(
+ createBrowserTestConfig(browserTestPorts.designSystem)
+);
diff --git a/packages/query-builder-react/package.json b/packages/query-builder-react/package.json
index 909f0b031b..9e13c5dc1a 100644
--- a/packages/query-builder-react/package.json
+++ b/packages/query-builder-react/package.json
@@ -18,9 +18,11 @@
"@testing-library/react": "^16.2.0",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/tsconfig": "workspace:*",
+ "playwright": "1.50.1",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
- "vitest": "^3.1.2"
+ "vitest": "3.1.1"
},
"exports": {
".": "./src/index.tsx"
diff --git a/packages/query-builder-react/src/index.test.tsx b/packages/query-builder-react/src/index.browser.test.tsx
similarity index 99%
rename from packages/query-builder-react/src/index.test.tsx
rename to packages/query-builder-react/src/index.browser.test.tsx
index b10ea3d53d..b009fdb8ac 100644
--- a/packages/query-builder-react/src/index.test.tsx
+++ b/packages/query-builder-react/src/index.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { useState } from "react";
import { cleanup, fireEvent, render, screen } from "@testing-library/react";
import { afterEach, describe, expect, test } from "vitest";
diff --git a/packages/query-builder-react/vitest.config.ts b/packages/query-builder-react/vitest.config.ts
index 45b04195bd..d77973d90d 100644
--- a/packages/query-builder-react/vitest.config.ts
+++ b/packages/query-builder-react/vitest.config.ts
@@ -1,10 +1,9 @@
import { defineConfig } from "vitest/config";
+import {
+ browserTestPorts,
+ createBrowserTestConfig,
+} from "../../scripts/vitest-browser-workspace";
-export default defineConfig({
- resolve: {
- conditions: ["webstudio", "browser", "development|production"],
- },
- test: {
- setupFiles: ["@webstudio-is/design-system/test-setup"],
- },
-});
+export default defineConfig(
+ createBrowserTestConfig(browserTestPorts.queryBuilderReact)
+);
diff --git a/packages/sdk-components-animation/package.json b/packages/sdk-components-animation/package.json
index c6ee3f4b74..f7948a61c5 100644
--- a/packages/sdk-components-animation/package.json
+++ b/packages/sdk-components-animation/package.json
@@ -61,7 +61,7 @@
"devDependencies": {
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
- "@vitest/browser": "^3.0.8",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/css-data": "workspace:*",
"@webstudio-is/design-system": "workspace:*",
"@webstudio-is/generate-arg-types": "workspace:*",
@@ -74,7 +74,7 @@
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"type-fest": "^4.37.0",
- "vitest": "^3.1.2",
+ "vitest": "3.1.1",
"zod": "^4.4.3"
}
}
diff --git a/packages/sdk-components-animation/vitest.config.ts b/packages/sdk-components-animation/vitest.config.ts
index 68528ef018..38b4cefdb7 100644
--- a/packages/sdk-components-animation/vitest.config.ts
+++ b/packages/sdk-components-animation/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from "vitest/config";
import { existsSync } from "node:fs";
import path from "node:path";
import fg from "fast-glob";
+import { browserTestPorts } from "../../scripts/vitest-browser-workspace";
const rootDir = ["..", "../..", "../../.."]
.map((dir) => path.join(__dirname, dir))
@@ -17,6 +18,9 @@ const conditions = hasPrivateFolders
: ["webstudio"];
export default defineConfig({
+ optimizeDeps: {
+ include: ["react/jsx-dev-runtime"],
+ },
resolve: {
conditions,
},
@@ -38,6 +42,7 @@ export default defineConfig({
enabled: true,
headless: true,
screenshotFailures: false,
+ api: { port: browserTestPorts.sdkComponentsAnimation },
instances: [{ browser: "chromium" }, { browser: "firefox" }],
fileParallelism: false,
},
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index 7101c7df32..6533c97d28 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -69,14 +69,16 @@
"@testing-library/react": "^16.2.0",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/css-data": "workspace:*",
"@webstudio-is/generate-arg-types": "workspace:*",
"@webstudio-is/sdk-cli": "workspace:^",
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/template": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
+ "playwright": "1.50.1",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
- "vitest": "^3.1.2"
+ "vitest": "3.1.1"
}
}
diff --git a/packages/sdk-components-react-radix/src/navigation-overlay.test.tsx b/packages/sdk-components-react-radix/src/navigation-overlay.browser.test.tsx
similarity index 90%
rename from packages/sdk-components-react-radix/src/navigation-overlay.test.tsx
rename to packages/sdk-components-react-radix/src/navigation-overlay.browser.test.tsx
index 70d1eca836..66ccfbd844 100644
--- a/packages/sdk-components-react-radix/src/navigation-overlay.test.tsx
+++ b/packages/sdk-components-react-radix/src/navigation-overlay.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { forwardRef } from "react";
import {
cleanup,
@@ -30,6 +27,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "./popover";
import { getLinkActivation } from "./navigation-overlay";
afterEach(() => {
+ vi.restoreAllMocks();
cleanup();
window.history.replaceState(null, "", "/");
});
@@ -187,22 +185,37 @@ test("closes a dialog when a nested link element is activated", async () => {
});
test.each(["_parent", "_top"])(
- "closes an overlay for target=%s in the top-level context",
+ "recognizes target=%s as same-context navigation at the top level",
(target) => {
- render(
- <Popover open>
- <PopoverTrigger>
- <button>Open</button>
- </PopoverTrigger>
- <PopoverContent>
- <Link target={target} />
- </PopoverContent>
- </Popover>
- );
-
- fireEvent.click(screen.getByText("Destination"));
+ const anchor = document.createElement("a");
+ const child = document.createElement("span");
+ anchor.setAttribute("href", "#destination");
+ anchor.setAttribute("target", target);
+ anchor.append(child);
+ const topLevelWindow = {} as Window;
+ Object.defineProperties(topLevelWindow, {
+ name: { value: "" },
+ parent: { value: topLevelWindow },
+ top: { value: topLevelWindow },
+ });
+ const ownerDocument = vi
+ .spyOn(anchor, "ownerDocument", "get")
+ .mockReturnValue({
+ defaultView: topLevelWindow,
+ querySelector: () => null,
+ } as unknown as Document);
- expect(screen.queryByText("Destination")).toBeNull();
+ expect(
+ getLinkActivation({
+ target: child,
+ button: 0,
+ altKey: false,
+ ctrlKey: false,
+ metaKey: false,
+ shiftKey: false,
+ })
+ ).toBe(anchor);
+ ownerDocument.mockRestore();
}
);
diff --git a/packages/sdk-components-react-radix/tsconfig.json b/packages/sdk-components-react-radix/tsconfig.json
index 0c8d2e7907..44412d1e99 100644
--- a/packages/sdk-components-react-radix/tsconfig.json
+++ b/packages/sdk-components-react-radix/tsconfig.json
@@ -1,4 +1,5 @@
{
"extends": "@webstudio-is/tsconfig/base.json",
- "include": ["**/*.ts", "**/*.tsx", "../../@types/**/*.d.ts"]
+ "include": ["**/*.ts", "**/*.tsx", "../../@types/**/*.d.ts"],
+ "exclude": ["vitest.config.ts"]
}
diff --git a/packages/sdk-components-react-radix/vitest.config.ts b/packages/sdk-components-react-radix/vitest.config.ts
new file mode 100644
index 0000000000..d14e37ac42
--- /dev/null
+++ b/packages/sdk-components-react-radix/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+import {
+ browserTestPorts,
+ createBrowserTestConfig,
+} from "../../scripts/vitest-browser-workspace";
+
+export default defineConfig(
+ createBrowserTestConfig(browserTestPorts.sdkComponentsReactRadix)
+);
diff --git a/packages/sdk-components-react-router/package.json b/packages/sdk-components-react-router/package.json
index fe521dbe25..775101b3ab 100644
--- a/packages/sdk-components-react-router/package.json
+++ b/packages/sdk-components-react-router/package.json
@@ -38,9 +38,11 @@
"devDependencies": {
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/tsconfig": "workspace:*",
+ "playwright": "1.50.1",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
- "vitest": "^3.1.2"
+ "vitest": "3.1.1"
}
}
diff --git a/packages/sdk-components-react-router/src/link.test.tsx b/packages/sdk-components-react-router/src/link.browser.test.tsx
similarity index 99%
rename from packages/sdk-components-react-router/src/link.test.tsx
rename to packages/sdk-components-react-router/src/link.browser.test.tsx
index 96efad9b98..ea62993d94 100644
--- a/packages/sdk-components-react-router/src/link.test.tsx
+++ b/packages/sdk-components-react-router/src/link.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import * as React from "react";
import { createRoot, type Root } from "react-dom/client";
import { act } from "react-dom/test-utils";
diff --git a/packages/sdk-components-react-router/tsconfig.json b/packages/sdk-components-react-router/tsconfig.json
index fb43dde600..fdd08ecde7 100644
--- a/packages/sdk-components-react-router/tsconfig.json
+++ b/packages/sdk-components-react-router/tsconfig.json
@@ -2,5 +2,6 @@
"extends": "@webstudio-is/tsconfig/base.json",
"compilerOptions": {
"types": ["react/canary", "@types/node"]
- }
+ },
+ "exclude": ["vitest.config.ts"]
}
diff --git a/packages/sdk-components-react-router/vitest.config.ts b/packages/sdk-components-react-router/vitest.config.ts
new file mode 100644
index 0000000000..66519991b6
--- /dev/null
+++ b/packages/sdk-components-react-router/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+import {
+ browserTestPorts,
+ createBrowserTestConfig,
+} from "../../scripts/vitest-browser-workspace";
+
+export default defineConfig(
+ createBrowserTestConfig(browserTestPorts.sdkComponentsReactRouter)
+);
diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json
index ccc87347b0..3dad30c508 100644
--- a/packages/sdk-components-react/package.json
+++ b/packages/sdk-components-react/package.json
@@ -103,6 +103,7 @@
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"@types/sanitize-html": "2.16.1",
+ "@vitest/browser": "3.1.1",
"@webstudio-is/design-system": "workspace:*",
"@webstudio-is/generate-arg-types": "workspace:*",
"@webstudio-is/sdk-cli": "workspace:*",
@@ -110,8 +111,9 @@
"@webstudio-is/tsconfig": "workspace:*",
"micromark-util-types": "2.0.2",
"nanostores": "^0.11.3",
+ "playwright": "1.50.1",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
- "vitest": "^3.1.2"
+ "vitest": "3.1.1"
}
}
diff --git a/packages/sdk-components-react/src/code-text/canvas.test.tsx b/packages/sdk-components-react/src/code-text/canvas.browser.test.tsx
similarity index 98%
rename from packages/sdk-components-react/src/code-text/canvas.test.tsx
rename to packages/sdk-components-react/src/code-text/canvas.browser.test.tsx
index cb5fc919a2..2f2995534b 100644
--- a/packages/sdk-components-react/src/code-text/canvas.test.tsx
+++ b/packages/sdk-components-react/src/code-text/canvas.browser.test.tsx
@@ -1,5 +1,3 @@
-// @vitest-environment jsdom
-
import { render, waitFor } from "@testing-library/react";
import { expect, test } from "vitest";
import { canvasComponents } from "../canvas-components";
diff --git a/packages/sdk-components-react/src/code-text/index.test.tsx b/packages/sdk-components-react/src/code-text/index.browser.test.tsx
similarity index 99%
rename from packages/sdk-components-react/src/code-text/index.test.tsx
rename to packages/sdk-components-react/src/code-text/index.browser.test.tsx
index 45211e895d..ce9ff70946 100644
--- a/packages/sdk-components-react/src/code-text/index.test.tsx
+++ b/packages/sdk-components-react/src/code-text/index.browser.test.tsx
@@ -1,5 +1,3 @@
-// @vitest-environment jsdom
-
import { createRef } from "react";
import { renderToStaticMarkup, renderToString } from "react-dom/server";
import { hydrateRoot } from "react-dom/client";
diff --git a/packages/sdk-components-react/src/html-embed.test.tsx b/packages/sdk-components-react/src/html-embed.browser.test.tsx
similarity index 99%
rename from packages/sdk-components-react/src/html-embed.test.tsx
rename to packages/sdk-components-react/src/html-embed.browser.test.tsx
index f450f10b4e..ba07308c6f 100644
--- a/packages/sdk-components-react/src/html-embed.test.tsx
+++ b/packages/sdk-components-react/src/html-embed.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import * as React from "react";
import ReactDOMServer from "react-dom/server";
import { test, expect, describe, beforeEach } from "vitest";
diff --git a/packages/sdk-components-react/src/json-ld-head.test.tsx b/packages/sdk-components-react/src/json-ld-head.browser.test.tsx
similarity index 96%
rename from packages/sdk-components-react/src/json-ld-head.test.tsx
rename to packages/sdk-components-react/src/json-ld-head.browser.test.tsx
index 64d222b1d6..cbeb09e157 100644
--- a/packages/sdk-components-react/src/json-ld-head.test.tsx
+++ b/packages/sdk-components-react/src/json-ld-head.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { cleanup, render, waitFor } from "@testing-library/react";
import { afterEach, expect, test } from "vitest";
import { HeadSlot } from "./head-slot";
diff --git a/packages/sdk-components-react/src/link.test.tsx b/packages/sdk-components-react/src/link.browser.test.tsx
similarity index 99%
rename from packages/sdk-components-react/src/link.test.tsx
rename to packages/sdk-components-react/src/link.browser.test.tsx
index ae823483c0..13c8fa5a66 100644
--- a/packages/sdk-components-react/src/link.test.tsx
+++ b/packages/sdk-components-react/src/link.browser.test.tsx
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { renderToStaticMarkup } from "react-dom/server";
import { expect, test, vi } from "vitest";
import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
diff --git a/packages/sdk-components-react/src/time.test.ts b/packages/sdk-components-react/src/time.browser.test.ts
similarity index 96%
rename from packages/sdk-components-react/src/time.test.ts
rename to packages/sdk-components-react/src/time.browser.test.ts
index 7c46b352e0..a0c9cc2ac8 100644
--- a/packages/sdk-components-react/src/time.test.ts
+++ b/packages/sdk-components-react/src/time.browser.test.ts
@@ -1,6 +1,3 @@
-/**
- * @vitest-environment jsdom
- */
import { createElement } from "react";
import { renderToStaticMarkup } from "react-dom/server";
import { hydrateRoot, type Root } from "react-dom/client";
@@ -10,13 +7,20 @@ import { Time, __testing__ } from "./time";
const { parseDate, formatDate, timeZoneOrDefault } = __testing__;
-const originalTimeZone = process.env.TZ;
let root: Root | undefined;
+const mockVisitorTimeZone = (timeZone: string) => {
+ vi.spyOn(Intl.DateTimeFormat.prototype, "resolvedOptions").mockReturnValue({
+ locale: "de-DE",
+ calendar: "gregory",
+ numberingSystem: "latn",
+ timeZone,
+ });
+};
+
afterEach(() => {
root?.unmount();
root = undefined;
- process.env.TZ = originalTimeZone;
vi.restoreAllMocks();
document.body.innerHTML = "";
});
@@ -61,13 +65,11 @@ test("hydrates ISO date string without timezone mismatch warnings", async () =>
const container = document.createElement("div");
document.body.appendChild(container);
- process.env.TZ = "UTC";
container.innerHTML = renderToStaticMarkup(ui);
expect(container.textContent).toBe("6 May 2026");
const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
- process.env.TZ = "Europe/Berlin";
await act(async () => {
root = hydrateRoot(container, ui);
await Promise.resolve();
@@ -150,13 +152,12 @@ test("hydrates visitor timezone without mismatch and updates after hydration", a
const container = document.createElement("div");
document.body.appendChild(container);
- process.env.TZ = "UTC";
container.innerHTML = renderToStaticMarkup(ui);
expect(container.textContent).toBe("17:45");
const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
- process.env.TZ = "Europe/Berlin";
+ mockVisitorTimeZone("Europe/Berlin");
await act(async () => {
root = hydrateRoot(container, ui);
await Promise.resolve();
@@ -188,13 +189,12 @@ test("trims visitor timezone mode before hydration update", async () => {
const container = document.createElement("div");
document.body.appendChild(container);
- process.env.TZ = "UTC";
container.innerHTML = renderToStaticMarkup(ui);
expect(container.textContent).toBe("17:45");
const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
- process.env.TZ = "Europe/Berlin";
+ mockVisitorTimeZone("Europe/Berlin");
await act(async () => {
root = hydrateRoot(container, ui);
await Promise.resolve();
diff --git a/packages/sdk-components-react/tsconfig.json b/packages/sdk-components-react/tsconfig.json
index 0c8d2e7907..44412d1e99 100644
--- a/packages/sdk-components-react/tsconfig.json
+++ b/packages/sdk-components-react/tsconfig.json
@@ -1,4 +1,5 @@
{
"extends": "@webstudio-is/tsconfig/base.json",
- "include": ["**/*.ts", "**/*.tsx", "../../@types/**/*.d.ts"]
+ "include": ["**/*.ts", "**/*.tsx", "../../@types/**/*.d.ts"],
+ "exclude": ["vitest.config.ts"]
}
diff --git a/packages/sdk-components-react/vitest.config.ts b/packages/sdk-components-react/vitest.config.ts
new file mode 100644
index 0000000000..0bd31a65be
--- /dev/null
+++ b/packages/sdk-components-react/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+import {
+ browserTestPorts,
+ createBrowserTestConfig,
+} from "../../scripts/vitest-browser-workspace";
+
+export default defineConfig(
+ createBrowserTestConfig(browserTestPorts.sdkComponentsReact)
+);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91a1b509b0..75c442b272 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -512,9 +512,12 @@ importers:
'@unocss/preset-wind4':
specifier: ^66.6.8
version: 66.6.8
+ '@vitest/browser':
+ specifier: 3.1.1
'@vitest/coverage-v8':
- specifier: 3.1.2
- version: 3.1.2(@vitest/[email protected])([email protected])
+ specifier: 3.1.1
+ version: 3.1.1(@vitest/[email protected])([email protected])
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../../packages/tsconfig
@@ -527,6 +530,9 @@ importers:
msw:
specifier: ^2.13.2
version: 2.13.2(@types/[email protected])([email protected])
+ playwright:
+ specifier: 1.50.1
+ version: 1.50.1
react-router-dom:
specifier: ^6.30.0
@@ -543,8 +549,8 @@ importers:
specifier: 6.3.4
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
fixtures/react-router-cloudflare:
dependencies:
@@ -1870,8 +1876,8 @@ importers:
specifier: ^18.2.25
version: 18.2.25
'@vitest/browser':
- specifier: ^3.1.2
+ specifier: 3.1.1
'@webstudio-is/image':
specifier: workspace:*
version: link:../image
@@ -1891,8 +1897,8 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
zod:
specifier: ^4.4.3
version: 4.4.3
@@ -2475,15 +2481,21 @@ importers:
'@types/react-dom':
specifier: ^18.2.25
version: 18.2.25
+ '@vitest/browser':
+ specifier: 3.1.1
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../tsconfig
+ playwright:
+ specifier: 1.50.1
+ version: 1.50.1
react-dom:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
packages/react-sdk:
dependencies:
@@ -2678,8 +2690,8 @@ importers:
specifier: ^18.2.25
version: 18.2.25
'@vitest/browser':
- specifier: ^3.0.8
+ specifier: 3.1.1
'@webstudio-is/css-data':
specifier: workspace:*
version: link:../css-data
@@ -2717,8 +2729,8 @@ importers:
specifier: ^4.37.0
version: 4.37.0
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
zod:
specifier: ^4.4.3
version: 4.4.3
@@ -2798,6 +2810,9 @@ importers:
'@types/sanitize-html':
specifier: 2.16.1
version: 2.16.1
+ '@vitest/browser':
+ specifier: 3.1.1
'@webstudio-is/design-system':
specifier: workspace:*
version: link:../design-system
@@ -2819,6 +2834,9 @@ importers:
nanostores:
specifier: ^0.11.3
version: 0.11.3
+ playwright:
+ specifier: 1.50.1
+ version: 1.50.1
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -2826,8 +2844,8 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
packages/sdk-components-react-radix:
dependencies:
@@ -2892,6 +2910,9 @@ importers:
'@types/react-dom':
specifier: ^18.2.25
version: 18.2.25
+ '@vitest/browser':
+ specifier: 3.1.1
'@webstudio-is/css-data':
specifier: workspace:*
version: link:../css-data
@@ -2910,6 +2931,9 @@ importers:
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../tsconfig
+ playwright:
+ specifier: 1.50.1
+ version: 1.50.1
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -2917,8 +2941,8 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
packages/sdk-components-react-remix:
dependencies:
@@ -2975,9 +2999,15 @@ importers:
'@types/react-dom':
specifier: ^18.2.25
version: 18.2.25
+ '@vitest/browser':
+ specifier: 3.1.1
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../tsconfig
+ playwright:
+ specifier: 1.50.1
+ version: 1.50.1
react:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318
@@ -2985,8 +3015,8 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
vitest:
- specifier: ^3.1.2
+ specifier: 3.1.1
packages/sdk-components-registry:
dependencies:
@@ -7088,6 +7118,21 @@ packages:
peerDependencies:
vite: 6.3.4
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-A+A69mMtrj1RPh96LfXGc309KSXhy2MslvyL+cp9+Y5EVdoJD4KfXDx/3SSlRGN70+hIoJ3RRbTidTvj18PZ/A==}
+ peerDependencies:
+ playwright: 1.50.1
+ safaridriver: '*'
+ vitest: 3.1.1
+ webdriverio: ^7.0.0 || ^8.0.0 || ^9.0.0
+ peerDependenciesMeta:
+ playwright:
+ optional: true
+ safaridriver:
+ optional: true
+ webdriverio:
+ optional: true
+
'@vitest/[email protected]':
resolution: {integrity: sha512-dwL6hQg3NSDP3Z4xzIZL0xHq/AkQAPQ4StFpWVlY2zbRJtK3Y2YqdFZ7YmZjszTETN1BDQZRn/QOrcP+c8ATgg==}
peerDependencies:
@@ -7103,6 +7148,15 @@ packages:
webdriverio:
optional: true
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-MgV6D2dhpD6Hp/uroUoAIvFqA8AuvXEFBC2eepG3WFc1pxTfdk1LEqqkWoWhjz+rytoqrnUUCdf6Lzco3iHkLQ==}
+ peerDependencies:
+ '@vitest/browser': 3.1.1
+ vitest: 3.1.1
+ peerDependenciesMeta:
+ '@vitest/browser':
+ optional: true
+
'@vitest/[email protected]':
resolution: {integrity: sha512-XDdaDOeaTMAMYW7N63AqoK32sYUWbXnTkC6tEbVcu3RlU1bB9of32T+PGf8KZvxqLNqeXhafDFqCkwpf2+dyaQ==}
peerDependencies:
@@ -7112,9 +7166,23 @@ packages:
'@vitest/browser':
optional: true
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-O8hJgr+zREopCAqWl3uCVaOdqJwZ9qaDwUP7vy3Xigad0phZe9APxKhPcDNqYYi0rX5oMvwJMSCAXY2afqeTSA==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==}
+ peerDependencies:
+ msw: ^2.4.9
+ vite: 6.3.4
+ peerDependenciesMeta:
+ msw:
+ optional: true
+ vite:
+ optional: true
+
'@vitest/[email protected]':
resolution: {integrity: sha512-kOtd6K2lc7SQ0mBqYv/wdGedlqPdM/B38paPY+OwJ1XiNi44w3Fpog82UfOibmHaV9Wod18A09I9SCKLyDMqgw==}
peerDependencies:
@@ -7126,18 +7194,33 @@ packages:
vite:
optional: true
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-bhLib9l4xb4sUMPXnThbnhX2Yi8OutBMA8Yahxa7yavQsFDtwY/jrUZwpKp2XH9DhRFJIeytlyGpXCqZ65nR+g==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-Q1qkpazSF/p4ApZg1vfZSQ5Yw6OCQxVMVrLjslbLFA1hMDrT2uxtqMaw8Tc/jy5DLka1sNs1Y7rBcftMiaSH/Q==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-OEc5fSXMws6sHVe4kOFyDSj/+4MSwst0ib4un0DlcYgQvRuYQ0+M2HyqGaauUMnjq87tmUaMNDxKQx7wNfVqPA==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-5GGd0ytZ7BH3H6JTj9Kw7Prn1Nbg0wZVrIvou+UWxm54d+WoXXgAgjFJ8wn3LdagWLFSEfpPeyYrByZaGEZHLg==}
@@ -11725,6 +11808,11 @@ packages:
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
hasBin: true
+ resolution: {integrity: sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==}
+ engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+ hasBin: true
+
resolution: {integrity: sha512-/8iMryv46J3aK13iUXsei5G/A3CUlW4665THCPS+K8xAaqrVWiGB4RfXMQXCLjpK9P2eK//BczrVkn5JLAk6DA==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -11770,6 +11858,34 @@ packages:
yaml:
optional: true
+ resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==}
+ engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+ hasBin: true
+ peerDependencies:
+ '@edge-runtime/vm': '*'
+ '@types/debug': ^4.1.12
+ '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+ '@vitest/browser': 3.1.1
+ '@vitest/ui': 3.1.1
+ happy-dom: '*'
+ jsdom: '*'
+ peerDependenciesMeta:
+ '@edge-runtime/vm':
+ optional: true
+ '@types/debug':
+ optional: true
+ '@types/node':
+ optional: true
+ '@vitest/browser':
+ optional: true
+ '@vitest/ui':
+ optional: true
+ happy-dom:
+ optional: true
+ jsdom:
+ optional: true
+
resolution: {integrity: sha512-WaxpJe092ID1C0mr+LH9MmNrhfzi8I65EX/NRU/Ld016KqQNRgxSOlGNP1hHN+a/F8L15Mh8klwaF77zR3GeDQ==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -12074,8 +12190,8 @@ snapshots:
'@ampproject/[email protected]':
dependencies:
- '@jridgewell/gen-mapping': 0.3.5
- '@jridgewell/trace-mapping': 0.3.25
+ '@jridgewell/gen-mapping': 0.3.13
+ '@jridgewell/trace-mapping': 0.3.31
'@apidevtools/[email protected]':
dependencies:
@@ -12366,7 +12482,7 @@ snapshots:
dependencies:
- '@ampproject/remapping': 2.2.1
+ '@ampproject/remapping': 2.3.0
'@babel/code-frame': 7.26.2
'@babel/generator': 7.29.7
'@babel/helper-compilation-targets': 7.25.9
@@ -13750,7 +13866,7 @@ snapshots:
'@jridgewell/[email protected]':
dependencies:
- '@jridgewell/sourcemap-codec': 1.5.0
+ '@jridgewell/sourcemap-codec': 1.5.5
'@jridgewell/trace-mapping': 0.3.31
'@jridgewell/[email protected]':
@@ -15680,7 +15796,7 @@ snapshots:
dependencies:
'@rollup/pluginutils': 5.1.4([email protected])
- magic-string: 0.30.17
+ magic-string: 0.30.21
optionalDependencies:
rollup: 4.40.0
@@ -15959,7 +16075,7 @@ snapshots:
recast: 0.23.9
semver: 7.7.1
util: 0.12.5
- ws: 8.18.0
+ ws: 8.21.0
optionalDependencies:
prettier: 3.5.3
transitivePeerDependencies:
@@ -16382,7 +16498,7 @@ snapshots:
'@unocss/[email protected]':
dependencies:
'@unocss/core': 66.6.8
- magic-string: 0.30.17
+ magic-string: 0.30.21
'@vanilla-extract/[email protected]':
dependencies:
@@ -16486,6 +16602,25 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ dependencies:
+ '@testing-library/dom': 10.4.0
+ '@testing-library/user-event': 14.6.1(@testing-library/[email protected])
+ '@vitest/utils': 3.1.1
+ magic-string: 0.30.21
+ sirv: 3.0.1
+ tinyrainbow: 2.0.0
+ ws: 8.21.0
+ optionalDependencies:
+ playwright: 1.50.1
+ transitivePeerDependencies:
+ - bufferutil
+ - msw
+ - utf-8-validate
+ - vite
+
dependencies:
'@testing-library/dom': 10.4.0
@@ -16496,7 +16631,7 @@ snapshots:
sirv: 3.0.1
tinyrainbow: 2.0.0
- ws: 8.18.0
+ ws: 8.21.0
optionalDependencies:
playwright: 1.50.1
transitivePeerDependencies:
@@ -16504,6 +16639,27 @@ snapshots:
- msw
- utf-8-validate
- vite
+ optional: true
+
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@bcoe/v8-coverage': 1.0.2
+ debug: 4.4.3
+ istanbul-lib-coverage: 3.2.2
+ istanbul-lib-report: 3.0.1
+ istanbul-lib-source-maps: 5.0.6
+ istanbul-reports: 3.2.0
+ magic-string: 0.30.21
+ magicast: 0.3.5
+ std-env: 3.9.0
+ test-exclude: 7.0.1
+ tinyrainbow: 2.0.0
+ optionalDependencies:
+ transitivePeerDependencies:
+ - supports-color
dependencies:
@@ -16525,6 +16681,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/spy': 3.1.1
+ '@vitest/utils': 3.1.1
+ chai: 5.2.0
+ tinyrainbow: 2.0.0
+
'@vitest/[email protected]':
dependencies:
'@vitest/spy': 3.1.2
@@ -16532,6 +16695,15 @@ snapshots:
chai: 5.2.0
tinyrainbow: 2.0.0
+ dependencies:
+ '@vitest/spy': 3.1.1
+ estree-walker: 3.0.3
+ magic-string: 0.30.21
+ optionalDependencies:
+ msw: 2.13.2(@types/[email protected])([email protected])
+
dependencies:
'@vitest/spy': 3.1.2
@@ -16541,25 +16713,50 @@ snapshots:
+ '@vitest/[email protected]':
+ dependencies:
+ tinyrainbow: 2.0.0
+
'@vitest/[email protected]':
dependencies:
tinyrainbow: 2.0.0
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/utils': 3.1.1
+ pathe: 2.0.3
+
'@vitest/[email protected]':
dependencies:
'@vitest/utils': 3.1.2
pathe: 2.0.3
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/pretty-format': 3.1.1
+ magic-string: 0.30.21
+ pathe: 2.0.3
+
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 3.1.2
- magic-string: 0.30.17
+ magic-string: 0.30.21
pathe: 2.0.3
+ '@vitest/[email protected]':
+ dependencies:
+ tinyspy: 3.0.2
+
'@vitest/[email protected]':
dependencies:
tinyspy: 3.0.2
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/pretty-format': 3.1.1
+ loupe: 3.1.3
+ tinyrainbow: 2.0.0
+
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 3.1.2
@@ -18745,8 +18942,8 @@ snapshots:
dependencies:
- '@jridgewell/trace-mapping': 0.3.25
- debug: 4.4.0
+ '@jridgewell/trace-mapping': 0.3.31
+ debug: 4.4.3
istanbul-lib-coverage: 3.2.2
transitivePeerDependencies:
- supports-color
@@ -19027,7 +19224,7 @@ snapshots:
dependencies:
- '@jridgewell/sourcemap-codec': 1.5.0
+ '@jridgewell/sourcemap-codec': 1.5.5
dependencies:
@@ -22100,10 +22297,31 @@ snapshots:
- tsx
- yaml
+ dependencies:
+ cac: 6.7.14
+ debug: 4.4.3
+ es-module-lexer: 1.6.0
+ pathe: 2.0.3
+ transitivePeerDependencies:
+ - '@types/node'
+ - jiti
+ - less
+ - lightningcss
+ - sass
+ - sass-embedded
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+ - tsx
+ - yaml
+
dependencies:
cac: 6.7.14
- debug: 4.4.0
+ debug: 4.4.3
es-module-lexer: 1.6.0
pathe: 2.0.3
@@ -22137,6 +22355,47 @@ snapshots:
tsx: 4.19.3
yaml: 2.9.0
+ dependencies:
+ '@vitest/expect': 3.1.1
+ '@vitest/pretty-format': 3.1.2
+ '@vitest/runner': 3.1.1
+ '@vitest/snapshot': 3.1.1
+ '@vitest/spy': 3.1.1
+ '@vitest/utils': 3.1.1
+ chai: 5.2.0
+ debug: 4.4.3
+ expect-type: 1.2.1
+ magic-string: 0.30.21
+ pathe: 2.0.3
+ std-env: 3.9.0
+ tinybench: 2.9.0
+ tinyexec: 0.3.2
+ tinypool: 1.0.2
+ tinyrainbow: 2.0.0
+ why-is-node-running: 2.3.0
+ optionalDependencies:
+ '@types/debug': 4.1.12
+ '@types/node': 22.13.10
+ jsdom: 20.0.3
+ transitivePeerDependencies:
+ - jiti
+ - less
+ - lightningcss
+ - msw
+ - sass
+ - sass-embedded
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+ - tsx
+ - yaml
+
dependencies:
'@vitest/expect': 3.1.2
diff --git a/scripts/vitest-browser-workspace.ts b/scripts/vitest-browser-workspace.ts
new file mode 100644
index 0000000000..b1b9ccb664
--- /dev/null
+++ b/scripts/vitest-browser-workspace.ts
@@ -0,0 +1,60 @@
+export const browserTestPorts = {
+ builderSettings: 63401,
+ builderFeatures: 63402,
+ builderShared: 63403,
+ builderSharedHeavy: 63404,
+ builderSharedGeneral: 63405,
+ builderCanvasDashboard: 63406,
+ designSystem: 63407,
+ queryBuilderReact: 63408,
+ sdkComponentsAnimation: 63409,
+ sdkComponentsReact: 63410,
+ sdkComponentsReactRadix: 63411,
+ sdkComponentsReactRouter: 63412,
+} as const;
+
+const createBrowserWorkspace = (port: number) => [
+ {
+ extends: "./vitest.config.ts",
+ test: {
+ name: "browser",
+ include: ["**/*.browser.{test,spec}.{ts,tsx}"],
+ browser: {
+ provider: "playwright" as const,
+ enabled: true,
+ headless: true,
+ screenshotFailures: false,
+ api: { port },
+ instances: [{ browser: "chromium" as const }],
+ },
+ },
+ },
+ {
+ extends: "./vitest.config.ts",
+ test: {
+ name: "unit",
+ include: [
+ "!**/*.browser.{test,spec}.{ts,tsx}",
+ "**/*.{test,spec}.{ts,tsx}",
+ ],
+ environment: "node" as const,
+ },
+ },
+];
+
+export const createBrowserTestConfig = (port: number) => ({
+ optimizeDeps: {
+ include: ["react/jsx-dev-runtime"],
+ },
+ resolve: {
+ conditions: ["webstudio", "browser", "development|production"],
+ },
+ ssr: {
+ resolve: {
+ conditions: ["webstudio", "node", "development|production"],
+ },
+ },
+ test: {
+ workspace: createBrowserWorkspace(port),
+ },
+});