@@ -84,6 +84,7 @@ const WorkbenchTab = ({
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={workbench.id}
|
key={workbench.id}
|
||||||
|
data-testid="workbench-tab"
|
||||||
data-active={tabActive}
|
data-active={tabActive}
|
||||||
data-pinned={workbench.pinned}
|
data-pinned={workbench.pinned}
|
||||||
className={styles.tab}
|
className={styles.tab}
|
||||||
@@ -93,6 +94,7 @@ const WorkbenchTab = ({
|
|||||||
<Fragment key={view.id}>
|
<Fragment key={view.id}>
|
||||||
<button
|
<button
|
||||||
key={view.id}
|
key={view.id}
|
||||||
|
data-testid="split-view-label"
|
||||||
className={styles.splitViewLabel}
|
className={styles.splitViewLabel}
|
||||||
data-active={activeViewIndex === viewIdx && tabActive}
|
data-active={activeViewIndex === viewIdx && tabActive}
|
||||||
onContextMenu={() => {
|
onContextMenu={() => {
|
||||||
@@ -125,7 +127,11 @@ const WorkbenchTab = ({
|
|||||||
})}
|
})}
|
||||||
{!workbench.pinned && tabsLength > 1 ? (
|
{!workbench.pinned && tabsLength > 1 ? (
|
||||||
<div className={styles.tabCloseButtonWrapper}>
|
<div className={styles.tabCloseButtonWrapper}>
|
||||||
<button className={styles.tabCloseButton} onClick={onCloseTab}>
|
<button
|
||||||
|
data-testid="close-tab-button"
|
||||||
|
className={styles.tabCloseButton}
|
||||||
|
onClick={onCloseTab}
|
||||||
|
>
|
||||||
<CloseIcon />
|
<CloseIcon />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -214,7 +220,7 @@ export const AppTabsHeader = ({
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
<IconButton onClick={onAddTab}>
|
<IconButton onClick={onAddTab} data-testid="add-tab-view-button">
|
||||||
<PlusIcon />
|
<PlusIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ export const SplitViewMenuIndicator = memo(
|
|||||||
<div
|
<div
|
||||||
ref={ref}
|
ref={ref}
|
||||||
data-active={active}
|
data-active={active}
|
||||||
|
data-testid="split-view-indicator"
|
||||||
className={clsx(className, styles.indicator)}
|
className={clsx(className, styles.indicator)}
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
onMouseDown={onMouseDown}
|
onMouseDown={onMouseDown}
|
||||||
|
|||||||
@@ -710,7 +710,7 @@ export class WebContentViewsManager {
|
|||||||
view.webContents.on('did-finish-load', () => {
|
view.webContents.on('did-finish-load', () => {
|
||||||
unsub = helperProcessManager.connectRenderer(view.webContents);
|
unsub = helperProcessManager.connectRenderer(view.webContents);
|
||||||
});
|
});
|
||||||
view.webContents.on('did-start-loading', () => {
|
view.webContents.on('will-navigate', () => {
|
||||||
// means the view is reloaded
|
// means the view is reloaded
|
||||||
this.appTabsUIReady$.next(
|
this.appTabsUIReady$.next(
|
||||||
new Set([...this.appTabsUIReady$.value].filter(key => key !== viewId))
|
new Set([...this.appTabsUIReady$.value].filter(key => key !== viewId))
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { test } from '@affine-test/kit/electron';
|
import { test } from '@affine-test/kit/electron';
|
||||||
import {
|
import {
|
||||||
clickNewPageButton,
|
clickNewPageButton,
|
||||||
createLinkedPage,
|
|
||||||
getBlockSuiteEditorTitle,
|
getBlockSuiteEditorTitle,
|
||||||
} from '@affine-test/kit/utils/page-logic';
|
} from '@affine-test/kit/utils/page-logic';
|
||||||
import {
|
import {
|
||||||
@@ -143,42 +142,3 @@ test('delete workspace', async ({ page }) => {
|
|||||||
'Demo Workspace'
|
'Demo Workspace'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// temporary way to enable split view
|
|
||||||
async function enableSplitView(page: Page) {
|
|
||||||
await page.evaluate(() => {
|
|
||||||
const settingKey = 'affine-settings';
|
|
||||||
window.localStorage.setItem(
|
|
||||||
settingKey,
|
|
||||||
JSON.stringify({
|
|
||||||
clientBorder: false,
|
|
||||||
fullWidthLayout: false,
|
|
||||||
windowFrameStyle: 'frameless',
|
|
||||||
fontStyle: 'Serif',
|
|
||||||
dateFormat: 'MM/dd/YYYY',
|
|
||||||
startWeekOnMonday: false,
|
|
||||||
enableBlurBackground: true,
|
|
||||||
enableNoisyBackground: true,
|
|
||||||
autoCheckUpdate: true,
|
|
||||||
autoDownloadUpdate: true,
|
|
||||||
enableMultiView: true,
|
|
||||||
editorFlags: {},
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
await page.reload();
|
|
||||||
}
|
|
||||||
|
|
||||||
test('open split view', async ({ page }) => {
|
|
||||||
await enableSplitView(page);
|
|
||||||
await clickNewPageButton(page);
|
|
||||||
await page.waitForTimeout(500);
|
|
||||||
await page.keyboard.press('Enter');
|
|
||||||
await createLinkedPage(page, 'hi from another page');
|
|
||||||
await page
|
|
||||||
.locator('.affine-reference-title:has-text("hi from another page")')
|
|
||||||
.click({
|
|
||||||
modifiers: ['ControlOrMeta', 'Alt'],
|
|
||||||
});
|
|
||||||
await expect(page.locator('.doc-title-container')).toHaveCount(2);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import os from 'node:os';
|
|||||||
import { test } from '@affine-test/kit/electron';
|
import { test } from '@affine-test/kit/electron';
|
||||||
import { shouldCallIpcRendererHandler } from '@affine-test/kit/utils/ipc';
|
import { shouldCallIpcRendererHandler } from '@affine-test/kit/utils/ipc';
|
||||||
|
|
||||||
test.describe('behavior test', () => {
|
test.describe.skip('behavior test', () => {
|
||||||
if (os.platform() === 'darwin') {
|
if (os.platform() === 'darwin') {
|
||||||
test('system button should hidden correctly', async ({
|
test('system button should hidden correctly', async ({
|
||||||
page,
|
page,
|
||||||
|
|||||||
190
tests/affine-desktop/e2e/tabs.spec.ts
Normal file
190
tests/affine-desktop/e2e/tabs.spec.ts
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
import { test } from '@affine-test/kit/electron';
|
||||||
|
import {
|
||||||
|
clickNewPageButton,
|
||||||
|
createLinkedPage,
|
||||||
|
} from '@affine-test/kit/utils/page-logic';
|
||||||
|
import { expect, type Page } from '@playwright/test';
|
||||||
|
|
||||||
|
test('create new tab', async ({ views }) => {
|
||||||
|
let page = await views.getActive();
|
||||||
|
|
||||||
|
await page.getByTestId('add-tab-view-button').click();
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toHaveCount(2);
|
||||||
|
// new tab title should be All docs
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(1)).toContainText(
|
||||||
|
'All docs'
|
||||||
|
);
|
||||||
|
page = await views.getActive();
|
||||||
|
// page content should be at all docs page
|
||||||
|
await expect(page.getByTestId('virtualized-page-list')).toContainText(
|
||||||
|
'All Docs'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('can switch & close tab by clicking', async ({ page }) => {
|
||||||
|
await page.getByTestId('add-tab-view-button').click();
|
||||||
|
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(1)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
// switch to the previous tab by clicking on it
|
||||||
|
await page.getByTestId('workbench-tab').nth(0).click();
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(0)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
|
||||||
|
// switch to the next tab by clicking on it
|
||||||
|
await page.getByTestId('workbench-tab').nth(1).click();
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(1)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
|
||||||
|
// close the current tab
|
||||||
|
await page
|
||||||
|
.getByTestId('workbench-tab')
|
||||||
|
.nth(1)
|
||||||
|
.getByTestId('close-tab-button')
|
||||||
|
.click();
|
||||||
|
|
||||||
|
// the first tab should be active
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(0)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('can switch tab by CTRL+number', async ({ page }) => {
|
||||||
|
test.fixme(); // the shortcut can be only captured by the main process
|
||||||
|
await page.keyboard.down('ControlOrMeta+T');
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toHaveCount(2);
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(1)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
// switch to the previous tab by pressing CTRL+1
|
||||||
|
await page.locator('body').press('ControlOrMeta+1');
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(0)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
// switch to the next tab by pressing CTRL+2
|
||||||
|
await page.locator('body').press('ControlOrMeta+2');
|
||||||
|
await expect(page.getByTestId('workbench-tab').nth(1)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Collapse Sidebar', async ({ page }) => {
|
||||||
|
await page
|
||||||
|
.locator('[data-testid=app-sidebar-arrow-button-collapse][data-show=true]')
|
||||||
|
.click();
|
||||||
|
const sliderBarArea = page.getByTestId('app-sidebar');
|
||||||
|
await expect(sliderBarArea).not.toBeInViewport();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Expand Sidebar', async ({ page }) => {
|
||||||
|
await page
|
||||||
|
.locator('[data-testid=app-sidebar-arrow-button-collapse][data-show=true]')
|
||||||
|
.click();
|
||||||
|
const sliderBarArea = page.getByTestId('sliderBar-inner');
|
||||||
|
await expect(sliderBarArea).not.toBeInViewport();
|
||||||
|
|
||||||
|
await page
|
||||||
|
.locator('[data-testid=app-sidebar-arrow-button-expand][data-show=true]')
|
||||||
|
.click();
|
||||||
|
await expect(sliderBarArea).toBeInViewport();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('tab title will change when navigating', async ({ page }) => {
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toContainText(
|
||||||
|
'Write, Draw, Plan all at Once'
|
||||||
|
);
|
||||||
|
|
||||||
|
// create new page
|
||||||
|
await clickNewPageButton(page);
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toContainText('Untitled');
|
||||||
|
|
||||||
|
// go to all page
|
||||||
|
await page.getByTestId('all-pages').click();
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toContainText('All docs');
|
||||||
|
|
||||||
|
// go to today's journal
|
||||||
|
await page.getByTestId('slider-bar-journals-button').click();
|
||||||
|
await expect(page.locator('.doc-title-container')).toContainText('Today');
|
||||||
|
const dateString = await page
|
||||||
|
.locator('.doc-title-container > span:first-of-type')
|
||||||
|
.textContent();
|
||||||
|
|
||||||
|
if (dateString) {
|
||||||
|
await expect(page.getByTestId('workbench-tab')).toContainText(dateString);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// temporary way to enable split view
|
||||||
|
async function enableSplitView(page: Page) {
|
||||||
|
await page.evaluate(() => {
|
||||||
|
const settingKey = 'affine-settings';
|
||||||
|
window.localStorage.setItem(
|
||||||
|
settingKey,
|
||||||
|
JSON.stringify({
|
||||||
|
clientBorder: false,
|
||||||
|
fullWidthLayout: false,
|
||||||
|
windowFrameStyle: 'frameless',
|
||||||
|
fontStyle: 'Serif',
|
||||||
|
dateFormat: 'MM/dd/YYYY',
|
||||||
|
startWeekOnMonday: false,
|
||||||
|
enableBlurBackground: true,
|
||||||
|
enableNoisyBackground: true,
|
||||||
|
autoCheckUpdate: true,
|
||||||
|
autoDownloadUpdate: true,
|
||||||
|
enableMultiView: true,
|
||||||
|
editorFlags: {},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
await page.reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
test('open split view', async ({ page }) => {
|
||||||
|
await enableSplitView(page);
|
||||||
|
await clickNewPageButton(page);
|
||||||
|
await page.waitForTimeout(500);
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
await createLinkedPage(page, 'hi from another page');
|
||||||
|
await page
|
||||||
|
.locator('.affine-reference-title:has-text("hi from another page")')
|
||||||
|
.click({
|
||||||
|
modifiers: ['ControlOrMeta', 'Alt'],
|
||||||
|
});
|
||||||
|
await expect(page.locator('.doc-title-container')).toHaveCount(2);
|
||||||
|
|
||||||
|
// check tab title
|
||||||
|
await expect(page.getByTestId('split-view-label')).toHaveCount(2);
|
||||||
|
await expect(page.getByTestId('split-view-label').nth(0)).toContainText(
|
||||||
|
'Untitled'
|
||||||
|
);
|
||||||
|
await expect(page.getByTestId('split-view-label').nth(1)).toContainText(
|
||||||
|
'hi from another page'
|
||||||
|
);
|
||||||
|
|
||||||
|
// the second split view should be active
|
||||||
|
await expect(page.getByTestId('split-view-label').nth(1)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
|
||||||
|
// by clicking the first split view label, the first split view should be active
|
||||||
|
await page.getByTestId('split-view-label').nth(0).click();
|
||||||
|
await expect(page.getByTestId('split-view-label').nth(0)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
await expect(page.getByTestId('split-view-indicator').nth(0)).toHaveAttribute(
|
||||||
|
'data-active',
|
||||||
|
'true'
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -47,6 +47,9 @@ export const test = base.extend<{
|
|||||||
appData: string;
|
appData: string;
|
||||||
sessionData: string;
|
sessionData: string;
|
||||||
};
|
};
|
||||||
|
views: {
|
||||||
|
getActive: () => Promise<Page>;
|
||||||
|
};
|
||||||
router: {
|
router: {
|
||||||
goto: (path: RoutePath) => Promise<void>;
|
goto: (path: RoutePath) => Promise<void>;
|
||||||
};
|
};
|
||||||
@@ -88,6 +91,15 @@ export const test = base.extend<{
|
|||||||
|
|
||||||
await use(page as Page);
|
await use(page as Page);
|
||||||
},
|
},
|
||||||
|
views: async ({ electronApp, page }, use) => {
|
||||||
|
void page; // makes sure page is a dependency
|
||||||
|
await use({
|
||||||
|
getActive: async () => {
|
||||||
|
const view = await getActivePage(electronApp.windows());
|
||||||
|
return view || page;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
// eslint-disable-next-line no-empty-pattern
|
// eslint-disable-next-line no-empty-pattern
|
||||||
electronApp: async ({}, use) => {
|
electronApp: async ({}, use) => {
|
||||||
try {
|
try {
|
||||||
@@ -150,8 +162,3 @@ export const test = base.extend<{
|
|||||||
await use(appInfo);
|
await use(appInfo);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// eslint-disable-next-line no-empty-pattern
|
|
||||||
test.afterEach(({}, testInfo) => {
|
|
||||||
console.log('cleaning up for ' + testInfo);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// TODO(@pengx17): remove
|
||||||
|
|
||||||
import type { affine } from '@affine/electron-api';
|
import type { affine } from '@affine/electron-api';
|
||||||
// Credit: https://github.com/spaceagetv/electron-playwright-helpers/blob/main/src/ipc_helpers.ts
|
// Credit: https://github.com/spaceagetv/electron-playwright-helpers/blob/main/src/ipc_helpers.ts
|
||||||
import type { Page } from '@playwright/test';
|
import type { Page } from '@playwright/test';
|
||||||
|
|||||||
Reference in New Issue
Block a user