There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
test: add mutex to clipboard copy & paste operation to reduce flaky (#11884)
Brooooooklynbfd3c6461594
diff --git a/tests/affine-local/e2e/blocksuite/toolbar.spec.ts b/tests/affine-local/e2e/blocksuite/toolbar.spec.tsindex 8bc0f077a1..569941ca69 100644--- a/tests/affine-local/e2e/blocksuite/toolbar.spec.ts+++ b/tests/affine-local/e2e/blocksuite/toolbar.spec.ts@@ -7,7 +7,6 @@ import {} from '@affine-test/kit/utils/editor';import { importImage } from '@affine-test/kit/utils/image';import {- pasteByKeyboard,selectAllByKeyboard,writeTextToClipboard,} from '@affine-test/kit/utils/keyboard';@@ -253,7 +252,6 @@ test('should show toolbar when inline link is preceded by image or surface-ref',const url = new URL(page.url());await writeTextToClipboard(page, url.toString());- await pasteByKeyboard(page);const toolbar = locateToolbar(page);diff --git a/tests/affine-local/e2e/links.spec.ts b/tests/affine-local/e2e/links.spec.tsindex ae1731d703..b55f56c2fe 100644--- a/tests/affine-local/e2e/links.spec.ts+++ b/tests/affine-local/e2e/links.spec.ts@@ -64,7 +64,6 @@ test('not allowed to switch to embed view when linking to the same document', asconst url0 = new URL(page.url());await writeTextToClipboard(page, url0.toString());- await pasteByKeyboard(page);const { toolbar, switchViewBtn, inlineViewBtn, cardViewBtn, embedViewBtn } =toolbarButtons(page);@@ -296,7 +295,6 @@ test('allow switching to embed view when linking to the other document with modeawait page.keyboard.press('Enter');await writeTextToClipboard(page, url.toString());- await pasteByKeyboard(page);// Inlineawait inlineLink.hover();@@ -516,9 +514,8 @@ test('the viewport should be fit when the linked document is with edgeless mode'// move viewportconst { x, y } = noteBoundingBox;- await page.mouse.click(x - 10, y - 10);+ await page.mouse.click(x - 10, y + 100);await page.keyboard.down('Space');- await page.waitForTimeout(50);await page.mouse.down();await page.mouse.move(x + 1000, y);await page.mouse.up();@@ -538,7 +535,6 @@ test('the viewport should be fit when the linked document is with edgeless mode'await page.keyboard.press('Enter');await writeTextToClipboard(page, url.toString());- await pasteByKeyboard(page);// Inlineawait page.locator('affine-reference').hover();@@ -608,7 +604,7 @@ test('should show edgeless content when switching card view of linked mode doc iawait clickEdgelessModeButton(page);await page.mouse.move(x, y);- await writeTextToClipboard(page, url.toString());+ await writeTextToClipboard(page, url.toString(), false);// Inlineconst embed = page.locator('affine-embed-edgeless-linked-doc-block');@@ -1116,7 +1112,6 @@ test('should show full email address', async ({ page }) => {await page.keyboard.press('Enter');await writeTextToClipboard(page, '[email protected]');- await pasteByKeyboard(page);const inlineLink = page.locator('affine-link');@@ -1140,7 +1135,6 @@ test('should not show view toggle button when protocol of link is not http(s)',await page.keyboard.press('Enter');await writeTextToClipboard(page, 'ftp://affine.pro/blocksuite.pdf');- await pasteByKeyboard(page);const inlineLink = page.locator('affine-link');diff --git a/tests/affine-local/e2e/quick-search.spec.ts b/tests/affine-local/e2e/quick-search.spec.tsindex 7fa16afe17..266e3060e1 100644--- a/tests/affine-local/e2e/quick-search.spec.ts+++ b/tests/affine-local/e2e/quick-search.spec.ts@@ -515,8 +515,6 @@ test('can paste a doc link to create link reference', async ({ page }) => {// paste the urlawait writeTextToClipboard(page, url);- // check the link reference- await page.waitForTimeout(500);await expect(page.locator('affine-reference:has-text("Getting Started")')).toBeVisible();@@ -524,8 +522,6 @@ test('can paste a doc link to create link reference', async ({ page }) => {// can ctrl-z to revert to normal linkawait page.keyboard.press('ControlOrMeta+z');- // check the normal link- await page.waitForTimeout(500);await expect(page.locator(`affine-link:has-text("${url}")`)).toBeVisible();});diff --git a/tests/kit/package.json b/tests/kit/package.jsonindex c9f9dcfba3..4ed926aa03 100644--- a/tests/kit/package.json+++ b/tests/kit/package.json@@ -15,6 +15,7 @@"@blocksuite/affine": "workspace:*","@node-rs/argon2": "^2.0.2","@playwright/test": "=1.51.1",+ "@toeverything/infra": "workspace:*","express": "^5.0.0","http-proxy-middleware": "^3.0.3"},diff --git a/tests/kit/src/utils/keyboard.ts b/tests/kit/src/utils/keyboard.tsindex 0d70d59c83..68025bce68 100644--- a/tests/kit/src/utils/keyboard.ts+++ b/tests/kit/src/utils/keyboard.ts@@ -1,4 +1,5 @@-import type { Page } from '@playwright/test';+import { type Page } from '@playwright/test';+import { AsyncLock } from '@toeverything/infra/utils';const IS_MAC = process.platform === 'darwin';@@ -102,13 +103,18 @@ export async function undoByKeyboard(page: Page) {await keyUpCtrlOrMeta(page);}-export async function writeTextToClipboard(page: Page, text: string) {+const clipboardMutex = new AsyncLock();++export async function writeTextToClipboard(+ page: Page,+ text: string,+ paste = true+) {+ using _release = await clipboardMutex.acquire();// paste the urlawait page.evaluate(async ([text]) => {- const clipData = {- 'text/plain': text,- };+ navigator.clipboard.writeText('');const e = new ClipboardEvent('paste', {clipboardData: new DataTransfer(),});@@ -116,11 +122,14 @@ export async function writeTextToClipboard(page: Page, text: string) {writable: false,value: document,});- Object.entries(clipData).forEach(([key, value]) => {- e.clipboardData?.setData(key, value);- });+ e.clipboardData!.setData('text/plain', text);document.dispatchEvent(e);},[text]);+ if (paste) {+ await keyDownCtrlOrMeta(page);+ await page.keyboard.press('v', { delay: 50 });+ await keyUpCtrlOrMeta(page);+ }}diff --git a/tests/kit/src/utils/page-logic.ts b/tests/kit/src/utils/page-logic.tsindex 68049ed3ee..980efd1af0 100644--- a/tests/kit/src/utils/page-logic.ts+++ b/tests/kit/src/utils/page-logic.ts@@ -60,8 +60,7 @@ export async function type(page: Page, content: string, delay = 50) {}export const createLinkedPage = async (page: Page, pageName?: string) => {- // fixme: workaround for @ popover not showing up when editor is not ready- await page.waitForTimeout(500);+ await waitForEditorLoad(page);await page.keyboard.type('@', { delay: 50 });const linkedPagePopover = page.locator('.linked-doc-popover');await expect(linkedPagePopover).toBeVisible();diff --git a/tests/kit/tsconfig.json b/tests/kit/tsconfig.jsonindex 2486e4116b..a8ed2e9399 100644--- a/tests/kit/tsconfig.json+++ b/tests/kit/tsconfig.json@@ -8,6 +8,7 @@"include": ["./src"],"references": [{ "path": "../../tools/utils" },- { "path": "../../blocksuite/affine/all" }+ { "path": "../../blocksuite/affine/all" },+ { "path": "../../packages/common/infra" }]}diff --git a/tools/cli/src/bundle.ts b/tools/cli/src/bundle.tsindex 7f4d7c5dac..df3194f556 100644--- a/tools/cli/src/bundle.ts+++ b/tools/cli/src/bundle.ts@@ -85,11 +85,12 @@ function getBundleConfigs(pkg: Package) {const IN_CI = !!process.env.CI;const httpProxyMiddlewareLogLevel = IN_CI ? 'silent' : 'error';-const defaultDevServerConfig = {+const defaultDevServerConfig: DevServerConfiguration = {host: '0.0.0.0',allowedHosts: 'all',hot: false,liveReload: true,+ compress: !process.env.CI,client: {overlay: process.env.DISABLE_DEV_OVERLAY === 'true' ? false : undefined,logging: process.env.CI ? 'none' : 'error',@@ -124,7 +125,7 @@ const defaultDevServerConfig = {logLevel: httpProxyMiddlewareLogLevel,},],-} as DevServerConfiguration;+};export class BundleCommand extends PackageCommand {static override paths = [['bundle'], ['webpack'], ['pack'], ['bun']];diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.tsindex 3bda07b306..079bb08274 100644--- a/tools/utils/src/workspace.gen.ts+++ b/tools/utils/src/workspace.gen.ts@@ -1209,7 +1209,11 @@ export const PackageList = [{location: 'tests/kit',name: '@affine-test/kit',- workspaceDependencies: ['tools/utils', 'blocksuite/affine/all'],+ workspaceDependencies: [+ 'tools/utils',+ 'blocksuite/affine/all',+ 'packages/common/infra',+ ],},{location: 'tools/@types/build-config',diff --git a/yarn.lock b/yarn.lockindex 525a638a6d..2b4d9b1d5b 100644--- a/yarn.lock+++ b/yarn.lock@@ -101,6 +101,7 @@ __metadata:"@blocksuite/affine": "workspace:*""@node-rs/argon2": "npm:^2.0.2""@playwright/test": "npm:=1.51.1"+ "@toeverything/infra": "workspace:*"express: "npm:^5.0.0"http-proxy-middleware: "npm:^3.0.3"peerDependencies: