diff --git a/blocksuite/tests-legacy/attachment.spec.ts b/blocksuite/tests-legacy/e2e/attachment.spec.ts similarity index 98% rename from blocksuite/tests-legacy/attachment.spec.ts rename to blocksuite/tests-legacy/e2e/attachment.spec.ts index cb8aab31db..18a8373b79 100644 --- a/blocksuite/tests-legacy/attachment.spec.ts +++ b/blocksuite/tests-legacy/e2e/attachment.spec.ts @@ -3,9 +3,9 @@ import { fileURLToPath } from 'node:url'; import { sleep } from '@blocksuite/global/utils'; import { expect, type Page } from '@playwright/test'; -import { switchEditorMode } from 'utils/actions/edgeless.js'; import { dragBlockToPoint, popImageMoreMenu } from './utils/actions/drag.js'; +import { switchEditorMode } from './utils/actions/edgeless.js'; import { pressArrowDown, pressArrowUp, @@ -43,7 +43,10 @@ import { test } from './utils/playwright.js'; const FILE_NAME = 'test-card-1.png'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const FILE_PATH = path.resolve(__dirname, `../playground/public/${FILE_NAME}`); +const FILE_PATH = path.resolve( + __dirname, + `../../playground/public/${FILE_NAME}` +); function getAttachment(page: Page) { const attachment = page.locator('affine-attachment'); diff --git a/blocksuite/tests-legacy/basic.spec.ts b/blocksuite/tests-legacy/e2e/basic.spec.ts similarity index 100% rename from blocksuite/tests-legacy/basic.spec.ts rename to blocksuite/tests-legacy/e2e/basic.spec.ts diff --git a/blocksuite/tests-legacy/bookmark.spec.ts b/blocksuite/tests-legacy/e2e/bookmark.spec.ts similarity index 99% rename from blocksuite/tests-legacy/bookmark.spec.ts rename to blocksuite/tests-legacy/e2e/bookmark.spec.ts index 2afb77e67d..aebdb444af 100644 --- a/blocksuite/tests-legacy/bookmark.spec.ts +++ b/blocksuite/tests-legacy/e2e/bookmark.spec.ts @@ -3,8 +3,6 @@ import './utils/declare-test-window.js'; import type { BlockSnapshot } from '@blocksuite/store'; import type { Page } from '@playwright/test'; import { expect } from '@playwright/test'; -import { ignoreSnapshotId } from 'utils/ignore.js'; -import { getEmbedCardToolbar } from 'utils/query.js'; import { activeNoteInEdgeless, @@ -42,7 +40,9 @@ import { assertParentBlockFlavour, assertRichTextInlineRange, } from './utils/asserts.js'; +import { ignoreSnapshotId } from './utils/ignore.js'; import { scoped, test } from './utils/playwright.js'; +import { getEmbedCardToolbar } from './utils/query.js'; const LOCAL_HOST_URL = 'http://localhost'; diff --git a/blocksuite/tests-legacy/clipboard/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/clipboard/clipboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/clipboard/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/clipboard/clipboard.spec.ts diff --git a/blocksuite/tests-legacy/clipboard/image.spec.ts b/blocksuite/tests-legacy/e2e/clipboard/image.spec.ts similarity index 100% rename from blocksuite/tests-legacy/clipboard/image.spec.ts rename to blocksuite/tests-legacy/e2e/clipboard/image.spec.ts diff --git a/blocksuite/tests-legacy/clipboard/list.spec.ts b/blocksuite/tests-legacy/e2e/clipboard/list.spec.ts similarity index 100% rename from blocksuite/tests-legacy/clipboard/list.spec.ts rename to blocksuite/tests-legacy/e2e/clipboard/list.spec.ts diff --git a/blocksuite/tests-legacy/clipboard/markdown.spec.ts b/blocksuite/tests-legacy/e2e/clipboard/markdown.spec.ts similarity index 100% rename from blocksuite/tests-legacy/clipboard/markdown.spec.ts rename to blocksuite/tests-legacy/e2e/clipboard/markdown.spec.ts diff --git a/blocksuite/tests-legacy/code/copy-paste.spec.ts b/blocksuite/tests-legacy/e2e/code/copy-paste.spec.ts similarity index 100% rename from blocksuite/tests-legacy/code/copy-paste.spec.ts rename to blocksuite/tests-legacy/e2e/code/copy-paste.spec.ts diff --git a/blocksuite/tests-legacy/code/crud.spec.ts b/blocksuite/tests-legacy/e2e/code/crud.spec.ts similarity index 99% rename from blocksuite/tests-legacy/code/crud.spec.ts rename to blocksuite/tests-legacy/e2e/code/crud.spec.ts index 9669339173..58a71cccc1 100644 --- a/blocksuite/tests-legacy/code/crud.spec.ts +++ b/blocksuite/tests-legacy/e2e/code/crud.spec.ts @@ -1,8 +1,7 @@ import { expect } from '@playwright/test'; -import { dragBetweenIndices } from 'utils/actions/drag.js'; -import { getFormatBar } from 'utils/query.js'; import { updateBlockType } from '../utils/actions/block.js'; +import { dragBetweenIndices } from '../utils/actions/drag.js'; import { createCodeBlock, pressArrowLeft, @@ -32,6 +31,7 @@ import { assertTitle, } from '../utils/asserts.js'; import { test } from '../utils/playwright.js'; +import { getFormatBar } from '../utils/query.js'; import { getCodeBlock } from './utils.js'; test('use debug menu can create code block', async ({ page }) => { diff --git a/blocksuite/tests-legacy/code/readonly.spec.ts b/blocksuite/tests-legacy/e2e/code/readonly.spec.ts similarity index 100% rename from blocksuite/tests-legacy/code/readonly.spec.ts rename to blocksuite/tests-legacy/e2e/code/readonly.spec.ts diff --git a/blocksuite/tests-legacy/code/selections.spec.ts b/blocksuite/tests-legacy/e2e/code/selections.spec.ts similarity index 100% rename from blocksuite/tests-legacy/code/selections.spec.ts rename to blocksuite/tests-legacy/e2e/code/selections.spec.ts diff --git a/blocksuite/tests-legacy/code/utils.ts b/blocksuite/tests-legacy/e2e/code/utils.ts similarity index 100% rename from blocksuite/tests-legacy/code/utils.ts rename to blocksuite/tests-legacy/e2e/code/utils.ts diff --git a/blocksuite/tests-legacy/database/actions.ts b/blocksuite/tests-legacy/e2e/database/actions.ts similarity index 100% rename from blocksuite/tests-legacy/database/actions.ts rename to blocksuite/tests-legacy/e2e/database/actions.ts diff --git a/blocksuite/tests-legacy/database/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/database/clipboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/database/clipboard.spec.ts diff --git a/blocksuite/tests-legacy/database/column.spec.ts b/blocksuite/tests-legacy/e2e/database/column.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/column.spec.ts rename to blocksuite/tests-legacy/e2e/database/column.spec.ts diff --git a/blocksuite/tests-legacy/database/database.spec.ts b/blocksuite/tests-legacy/e2e/database/database.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/database.spec.ts rename to blocksuite/tests-legacy/e2e/database/database.spec.ts diff --git a/blocksuite/tests-legacy/database/selection.spec.ts b/blocksuite/tests-legacy/e2e/database/selection.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/selection.spec.ts rename to blocksuite/tests-legacy/e2e/database/selection.spec.ts diff --git a/blocksuite/tests-legacy/database/sort.spec.ts b/blocksuite/tests-legacy/e2e/database/sort.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/sort.spec.ts rename to blocksuite/tests-legacy/e2e/database/sort.spec.ts diff --git a/blocksuite/tests-legacy/database/statistics.spec.ts b/blocksuite/tests-legacy/e2e/database/statistics.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/statistics.spec.ts rename to blocksuite/tests-legacy/e2e/database/statistics.spec.ts diff --git a/blocksuite/tests-legacy/database/title.spec.ts b/blocksuite/tests-legacy/e2e/database/title.spec.ts similarity index 100% rename from blocksuite/tests-legacy/database/title.spec.ts rename to blocksuite/tests-legacy/e2e/database/title.spec.ts diff --git a/blocksuite/tests-legacy/drag.spec.ts b/blocksuite/tests-legacy/e2e/drag.spec.ts similarity index 100% rename from blocksuite/tests-legacy/drag.spec.ts rename to blocksuite/tests-legacy/e2e/drag.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/align.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/align.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/align.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/align.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/auto-complete.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/auto-complete.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/auto-complete.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/auto-complete.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/auto-connect.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/auto-connect.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/auto-connect.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/auto-connect.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/basic.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/basic.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/basic.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/basic.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/brush.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/brush.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/brush.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/brush.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/clipboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/clipboard.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/color-picker.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/color-picker.spec.ts similarity index 98% rename from blocksuite/tests-legacy/edgeless/color-picker.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/color-picker.spec.ts index 28834bc5e3..d5e1ef210b 100644 --- a/blocksuite/tests-legacy/edgeless/color-picker.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/color-picker.spec.ts @@ -1,16 +1,16 @@ import { expect, type Locator, type Page } from '@playwright/test'; -import { dragBetweenCoords } from 'utils/actions/drag.js'; + +import { dragBetweenCoords } from '../utils/actions/drag.js'; import { addBasicShapeElement, Shape, switchEditorMode, triggerComponentToolbarAction, -} from 'utils/actions/edgeless.js'; +} from '../utils/actions/edgeless.js'; import { enterPlaygroundRoom, initEmptyEdgelessState, -} from 'utils/actions/misc.js'; - +} from '../utils/actions/misc.js'; import { parseStringToRgba } from '../utils/bs-alternative.js'; import { test } from '../utils/playwright.js'; diff --git a/blocksuite/tests-legacy/edgeless/connector/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/connector/clipboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/connector/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/connector/clipboard.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/connector/connector.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/connector/connector.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/connector/connector.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/connector/connector.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/connector/elbow.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/connector/elbow.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/connector/elbow.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/connector/elbow.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/connector/group.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/connector/group.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/connector/group.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/connector/group.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/connector/label.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/connector/label.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/connector/label.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/connector/label.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/edgeless-text.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/edgeless-text.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/element-toolbar.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/element-toolbar.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/element-toolbar.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/element-toolbar.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/eraser.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/eraser.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/eraser.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/eraser.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/frame/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/clipboard.spec.ts similarity index 95% rename from blocksuite/tests-legacy/edgeless/frame/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/clipboard.spec.ts index 929668ae0a..3a3e29046e 100644 --- a/blocksuite/tests-legacy/edgeless/frame/clipboard.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/frame/clipboard.spec.ts @@ -1,5 +1,6 @@ import type { Page } from '@playwright/test'; -import { clickView, moveView } from 'utils/actions/click.js'; + +import { clickView, moveView } from '../../utils/actions/click.js'; import { autoFit, createFrame as _createFrame, @@ -14,15 +15,14 @@ import { shiftClickView, triggerComponentToolbarAction, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; +} from '../../utils/actions/edgeless.js'; import { copyByKeyboard, pasteByKeyboard, pressBackspace, pressEscape, -} from 'utils/actions/keyboard.js'; -import { assertContainerOfElements } from 'utils/asserts.js'; - +} from '../../utils/actions/keyboard.js'; +import { assertContainerOfElements } from '../../utils/asserts.js'; import { test } from '../../utils/playwright.js'; const createFrame = async ( diff --git a/blocksuite/tests-legacy/edgeless/frame/frame-mindmap.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/frame-mindmap.spec.ts similarity index 95% rename from blocksuite/tests-legacy/edgeless/frame/frame-mindmap.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/frame-mindmap.spec.ts index 9c726685e6..68cf9dc62d 100644 --- a/blocksuite/tests-legacy/edgeless/frame/frame-mindmap.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/frame/frame-mindmap.spec.ts @@ -1,5 +1,6 @@ import type { Page } from '@playwright/test'; -import { clickView } from 'utils/actions/click.js'; + +import { clickView } from '../../utils/actions/click.js'; import { createFrame, dragBetweenViewCoords as _dragBetweenViewCoords, @@ -9,11 +10,10 @@ import { toViewCoord, triggerComponentToolbarAction, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; -import { pressEscape } from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; -import { assertContainerOfElements } from 'utils/asserts.js'; - +} from '../../utils/actions/edgeless.js'; +import { pressEscape } from '../../utils/actions/keyboard.js'; +import { waitNextFrame } from '../../utils/actions/misc.js'; +import { assertContainerOfElements } from '../../utils/asserts.js'; import { test } from '../../utils/playwright.js'; const dragBetweenViewCoords = async ( diff --git a/blocksuite/tests-legacy/edgeless/frame/frame-title.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/frame-title.spec.ts similarity index 96% rename from blocksuite/tests-legacy/edgeless/frame/frame-title.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/frame-title.spec.ts index 35b6f2e582..c6127dc34b 100644 --- a/blocksuite/tests-legacy/edgeless/frame/frame-title.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/frame/frame-title.spec.ts @@ -1,4 +1,5 @@ import { expect, type Page } from '@playwright/test'; + import { addNote, autoFit, @@ -8,15 +9,14 @@ import { getFrameTitle, zoomOutByKeyboard, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; +} from '../../utils/actions/edgeless.js'; import { pressBackspace, pressEnter, pressEscape, type, -} from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; - +} from '../../utils/actions/keyboard.js'; +import { waitNextFrame } from '../../utils/actions/misc.js'; import { test } from '../../utils/playwright.js'; const createFrame = async ( diff --git a/blocksuite/tests-legacy/edgeless/frame/frame.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/frame.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/frame/frame.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/frame.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/frame/layer.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/layer.spec.ts similarity index 92% rename from blocksuite/tests-legacy/edgeless/frame/layer.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/layer.spec.ts index 025af14ae2..b5f091bff7 100644 --- a/blocksuite/tests-legacy/edgeless/frame/layer.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/frame/layer.spec.ts @@ -1,4 +1,5 @@ import { expect } from '@playwright/test'; + import { createFrame, createNote, @@ -8,9 +9,11 @@ import { getEdgelessSelectedRectModel, Shape, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; -import { pressEscape, selectAllByKeyboard } from 'utils/actions/keyboard.js'; - +} from '../../utils/actions/edgeless.js'; +import { + pressEscape, + selectAllByKeyboard, +} from '../../utils/actions/keyboard.js'; import { test } from '../../utils/playwright.js'; test.beforeEach(async ({ page }) => { diff --git a/blocksuite/tests-legacy/edgeless/frame/selection.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/frame/selection.spec.ts similarity index 94% rename from blocksuite/tests-legacy/edgeless/frame/selection.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/frame/selection.spec.ts index 626d0acbd7..5a8ab47e37 100644 --- a/blocksuite/tests-legacy/edgeless/frame/selection.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/frame/selection.spec.ts @@ -1,5 +1,6 @@ import { expect, type Page } from '@playwright/test'; -import { click, clickView, dblclickView } from 'utils/actions/click.js'; + +import { click, clickView, dblclickView } from '../../utils/actions/click.js'; import { addNote, autoFit, @@ -13,21 +14,20 @@ import { Shape, toViewCoord, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; +} from '../../utils/actions/edgeless.js'; import { pressBackspace, pressEnter, pressEscape, selectAllByKeyboard, type, -} from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; +} from '../../utils/actions/keyboard.js'; +import { waitNextFrame } from '../../utils/actions/misc.js'; import { assertEdgelessCanvasText, assertRichTexts, assertSelectedBound, -} from 'utils/asserts.js'; - +} from '../../utils/asserts.js'; import { test } from '../../utils/playwright.js'; const createFrame = async ( diff --git a/blocksuite/tests-legacy/edgeless/group/clipboard.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/group/clipboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/group/clipboard.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/group/clipboard.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/group/group-and-ungroup.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/group/group-and-ungroup.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/group/group-and-ungroup.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/group/group-and-ungroup.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/group/group.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/group/group.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/group/group.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/group/group.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/group/release.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/group/release.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/group/release.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/group/release.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/group/title.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/group/title.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/group/title.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/group/title.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/lasso.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/lasso.spec.ts similarity index 99% rename from blocksuite/tests-legacy/edgeless/lasso.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/lasso.spec.ts index d0a7496735..4f19aae0d7 100644 --- a/blocksuite/tests-legacy/edgeless/lasso.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/lasso.spec.ts @@ -254,7 +254,7 @@ test.skip('polygonal lasso should complete selection when clicking the last poin const curController = edgeless.gfx.tool.currentTool$.peek(); if (curController?.toolName !== 'lasso') throw new Error('expected lasso tool controller'); - // eslint-disable-next-line @typescript-eslint/no-explicit-any + return (curController as any)['_isSelecting']; }); diff --git a/blocksuite/tests-legacy/edgeless/linked-doc.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/linked-doc.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/linked-doc.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/linked-doc.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/lock.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/lock.spec.ts similarity index 98% rename from blocksuite/tests-legacy/edgeless/lock.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/lock.spec.ts index 5a0a18f9ee..d35c00c4e1 100644 --- a/blocksuite/tests-legacy/edgeless/lock.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/lock.spec.ts @@ -1,5 +1,6 @@ import { expect, type Page } from '@playwright/test'; -import { clickView, dblclickView, moveView } from 'utils/actions/click.js'; + +import { clickView, dblclickView, moveView } from '../utils/actions/click.js'; import { createBrushElement, createConnectorElement, @@ -16,7 +17,7 @@ import { getSelectedIds, getTypeById, setEdgelessTool, -} from 'utils/actions/edgeless.js'; +} from '../utils/actions/edgeless.js'; import { copyByKeyboard, pasteByKeyboard, @@ -29,15 +30,14 @@ import { SHORT_KEY, type, undoByKeyboard, -} from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; +} from '../utils/actions/keyboard.js'; +import { waitNextFrame } from '../utils/actions/misc.js'; import { assertCanvasElementsCount, assertEdgelessElementBound, assertEdgelessSelectedModelRect, assertRichTexts, -} from 'utils/asserts.js'; - +} from '../utils/asserts.js'; import { test } from '../utils/playwright.js'; test.describe('lock', () => { diff --git a/blocksuite/tests-legacy/edgeless/mindmap.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/mindmap.spec.ts similarity index 92% rename from blocksuite/tests-legacy/edgeless/mindmap.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/mindmap.spec.ts index 83d4d4ae17..2623483245 100644 --- a/blocksuite/tests-legacy/edgeless/mindmap.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/mindmap.spec.ts @@ -1,6 +1,7 @@ import { expect } from '@playwright/test'; -import { clickView } from 'utils/actions/click.js'; -import { dragBetweenCoords } from 'utils/actions/drag.js'; + +import { clickView } from '../utils/actions/click.js'; +import { dragBetweenCoords } from '../utils/actions/drag.js'; import { addBasicRectShapeElement, autoFit, @@ -10,7 +11,7 @@ import { selectElementInEdgeless, waitFontsLoaded, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; +} from '../utils/actions/edgeless.js'; import { pressBackspace, pressEnter, @@ -18,18 +19,17 @@ import { selectAllByKeyboard, type, undoByKeyboard, -} from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; +} from '../utils/actions/keyboard.js'; +import { waitNextFrame } from '../utils/actions/misc.js'; import { assertEdgelessSelectedRect, assertSelectedBound, -} from 'utils/asserts.js'; +} from '../utils/asserts.js'; import { addMindmapNodes, createMindMap, getMindMapNode, -} from 'utils/mindmap.js'; - +} from '../utils/mindmap.js'; import { test } from '../utils/playwright.js'; test('elements should be selectable after open mindmap menu', async ({ @@ -224,17 +224,17 @@ test('drag root node should layout in real time', async ({ page }) => { const { rect: thirdRect } = await getMindMapNode(page, mindmapId, [0, 2]); const assertMindMapNodesPosition = async (deltaX: number, deltaY: number) => { - await expect((await getMindMapNode(page, mindmapId, [0, 0])).rect).toEqual({ + expect((await getMindMapNode(page, mindmapId, [0, 0])).rect).toEqual({ ...firstRect, x: firstRect.x + deltaX, y: firstRect.y + deltaY, }); - await expect((await getMindMapNode(page, mindmapId, [0, 1])).rect).toEqual({ + expect((await getMindMapNode(page, mindmapId, [0, 1])).rect).toEqual({ ...secondRect, x: secondRect.x + deltaX, y: secondRect.y + deltaY, }); - await expect((await getMindMapNode(page, mindmapId, [0, 2])).rect).toEqual({ + expect((await getMindMapNode(page, mindmapId, [0, 2])).rect).toEqual({ ...thirdRect, x: thirdRect.x + deltaX, y: thirdRect.y + deltaY, @@ -359,13 +359,13 @@ test('allow to type content directly when node has been selected', async ({ await type(page, 'child node 2'); await pressEnter(page); - await expect((await getMindMapNode(page, mindmapId, [0, 1])).text).toBe( + expect((await getMindMapNode(page, mindmapId, [0, 1])).text).toBe( 'parent node' ); - await expect((await getMindMapNode(page, mindmapId, [0, 1, 0])).text).toBe( + expect((await getMindMapNode(page, mindmapId, [0, 1, 0])).text).toBe( 'child node 1' ); - await expect((await getMindMapNode(page, mindmapId, [0, 1, 1])).text).toBe( + expect((await getMindMapNode(page, mindmapId, [0, 1, 1])).text).toBe( 'child node 2' ); }); diff --git a/blocksuite/tests-legacy/edgeless/note/drag-handle.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/drag-handle.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/drag-handle.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/drag-handle.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/note/mode.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/mode.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/mode.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/mode.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/note/note.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/note.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/note.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/note.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/note/resize.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/resize.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/resize.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/resize.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/note/scale.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/scale.spec.ts similarity index 94% rename from blocksuite/tests-legacy/edgeless/note/scale.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/scale.spec.ts index 76ec6fc3d9..6f192560a4 100644 --- a/blocksuite/tests-legacy/edgeless/note/scale.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/note/scale.spec.ts @@ -1,4 +1,5 @@ import { expect, type Page } from '@playwright/test'; + import { addNote, locatorScalePanelButton, @@ -6,19 +7,19 @@ import { switchEditorMode, triggerComponentToolbarAction, zoomResetByKeyboard, -} from 'utils/actions/edgeless.js'; +} from '../../utils/actions/edgeless.js'; import { copyByKeyboard, pasteByKeyboard, selectAllByKeyboard, -} from 'utils/actions/keyboard.js'; +} from '../../utils/actions/keyboard.js'; import { enterPlaygroundRoom, initEmptyEdgelessState, waitNextFrame, -} from 'utils/actions/misc.js'; -import { assertRectExist } from 'utils/asserts.js'; -import { test } from 'utils/playwright.js'; +} from '../../utils/actions/misc.js'; +import { assertRectExist } from '../../utils/asserts.js'; +import { test } from '../../utils/playwright.js'; async function setupAndAddNote(page: Page) { await enterPlaygroundRoom(page); diff --git a/blocksuite/tests-legacy/edgeless/note/slicer.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/slicer.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/slicer.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/slicer.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/note/undo-redo.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/note/undo-redo.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/note/undo-redo.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/note/undo-redo.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/pan.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/pan.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/pan.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/pan.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/paste-block.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/paste-block.spec.ts similarity index 99% rename from blocksuite/tests-legacy/edgeless/paste-block.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/paste-block.spec.ts index b2eb418c84..ee4e0e9b5f 100644 --- a/blocksuite/tests-legacy/edgeless/paste-block.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/paste-block.spec.ts @@ -1,4 +1,5 @@ import { expect, type Page } from '@playwright/test'; + import { click, copyByKeyboard, @@ -17,8 +18,7 @@ import { setEdgelessTool, switchEditorMode, type, -} from 'utils/actions/index.js'; - +} from '../utils/actions/index.js'; import { test } from '../utils/playwright.js'; test.describe('pasting blocks', () => { diff --git a/blocksuite/tests-legacy/edgeless/presentation.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/presentation.spec.ts similarity index 98% rename from blocksuite/tests-legacy/edgeless/presentation.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/presentation.spec.ts index 0531f724b4..182cfe05a7 100644 --- a/blocksuite/tests-legacy/edgeless/presentation.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/presentation.spec.ts @@ -1,4 +1,5 @@ import { expect } from '@playwright/test'; + import { assertEdgelessTool, createFrame, @@ -11,15 +12,14 @@ import { setEdgelessTool, Shape, toggleFramePanel, -} from 'utils/actions/edgeless.js'; +} from '../utils/actions/edgeless.js'; import { copyByKeyboard, pasteByKeyboard, pressEscape, selectAllBlocksByKeyboard, -} from 'utils/actions/keyboard.js'; -import { waitNextFrame } from 'utils/actions/misc.js'; - +} from '../utils/actions/keyboard.js'; +import { waitNextFrame } from '../utils/actions/misc.js'; import { test } from '../utils/playwright.js'; test.describe('presentation', () => { diff --git a/blocksuite/tests-legacy/edgeless/reordering.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/reordering.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/reordering.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/reordering.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/resizing.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/resizing.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/resizing.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/resizing.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/rotation.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/rotation.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/rotation.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/rotation.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/selection/connector.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/selection/connector.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/selection/connector.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/selection/connector.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/selection/keyboard.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/selection/keyboard.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/selection/keyboard.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/selection/keyboard.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/selection/selection.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/selection/selection.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/selection/selection.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/selection/selection.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/shape.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/shape.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/shape.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/shape.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/shortcut.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/shortcut.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/shortcut.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/shortcut.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/snap.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/snap.spec.ts similarity index 100% rename from blocksuite/tests-legacy/edgeless/snap.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/snap.spec.ts diff --git a/blocksuite/tests-legacy/edgeless/text.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/text.spec.ts similarity index 99% rename from blocksuite/tests-legacy/edgeless/text.spec.ts rename to blocksuite/tests-legacy/e2e/edgeless/text.spec.ts index 734c263c38..b1d0959b17 100644 --- a/blocksuite/tests-legacy/edgeless/text.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/text.spec.ts @@ -1,5 +1,4 @@ import { expect, type Page } from '@playwright/test'; -import { getLinkedDocPopover } from 'utils/actions/linked-doc.js'; import { assertEdgelessTool, @@ -16,6 +15,7 @@ import { waitNextFrame, zoomResetByKeyboard, } from '../utils/actions/index.js'; +import { getLinkedDocPopover } from '../utils/actions/linked-doc.js'; import { assertEdgelessCanvasText } from '../utils/asserts.js'; import { test } from '../utils/playwright.js'; diff --git a/blocksuite/tests-legacy/embed-synced-doc.spec.ts b/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts similarity index 98% rename from blocksuite/tests-legacy/embed-synced-doc.spec.ts rename to blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts index 92f58dc496..792ccce1e1 100644 --- a/blocksuite/tests-legacy/embed-synced-doc.spec.ts +++ b/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts @@ -1,16 +1,16 @@ import type { DatabaseBlockModel } from '@blocksuite/affine-model'; import { assertExists } from '@blocksuite/global/utils'; import { expect, type Page } from '@playwright/test'; -import { switchEditorMode } from 'utils/actions/edgeless.js'; -import { getLinkedDocPopover } from 'utils/actions/linked-doc.js'; + +import { switchEditorMode } from './utils/actions/edgeless.js'; +import { getLinkedDocPopover } from './utils/actions/linked-doc.js'; import { enterPlaygroundRoom, focusRichText, initEmptyEdgelessState, initEmptyParagraphState, waitNextFrame, -} from 'utils/actions/misc.js'; - +} from './utils/actions/misc.js'; import { test } from './utils/playwright.js'; test.describe('Embed synced doc', () => { diff --git a/blocksuite/tests-legacy/fixtures/smile.png b/blocksuite/tests-legacy/e2e/fixtures/smile.png similarity index 100% rename from blocksuite/tests-legacy/fixtures/smile.png rename to blocksuite/tests-legacy/e2e/fixtures/smile.png diff --git a/blocksuite/tests-legacy/format-bar.spec.ts b/blocksuite/tests-legacy/e2e/format-bar.spec.ts similarity index 100% rename from blocksuite/tests-legacy/format-bar.spec.ts rename to blocksuite/tests-legacy/e2e/format-bar.spec.ts diff --git a/blocksuite/tests-legacy/fragments/frame-panel.spec.ts b/blocksuite/tests-legacy/e2e/fragments/frame-panel.spec.ts similarity index 99% rename from blocksuite/tests-legacy/fragments/frame-panel.spec.ts rename to blocksuite/tests-legacy/e2e/fragments/frame-panel.spec.ts index 451e2e8275..6962bddefd 100644 --- a/blocksuite/tests-legacy/fragments/frame-panel.spec.ts +++ b/blocksuite/tests-legacy/e2e/fragments/frame-panel.spec.ts @@ -1,11 +1,6 @@ import { expect, type Locator, type Page } from '@playwright/test'; -import { dragBetweenCoords } from 'utils/actions/drag.js'; -import { - assertEdgelessNonSelectedRect, - assertEdgelessSelectedRect, - assertZoomLevel, -} from 'utils/asserts.js'; +import { dragBetweenCoords } from '../utils/actions/drag.js'; import { addBasicShapeElement, addNote, @@ -21,6 +16,11 @@ import { toggleFramePanel, } from '../utils/actions/edgeless.js'; import { waitNextFrame } from '../utils/actions/index.js'; +import { + assertEdgelessNonSelectedRect, + assertEdgelessSelectedRect, + assertZoomLevel, +} from '../utils/asserts.js'; import { test } from '../utils/playwright.js'; async function dragFrameCard( diff --git a/blocksuite/tests-legacy/hotkey/bracket.spec.ts b/blocksuite/tests-legacy/e2e/hotkey/bracket.spec.ts similarity index 100% rename from blocksuite/tests-legacy/hotkey/bracket.spec.ts rename to blocksuite/tests-legacy/e2e/hotkey/bracket.spec.ts diff --git a/blocksuite/tests-legacy/hotkey/hotkey.spec.ts b/blocksuite/tests-legacy/e2e/hotkey/hotkey.spec.ts similarity index 100% rename from blocksuite/tests-legacy/hotkey/hotkey.spec.ts rename to blocksuite/tests-legacy/e2e/hotkey/hotkey.spec.ts diff --git a/blocksuite/tests-legacy/hotkey/multiline.spec.ts b/blocksuite/tests-legacy/e2e/hotkey/multiline.spec.ts similarity index 100% rename from blocksuite/tests-legacy/hotkey/multiline.spec.ts rename to blocksuite/tests-legacy/e2e/hotkey/multiline.spec.ts diff --git a/blocksuite/tests-legacy/hotkey/title.spec.ts b/blocksuite/tests-legacy/e2e/hotkey/title.spec.ts similarity index 100% rename from blocksuite/tests-legacy/hotkey/title.spec.ts rename to blocksuite/tests-legacy/e2e/hotkey/title.spec.ts diff --git a/blocksuite/tests-legacy/image/image.spec.ts b/blocksuite/tests-legacy/e2e/image/image.spec.ts similarity index 100% rename from blocksuite/tests-legacy/image/image.spec.ts rename to blocksuite/tests-legacy/e2e/image/image.spec.ts diff --git a/blocksuite/tests-legacy/image/keymap.spec.ts b/blocksuite/tests-legacy/e2e/image/keymap.spec.ts similarity index 100% rename from blocksuite/tests-legacy/image/keymap.spec.ts rename to blocksuite/tests-legacy/e2e/image/keymap.spec.ts diff --git a/blocksuite/tests-legacy/image/load.spec.ts b/blocksuite/tests-legacy/e2e/image/load.spec.ts similarity index 100% rename from blocksuite/tests-legacy/image/load.spec.ts rename to blocksuite/tests-legacy/e2e/image/load.spec.ts diff --git a/blocksuite/tests-legacy/image/menu.spec.ts b/blocksuite/tests-legacy/e2e/image/menu.spec.ts similarity index 100% rename from blocksuite/tests-legacy/image/menu.spec.ts rename to blocksuite/tests-legacy/e2e/image/menu.spec.ts diff --git a/blocksuite/tests-legacy/inline/inline-editor.spec.ts b/blocksuite/tests-legacy/e2e/inline/inline-editor.spec.ts similarity index 100% rename from blocksuite/tests-legacy/inline/inline-editor.spec.ts rename to blocksuite/tests-legacy/e2e/inline/inline-editor.spec.ts diff --git a/blocksuite/tests-legacy/latex/block.spec.ts b/blocksuite/tests-legacy/e2e/latex/block.spec.ts similarity index 100% rename from blocksuite/tests-legacy/latex/block.spec.ts rename to blocksuite/tests-legacy/e2e/latex/block.spec.ts diff --git a/blocksuite/tests-legacy/latex/inline.spec.ts b/blocksuite/tests-legacy/e2e/latex/inline.spec.ts similarity index 99% rename from blocksuite/tests-legacy/latex/inline.spec.ts rename to blocksuite/tests-legacy/e2e/latex/inline.spec.ts index a4a013a46b..f81dbe4eb7 100644 --- a/blocksuite/tests-legacy/latex/inline.spec.ts +++ b/blocksuite/tests-legacy/e2e/latex/inline.spec.ts @@ -1,9 +1,5 @@ import { ZERO_WIDTH_SPACE } from '@blocksuite/inline'; import { expect } from '@playwright/test'; -import { - assertRichTextInlineDeltas, - assertRichTextInlineRange, -} from 'utils/asserts.js'; import { cutByKeyboard, @@ -25,6 +21,10 @@ import { focusRichText, initEmptyParagraphState, } from '../utils/actions/misc.js'; +import { + assertRichTextInlineDeltas, + assertRichTextInlineRange, +} from '../utils/asserts.js'; import { test } from '../utils/playwright.js'; test('add inline latex at the start of line', async ({ page }) => { diff --git a/blocksuite/tests-legacy/link.spec.ts b/blocksuite/tests-legacy/e2e/link.spec.ts similarity index 100% rename from blocksuite/tests-legacy/link.spec.ts rename to blocksuite/tests-legacy/e2e/link.spec.ts diff --git a/blocksuite/tests-legacy/linked-page.spec.ts b/blocksuite/tests-legacy/e2e/linked-page.spec.ts similarity index 99% rename from blocksuite/tests-legacy/linked-page.spec.ts rename to blocksuite/tests-legacy/e2e/linked-page.spec.ts index c0a832085b..1c9ae1a704 100644 --- a/blocksuite/tests-legacy/linked-page.spec.ts +++ b/blocksuite/tests-legacy/e2e/linked-page.spec.ts @@ -1,6 +1,4 @@ import { expect, type Page } from '@playwright/test'; -import { switchEditorMode } from 'utils/actions/edgeless.js'; -import { getLinkedDocPopover } from 'utils/actions/linked-doc.js'; import { addNewPage, @@ -8,6 +6,7 @@ import { switchToPage, } from './utils/actions/click.js'; import { dragBetweenIndices, dragBlockToPoint } from './utils/actions/drag.js'; +import { switchEditorMode } from './utils/actions/edgeless.js'; import { copyByKeyboard, cutByKeyboard, @@ -20,6 +19,7 @@ import { SHORT_KEY, type, } from './utils/actions/keyboard.js'; +import { getLinkedDocPopover } from './utils/actions/linked-doc.js'; import { captureHistory, enterPlaygroundRoom, diff --git a/blocksuite/tests-legacy/list.spec.ts b/blocksuite/tests-legacy/e2e/list.spec.ts similarity index 99% rename from blocksuite/tests-legacy/list.spec.ts rename to blocksuite/tests-legacy/e2e/list.spec.ts index 3a8c3e85ea..e4f2f90e57 100644 --- a/blocksuite/tests-legacy/list.spec.ts +++ b/blocksuite/tests-legacy/e2e/list.spec.ts @@ -1,5 +1,4 @@ import { expect, type Locator } from '@playwright/test'; -import { getFormatBar } from 'utils/query.js'; import { dragBetweenIndices, @@ -39,6 +38,7 @@ import { assertTextContent, } from './utils/asserts.js'; import { test } from './utils/playwright.js'; +import { getFormatBar } from './utils/query.js'; async function isToggleIconVisible(toggleIcon: Locator) { const connected = await toggleIcon.isVisible(); diff --git a/blocksuite/tests-legacy/markdown.spec.ts b/blocksuite/tests-legacy/e2e/markdown.spec.ts similarity index 100% rename from blocksuite/tests-legacy/markdown.spec.ts rename to blocksuite/tests-legacy/e2e/markdown.spec.ts diff --git a/blocksuite/tests-legacy/multiple-editors/edgeless.spec.ts b/blocksuite/tests-legacy/e2e/multiple-editors/edgeless.spec.ts similarity index 100% rename from blocksuite/tests-legacy/multiple-editors/edgeless.spec.ts rename to blocksuite/tests-legacy/e2e/multiple-editors/edgeless.spec.ts diff --git a/blocksuite/tests-legacy/multiple-editors/selection.spec.ts b/blocksuite/tests-legacy/e2e/multiple-editors/selection.spec.ts similarity index 100% rename from blocksuite/tests-legacy/multiple-editors/selection.spec.ts rename to blocksuite/tests-legacy/e2e/multiple-editors/selection.spec.ts diff --git a/blocksuite/tests-legacy/paragraph.spec.ts b/blocksuite/tests-legacy/e2e/paragraph.spec.ts similarity index 100% rename from blocksuite/tests-legacy/paragraph.spec.ts rename to blocksuite/tests-legacy/e2e/paragraph.spec.ts diff --git a/blocksuite/tests-legacy/quote.spec.ts b/blocksuite/tests-legacy/e2e/quote.spec.ts similarity index 100% rename from blocksuite/tests-legacy/quote.spec.ts rename to blocksuite/tests-legacy/e2e/quote.spec.ts diff --git a/blocksuite/tests-legacy/selection/block.spec.ts b/blocksuite/tests-legacy/e2e/selection/block.spec.ts similarity index 100% rename from blocksuite/tests-legacy/selection/block.spec.ts rename to blocksuite/tests-legacy/e2e/selection/block.spec.ts diff --git a/blocksuite/tests-legacy/selection/native.spec.ts b/blocksuite/tests-legacy/e2e/selection/native.spec.ts similarity index 100% rename from blocksuite/tests-legacy/selection/native.spec.ts rename to blocksuite/tests-legacy/e2e/selection/native.spec.ts diff --git a/blocksuite/tests-legacy/slash-menu.spec.ts b/blocksuite/tests-legacy/e2e/slash-menu.spec.ts similarity index 100% rename from blocksuite/tests-legacy/slash-menu.spec.ts rename to blocksuite/tests-legacy/e2e/slash-menu.spec.ts diff --git a/blocksuite/tests-legacy/utils/actions/block.ts b/blocksuite/tests-legacy/e2e/utils/actions/block.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/block.ts rename to blocksuite/tests-legacy/e2e/utils/actions/block.ts diff --git a/blocksuite/tests-legacy/utils/actions/click.ts b/blocksuite/tests-legacy/e2e/utils/actions/click.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/click.ts rename to blocksuite/tests-legacy/e2e/utils/actions/click.ts diff --git a/blocksuite/tests-legacy/utils/actions/drag.ts b/blocksuite/tests-legacy/e2e/utils/actions/drag.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/drag.ts rename to blocksuite/tests-legacy/e2e/utils/actions/drag.ts diff --git a/blocksuite/tests-legacy/utils/actions/edgeless.ts b/blocksuite/tests-legacy/e2e/utils/actions/edgeless.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/edgeless.ts rename to blocksuite/tests-legacy/e2e/utils/actions/edgeless.ts diff --git a/blocksuite/tests-legacy/utils/actions/index.ts b/blocksuite/tests-legacy/e2e/utils/actions/index.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/index.ts rename to blocksuite/tests-legacy/e2e/utils/actions/index.ts diff --git a/blocksuite/tests-legacy/utils/actions/keyboard.ts b/blocksuite/tests-legacy/e2e/utils/actions/keyboard.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/keyboard.ts rename to blocksuite/tests-legacy/e2e/utils/actions/keyboard.ts diff --git a/blocksuite/tests-legacy/utils/actions/linked-doc.ts b/blocksuite/tests-legacy/e2e/utils/actions/linked-doc.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/linked-doc.ts rename to blocksuite/tests-legacy/e2e/utils/actions/linked-doc.ts diff --git a/blocksuite/tests-legacy/utils/actions/misc.ts b/blocksuite/tests-legacy/e2e/utils/actions/misc.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/misc.ts rename to blocksuite/tests-legacy/e2e/utils/actions/misc.ts diff --git a/blocksuite/tests-legacy/utils/actions/selection.ts b/blocksuite/tests-legacy/e2e/utils/actions/selection.ts similarity index 100% rename from blocksuite/tests-legacy/utils/actions/selection.ts rename to blocksuite/tests-legacy/e2e/utils/actions/selection.ts diff --git a/blocksuite/tests-legacy/utils/asserts.ts b/blocksuite/tests-legacy/e2e/utils/asserts.ts similarity index 100% rename from blocksuite/tests-legacy/utils/asserts.ts rename to blocksuite/tests-legacy/e2e/utils/asserts.ts diff --git a/blocksuite/tests-legacy/utils/bs-alternative.ts b/blocksuite/tests-legacy/e2e/utils/bs-alternative.ts similarity index 100% rename from blocksuite/tests-legacy/utils/bs-alternative.ts rename to blocksuite/tests-legacy/e2e/utils/bs-alternative.ts diff --git a/blocksuite/tests-legacy/utils/declare-test-window.ts b/blocksuite/tests-legacy/e2e/utils/declare-test-window.ts similarity index 100% rename from blocksuite/tests-legacy/utils/declare-test-window.ts rename to blocksuite/tests-legacy/e2e/utils/declare-test-window.ts diff --git a/blocksuite/tests-legacy/utils/ignore.ts b/blocksuite/tests-legacy/e2e/utils/ignore.ts similarity index 100% rename from blocksuite/tests-legacy/utils/ignore.ts rename to blocksuite/tests-legacy/e2e/utils/ignore.ts diff --git a/blocksuite/tests-legacy/utils/inline-editor.ts b/blocksuite/tests-legacy/e2e/utils/inline-editor.ts similarity index 90% rename from blocksuite/tests-legacy/utils/inline-editor.ts rename to blocksuite/tests-legacy/e2e/utils/inline-editor.ts index 0558b256fb..c03aae6f84 100644 --- a/blocksuite/tests-legacy/utils/inline-editor.ts +++ b/blocksuite/tests-legacy/e2e/utils/inline-editor.ts @@ -17,7 +17,6 @@ export async function getStringFromRichText( throw new Error('Cannot find rich-text'); } - // eslint-disable-next-line @typescript-eslint/no-explicit-any const editor = (richTexts[index] as any).inlineEditor; return editor.yText.toString(); }, diff --git a/blocksuite/tests-legacy/utils/mindmap.ts b/blocksuite/tests-legacy/e2e/utils/mindmap.ts similarity index 100% rename from blocksuite/tests-legacy/utils/mindmap.ts rename to blocksuite/tests-legacy/e2e/utils/mindmap.ts diff --git a/blocksuite/tests-legacy/utils/multiple-editor.ts b/blocksuite/tests-legacy/e2e/utils/multiple-editor.ts similarity index 100% rename from blocksuite/tests-legacy/utils/multiple-editor.ts rename to blocksuite/tests-legacy/e2e/utils/multiple-editor.ts diff --git a/blocksuite/tests-legacy/utils/playwright.ts b/blocksuite/tests-legacy/e2e/utils/playwright.ts similarity index 100% rename from blocksuite/tests-legacy/utils/playwright.ts rename to blocksuite/tests-legacy/e2e/utils/playwright.ts diff --git a/blocksuite/tests-legacy/utils/query.ts b/blocksuite/tests-legacy/e2e/utils/query.ts similarity index 100% rename from blocksuite/tests-legacy/utils/query.ts rename to blocksuite/tests-legacy/e2e/utils/query.ts diff --git a/blocksuite/tests-legacy/worker.spec.ts b/blocksuite/tests-legacy/e2e/worker.spec.ts similarity index 100% rename from blocksuite/tests-legacy/worker.spec.ts rename to blocksuite/tests-legacy/e2e/worker.spec.ts diff --git a/blocksuite/tests-legacy/zero-width.spec.ts b/blocksuite/tests-legacy/e2e/zero-width.spec.ts similarity index 100% rename from blocksuite/tests-legacy/zero-width.spec.ts rename to blocksuite/tests-legacy/e2e/zero-width.spec.ts diff --git a/blocksuite/tests-legacy/playwright.config.ts b/blocksuite/tests-legacy/playwright.config.ts index 8b8819ef72..f0a6fc8a84 100644 --- a/blocksuite/tests-legacy/playwright.config.ts +++ b/blocksuite/tests-legacy/playwright.config.ts @@ -5,7 +5,7 @@ import type { PlaywrightWorkerOptions } from '@playwright/test'; import { defineConfig } from '@playwright/test'; export default defineConfig({ - testDir: '.', + testDir: './e2e', outputDir: testResultDir, timeout: process.env.CI ? 40000 : 999999, fullyParallel: true, diff --git a/blocksuite/tests-legacy/tsconfig.json b/blocksuite/tests-legacy/tsconfig.json index 7792d712c4..56f4223ff4 100644 --- a/blocksuite/tests-legacy/tsconfig.json +++ b/blocksuite/tests-legacy/tsconfig.json @@ -1,11 +1,11 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "baseUrl": ".", - "outDir": "./dist" + "rootDir": "./e2e", + "outDir": "./dist", + "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo" }, - "include": ["**.spec.ts", "**.test.ts", "**/**.ts"], - "exclude": ["dist"], + "include": ["./e2e"], "references": [ { "path": "../affine/components" }, { "path": "../affine/model" },