From efecce9bf2303f2b0f95ec05ca65b2b01f4a2b2c Mon Sep 17 00:00:00 2001 From: Saul-Mirone Date: Mon, 14 Apr 2025 07:36:56 +0000 Subject: [PATCH] test(editor): enable basic test for cross platform (#11667) --- .github/workflows/build-test.yml | 2 +- .../blocksuite/e2e/{ => cross-platform}/basic.spec.ts | 8 ++++---- .../{ => cross-platform}/inline/inline-editor.spec.ts | 11 ++++++----- tests/blocksuite/e2e/utils/actions/misc.ts | 2 ++ .../automatic-identify-url-text-final.json | 0 .../basic.spec.ts/basic-test-default.json | 0 6 files changed, 13 insertions(+), 10 deletions(-) rename tests/blocksuite/e2e/{ => cross-platform}/basic.spec.ts (98%) rename tests/blocksuite/e2e/{ => cross-platform}/inline/inline-editor.spec.ts (99%) rename tests/blocksuite/snapshots/{ => cross-platform}/basic.spec.ts/automatic-identify-url-text-final.json (100%) rename tests/blocksuite/snapshots/{ => cross-platform}/basic.spec.ts/basic-test-default.json (100%) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index dd4015803..e972ed853 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -248,7 +248,7 @@ jobs: - name: Run playwright tests env: BROWSER: ${{ matrix.browser }} - run: yarn workspace @affine-test/blocksuite test "inline-editor.spec.ts" --forbid-only --shard=${{ matrix.shard }}/${{ strategy.job-total }} + run: yarn workspace @affine-test/blocksuite test "cross-platform/" --forbid-only --shard=${{ matrix.shard }}/${{ strategy.job-total }} - name: Upload test results if: always() diff --git a/tests/blocksuite/e2e/basic.spec.ts b/tests/blocksuite/e2e/cross-platform/basic.spec.ts similarity index 98% rename from tests/blocksuite/e2e/basic.spec.ts rename to tests/blocksuite/e2e/cross-platform/basic.spec.ts index db4d8d80f..56eab3d72 100644 --- a/tests/blocksuite/e2e/basic.spec.ts +++ b/tests/blocksuite/e2e/cross-platform/basic.spec.ts @@ -31,7 +31,7 @@ import { undoByKeyboard, waitDefaultPageLoaded, waitNextFrame, -} from './utils/actions/index.js'; +} from '../utils/actions/index.js'; import { assertBlockChildrenIds, assertEmpty, @@ -39,9 +39,9 @@ import { assertRichTexts, assertText, assertTitle, -} from './utils/asserts.js'; -import { scoped, test } from './utils/playwright.js'; -import { getFormatBar } from './utils/query.js'; +} from '../utils/asserts.js'; +import { scoped, test } from '../utils/playwright.js'; +import { getFormatBar } from '../utils/query.js'; const BASIC_DEFAULT_SNAPSHOT = 'basic test default'; diff --git a/tests/blocksuite/e2e/inline/inline-editor.spec.ts b/tests/blocksuite/e2e/cross-platform/inline/inline-editor.spec.ts similarity index 99% rename from tests/blocksuite/e2e/inline/inline-editor.spec.ts rename to tests/blocksuite/e2e/cross-platform/inline/inline-editor.spec.ts index 907d09db7..090699cee 100644 --- a/tests/blocksuite/e2e/inline/inline-editor.spec.ts +++ b/tests/blocksuite/e2e/cross-platform/inline/inline-editor.spec.ts @@ -2,20 +2,21 @@ import type { InlineEditor, InlineRange } from '@blocksuite/affine/std/inline'; import type { DeltaInsert } from '@blocksuite/affine/store'; import { expect, type Page, test } from '@playwright/test'; -import { press } from '../database/actions.js'; +import { press } from '../../database/actions.js'; import { pressArrowLeft, pressBackspace, pressEnter, type, -} from '../utils/actions/keyboard.js'; +} from '../../utils/actions/keyboard.js'; import { enterPlaygroundRoom, focusRichText, initEmptyParagraphState, -} from '../utils/actions/misc.js'; -import { assertRichTextInlineDeltas } from '../utils/asserts.js'; -import { ZERO_WIDTH_FOR_EMPTY_LINE } from '../utils/inline-editor.js'; +} from '../../utils/actions/misc.js'; +import { assertRichTextInlineDeltas } from '../../utils/asserts.js'; +import { ZERO_WIDTH_FOR_EMPTY_LINE } from '../../utils/inline-editor.js'; + // FIXME(mirone): copy paste from framework/inline/__tests__/utils.ts const defaultPlaygroundURL = new URL( `http://localhost:${process.env.CI ? 4173 : 5173}/` diff --git a/tests/blocksuite/e2e/utils/actions/misc.ts b/tests/blocksuite/e2e/utils/actions/misc.ts index 4b0646209..3a5c3a1d9 100644 --- a/tests/blocksuite/e2e/utils/actions/misc.ts +++ b/tests/blocksuite/e2e/utils/actions/misc.ts @@ -151,6 +151,8 @@ export async function enterPlaygroundRoom( 'Running frontend commit', // Github timeout: 'Failed to load resource: the server responded with a status of 403', + // font download warning: + '[JavaScript Warning: "downloadable font:', ].some(text => message.text().startsWith(text)) ) { return; diff --git a/tests/blocksuite/snapshots/basic.spec.ts/automatic-identify-url-text-final.json b/tests/blocksuite/snapshots/cross-platform/basic.spec.ts/automatic-identify-url-text-final.json similarity index 100% rename from tests/blocksuite/snapshots/basic.spec.ts/automatic-identify-url-text-final.json rename to tests/blocksuite/snapshots/cross-platform/basic.spec.ts/automatic-identify-url-text-final.json diff --git a/tests/blocksuite/snapshots/basic.spec.ts/basic-test-default.json b/tests/blocksuite/snapshots/cross-platform/basic.spec.ts/basic-test-default.json similarity index 100% rename from tests/blocksuite/snapshots/basic.spec.ts/basic-test-default.json rename to tests/blocksuite/snapshots/cross-platform/basic.spec.ts/basic-test-default.json