luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test(electron): fix cloud test (#4411)

Browse Source
This commit is contained in:
Alex Yang
2023-09-18 21:08:35 -05:00
committed by GitHub
parent 63bd1fbf02
commit 9aafaf865e
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/core/src/pages/workspace/all-page.tsx
View File

@@ -1,5 +1,4 @@
import { useCollectionManager } from '@affine/component/page-list'; import { useCollectionManager } from '@affine/component/page-list';
import { DEFAULT_HELLO_WORLD_PAGE_ID_SUFFIX } from '@affine/env/constant';
import { WorkspaceSubPath } from '@affine/env/workspace'; import { WorkspaceSubPath } from '@affine/env/workspace';
import { assertExists } from '@blocksuite/global/utils'; import { assertExists } from '@blocksuite/global/utils';
import { getActiveBlockSuiteWorkspaceAtom } from '@toeverything/infra/__internal__/workspace'; import { getActiveBlockSuiteWorkspaceAtom } from '@toeverything/infra/__internal__/workspace';
@@ -20,14 +19,12 @@ export const loader: LoaderFunction = async args => {
const workspaceAtom = getActiveBlockSuiteWorkspaceAtom(workspaceId); const workspaceAtom = getActiveBlockSuiteWorkspaceAtom(workspaceId);
const workspace = await rootStore.get(workspaceAtom); const workspace = await rootStore.get(workspaceAtom);
for (const pageId of workspace.pages.keys()) { for (const pageId of workspace.pages.keys()) {
if (pageId.endsWith(DEFAULT_HELLO_WORLD_PAGE_ID_SUFFIX)) { const page = workspace.getPage(pageId);
const page = workspace.getPage(pageId); if (page && page.meta.jumpOnce) {
if (page && page.meta.jumpOnce) { workspace.meta.setPageMeta(page.id, {
workspace.meta.setPageMeta(page.id, { jumpOnce: false,
jumpOnce: false, });
}); return redirect(`/workspace/${workspace.id}/${page.id}`);
return redirect(`/workspace/${workspace.id}/${page.id}`);
}
} }
} }
return null; return null;

6
tests/affine-desktop-cloud/e2e/basic.spec.ts
View File

@@ -7,6 +7,8 @@ import {
import { waitForEditorLoad } from '@affine-test/kit/utils/page-logic'; import { waitForEditorLoad } from '@affine-test/kit/utils/page-logic';
import { createLocalWorkspace } from '@affine-test/kit/utils/workspace'; import { createLocalWorkspace } from '@affine-test/kit/utils/workspace';
process.env.DEV_SERVER_URL = 'http://localhost:8080';
let user: { let user: {
name: string; name: string;
email: string; email: string;
@@ -18,7 +20,9 @@ test.beforeEach(async () => {
}); });
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ page }) => {
await loginUser(page, user.email); await loginUser(page, user.email, {
isElectron: true,
});
}); });
test('new page', async ({ page }) => { test('new page', async ({ page }) => {

7
tests/kit/utils/cloud.ts
View File

@@ -133,12 +133,15 @@ export async function loginUser(
page: Page, page: Page,
userEmail: string, userEmail: string,
config?: { config?: {
isElectron?: boolean;
beforeLogin?: () => Promise<void>; beforeLogin?: () => Promise<void>;
afterLogin?: () => Promise<void>; afterLogin?: () => Promise<void>;
} }
) { ) {
await openHomePage(page); if (config?.isElectron !== true) {
await waitForEditorLoad(page); await openHomePage(page);
await waitForEditorLoad(page);
}
await clickSideBarCurrentWorkspaceBanner(page); await clickSideBarCurrentWorkspaceBanner(page);
await page.getByTestId('cloud-signin-button').click({ await page.getByTestId('cloud-signin-button').click({