|
|
@@ -1,6 +1,7 @@
|
|
|
// Keyless browser e2e: the shipped DeepSeek adapter stays mounted while its
|
|
|
-// credential is absent, onboarding routes to the real Models editor, and its
|
|
|
-// write lands in an isolated harness home without a reload or model call.
|
|
|
+// credential is absent, both ordered steps share the shipped modal chrome,
|
|
|
+// and the inline key write lands in an isolated harness home without a reload
|
|
|
+// or model call.
|
|
|
import { randomBytes } from 'node:crypto'
|
|
|
import { readFile } from 'node:fs/promises'
|
|
|
import { fileURLToPath } from 'node:url'
|
|
|
@@ -8,13 +9,17 @@ import { join } from 'node:path'
|
|
|
import type { Browser, Page } from 'playwright'
|
|
|
import { chromium } from 'playwright'
|
|
|
import { afterAll, beforeAll, describe, expect, it, onTestFailed } from 'vitest'
|
|
|
+import { settingsNamespace } from '@deepseek-ai/dsh-settings'
|
|
|
import {
|
|
|
acknowledgeReloadConnectionLoss, assertFixtureInventory, captureStableAria, compareOrRefreshGolden,
|
|
|
launchWebScaffold, watchConsole, webSnapshotMode, type WebScaffold,
|
|
|
+ WELCOME_NOTICE_ACK_FIELD, WELCOME_NOTICE_COPY, WELCOME_NOTICE_SETTINGS_NAMESPACE,
|
|
|
+ WELCOME_NOTICE_VERSION,
|
|
|
} from './scaffold.ts'
|
|
|
import { ZH_BROWSER_LOCALE, connectFreshWorkspaceZh, saveFailureShot } from './support.ts'
|
|
|
|
|
|
const SNAPSHOT_DIR = fileURLToPath(new URL('./snapshots/onboarding-deepseek-config', import.meta.url))
|
|
|
+const WELCOME_EXPECTED = join(SNAPSHOT_DIR, 'welcome.expected.md')
|
|
|
const MISSING_EXPECTED = join(SNAPSHOT_DIR, 'missing.expected.md')
|
|
|
const MODELS_EXPECTED = join(SNAPSHOT_DIR, 'models.expected.md')
|
|
|
const MODE = webSnapshotMode()
|
|
|
@@ -27,7 +32,7 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
const browserConsole: string[] = []
|
|
|
|
|
|
beforeAll(async () => {
|
|
|
- scaffold = await launchWebScaffold({ deepSeekMissingCredential: true })
|
|
|
+ scaffold = await launchWebScaffold({ deepSeekMissingCredential: true, welcomeNoticePending: true })
|
|
|
browser = await chromium.launch()
|
|
|
// The scenario asserts the shipped Chinese copy, so the browser asks for it.
|
|
|
page = await browser.newPage({ viewport: { width: 1440, height: 960 }, locale: ZH_BROWSER_LOCALE })
|
|
|
@@ -44,53 +49,40 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
|
|
|
it('stores a key write-only and observes configured state without restarting', async () => {
|
|
|
onTestFailed(() => saveFailureShot(page, 'web-e2e-onboarding-deepseek-config'))
|
|
|
- const credentialStep = page.getByRole('region', { name: '添加一个 API Key 开始使用' })
|
|
|
- await credentialStep.waitFor({ timeout: 15_000 })
|
|
|
+ const welcome = page.getByRole('dialog', { name: WELCOME_NOTICE_COPY.zh.title })
|
|
|
+ await welcome.waitFor({ timeout: 15_000 })
|
|
|
expect(await page.locator('#root').evaluate(root => (root as HTMLElement).inert)).toBe(true)
|
|
|
+ for (const paragraph of WELCOME_NOTICE_COPY.zh.body.split('\n\n')) {
|
|
|
+ expect(await welcome.getByText(paragraph, { exact: true }).count()).toBe(1)
|
|
|
+ }
|
|
|
+ expect(await welcome.getByRole('button').allTextContents()).toEqual([
|
|
|
+ WELCOME_NOTICE_COPY.zh.continueLabel,
|
|
|
+ ])
|
|
|
+ const welcomeAria = await captureStableAria(page, '[role="dialog"]', scaffold.workspaceCwd)
|
|
|
+ await compareOrRefreshGolden(WELCOME_EXPECTED, welcomeAria, MODE)
|
|
|
+
|
|
|
+ // Observation is not acknowledgement: the exact version is persisted
|
|
|
+ // only by the explicit action, so a reload still presents this dialog.
|
|
|
+ const firstReloadWarnings = tripwire.warnings.length
|
|
|
+ await page.reload({ waitUntil: 'load' })
|
|
|
+ acknowledgeReloadConnectionLoss(tripwire, firstReloadWarnings)
|
|
|
+ await welcome.waitFor({ timeout: 15_000 })
|
|
|
|
|
|
- const mask = page.locator('[class*="onboardingMask"]')
|
|
|
- expect(await mask.count()).toBe(1)
|
|
|
- const maskStyles = await mask.evaluate((mask) => {
|
|
|
- const style = getComputedStyle(mask)
|
|
|
- const rect = mask.getBoundingClientRect()
|
|
|
- return {
|
|
|
- position: style.position,
|
|
|
- left: style.left,
|
|
|
- right: style.right,
|
|
|
- top: style.top,
|
|
|
- bottom: style.bottom,
|
|
|
- background: style.backgroundColor,
|
|
|
- backdropFilter: style.backdropFilter,
|
|
|
- rect: { left: rect.left, top: rect.top, right: rect.right, bottom: rect.bottom },
|
|
|
- }
|
|
|
- })
|
|
|
- expect(maskStyles).toEqual({
|
|
|
- position: 'absolute',
|
|
|
- left: '0px',
|
|
|
- right: '0px',
|
|
|
- top: '80px',
|
|
|
- bottom: '0px',
|
|
|
- background: 'rgba(0, 0, 0, 0.24)',
|
|
|
- backdropFilter: 'blur(2px)',
|
|
|
- rect: { left: 0, top: 80, right: 1440, bottom: 960 },
|
|
|
- })
|
|
|
+ await welcome.getByRole('button', { name: WELCOME_NOTICE_COPY.zh.continueLabel }).click()
|
|
|
+ await welcome.waitFor({ state: 'detached', timeout: 15_000 })
|
|
|
|
|
|
- expect(await credentialStep.getByRole('textbox').count()).toBe(0)
|
|
|
- const initial = await captureStableAria(page, '[role="region"]', scaffold.workspaceCwd)
|
|
|
- await compareOrRefreshGolden(MISSING_EXPECTED, initial, MODE)
|
|
|
-
|
|
|
- await credentialStep.getByRole('button', { name: '前往配置' }).click()
|
|
|
- await credentialStep.waitFor({ state: 'detached', timeout: 15_000 })
|
|
|
- const settings = page.getByRole('dialog', { name: '设置' })
|
|
|
- await settings.waitFor({ timeout: 10_000 })
|
|
|
- expect(await page.locator('#root').evaluate(root => (root as HTMLElement).inert)).toBe(false)
|
|
|
- const keyInput = settings.getByLabel('API 密钥', { exact: true })
|
|
|
+ const credentialStep = page.getByRole('dialog', { name: '添加一个 API Key 开始使用' })
|
|
|
+ await credentialStep.waitFor({ timeout: 15_000 })
|
|
|
+ const keyInput = credentialStep.getByLabel('API 密钥', { exact: true })
|
|
|
await keyInput.waitFor({ timeout: 10_000 })
|
|
|
+ const initial = await captureStableAria(page, '[role="dialog"]', scaffold.workspaceCwd)
|
|
|
+ await compareOrRefreshGolden(MISSING_EXPECTED, initial, MODE)
|
|
|
|
|
|
const secret = `dsh_onboarding_${randomBytes(12).toString('hex')}`
|
|
|
await keyInput.fill(secret)
|
|
|
- await settings.getByRole('button', { name: '保存', exact: true }).click()
|
|
|
- await keyInput.waitFor({ state: 'detached', timeout: 15_000 })
|
|
|
+ await credentialStep.getByRole('button', { name: '保存并继续' }).click()
|
|
|
+ await credentialStep.waitFor({ state: 'detached', timeout: 15_000 })
|
|
|
+ expect(await page.locator('#root').evaluate(root => (root as HTMLElement).inert)).toBe(false)
|
|
|
|
|
|
const stored = await readFile(join(scaffold.harnessHome, '.credentials.yaml'), 'utf8')
|
|
|
expect(stored.includes(`DEEPSEEK_API_KEY: ${secret}`)).toBe(true)
|
|
|
@@ -98,8 +90,15 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
expect((await page.locator('body').ariaSnapshot()).includes(secret)).toBe(false)
|
|
|
expect(browserConsole.some(line => line.includes(secret))).toBe(false)
|
|
|
|
|
|
- // The same open Models surface reuses the refreshed join and exposes the
|
|
|
+ const acknowledgedSettings = await readFile(join(scaffold.harnessHome, 'settings.yaml'), 'utf8')
|
|
|
+ expect(acknowledgedSettings).toContain(`${WELCOME_NOTICE_ACK_FIELD}: ${WELCOME_NOTICE_VERSION}`)
|
|
|
+
|
|
|
+ // The ordinary Models surface reuses the refreshed join and exposes the
|
|
|
// configured write-only placeholder without a reload.
|
|
|
+ await page.getByRole('button', { name: '设置', exact: true }).click()
|
|
|
+ const settings = page.getByRole('dialog', { name: '设置' })
|
|
|
+ await settings.waitFor({ timeout: 10_000 })
|
|
|
+ await settings.getByRole('button', { name: '模型' }).click()
|
|
|
const deepSeekRow = settings.getByText('DeepSeek', { exact: true }).first()
|
|
|
await deepSeekRow.waitFor({ timeout: 10_000 })
|
|
|
await deepSeekRow.locator('xpath=ancestor::li').getByRole('button', { name: '编辑' }).click()
|
|
|
@@ -114,7 +113,21 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
await page.reload({ waitUntil: 'load' })
|
|
|
acknowledgeReloadConnectionLoss(tripwire, secondReloadWarnings)
|
|
|
await page.waitForSelector('[class*="frame"]', { timeout: 15_000 })
|
|
|
- expect(await page.getByRole('region', { name: '添加一个 API Key 开始使用' }).count()).toBe(0)
|
|
|
+ expect(await page.getByRole('dialog', { name: WELCOME_NOTICE_COPY.zh.title }).count()).toBe(0)
|
|
|
+ expect(await page.getByRole('dialog', { name: '添加一个 API Key 开始使用' }).count()).toBe(0)
|
|
|
+
|
|
|
+ // An old acknowledgement means materially revised copy: welcome returns,
|
|
|
+ // while the already-configured provider step remains complete.
|
|
|
+ await scaffold.ctx.settings.mutate(settingsNamespace(WELCOME_NOTICE_SETTINGS_NAMESPACE), [{
|
|
|
+ op: 'set', path: [WELCOME_NOTICE_ACK_FIELD], value: 'previous-copy-version',
|
|
|
+ }])
|
|
|
+ const thirdReloadWarnings = tripwire.warnings.length
|
|
|
+ await page.reload({ waitUntil: 'load' })
|
|
|
+ acknowledgeReloadConnectionLoss(tripwire, thirdReloadWarnings)
|
|
|
+ await welcome.waitFor({ timeout: 15_000 })
|
|
|
+ await welcome.getByRole('button', { name: WELCOME_NOTICE_COPY.zh.continueLabel }).click()
|
|
|
+ await welcome.waitFor({ state: 'detached', timeout: 15_000 })
|
|
|
+ expect(await page.getByRole('dialog', { name: '添加一个 API Key 开始使用' }).count()).toBe(0)
|
|
|
|
|
|
expect((await page.content()).includes(secret)).toBe(false)
|
|
|
expect((await page.locator('body').ariaSnapshot()).includes(secret)).toBe(false)
|
|
|
@@ -125,10 +138,9 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
|
|
|
it('never paints the takeover chrome on a configured reload, even with the settings join held open', async () => {
|
|
|
onTestFailed(() => saveFailureShot(page, 'web-e2e-onboarding-configured-reload'))
|
|
|
- // Regression pin for the reload white flash: the credential step is
|
|
|
- // satisfied (credential configured), yet it must LOAD its
|
|
|
- // private join before it can decide not to show. The chrome lives inside
|
|
|
- // the step (OnboardingSurface), so the deciding window paints and blocks
|
|
|
+ // Regression pin for the reload flash: both steps are satisfied, yet each
|
|
|
+ // must load private facts before deciding not to show. Dialog chrome lives
|
|
|
+ // inside each visible branch, so the deciding window paints and blocks
|
|
|
// nothing. Holding settings.describe widens that window from loopback
|
|
|
// RTT scale to a deterministic hundreds of milliseconds, removing all
|
|
|
// timing dependence from the sampler assertions below.
|
|
|
@@ -141,7 +153,10 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
const sightings: string[] = []
|
|
|
;(window as unknown as { __takeoverSightings: string[] }).__takeoverSightings = sightings
|
|
|
setInterval(() => {
|
|
|
- if (document.querySelector('[class*="onboardingStage"], [class*="onboardingMask"]') !== null) {
|
|
|
+ if (document.querySelector(
|
|
|
+ '[role="dialog"][aria-label="内测声明"], '
|
|
|
+ + '[role="dialog"][aria-label="添加一个 API Key 开始使用"]',
|
|
|
+ ) !== null) {
|
|
|
sightings.push('chrome')
|
|
|
}
|
|
|
if (document.getElementById('root')?.inert === true) sightings.push('inert')
|
|
|
@@ -171,7 +186,8 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
acknowledgeReloadConnectionLoss(tripwire, warningsBefore)
|
|
|
expect(await page.evaluate(() =>
|
|
|
(window as unknown as { __takeoverSightings: string[] }).__takeoverSightings)).toEqual([])
|
|
|
- expect(await page.locator('[class*="onboardingStage"]').count()).toBe(0)
|
|
|
+ expect(await page.getByRole('dialog', { name: WELCOME_NOTICE_COPY.zh.title }).count()).toBe(0)
|
|
|
+ expect(await page.getByRole('dialog', { name: '添加一个 API Key 开始使用' }).count()).toBe(0)
|
|
|
expect(tripwire.pageErrors).toEqual([])
|
|
|
}, 60_000)
|
|
|
|
|
|
@@ -228,7 +244,7 @@ describe.skipIf(MODE === 'record')('web e2e: first-run DeepSeek credential setup
|
|
|
it('keeps the fixture inventory closed', async () => {
|
|
|
await assertFixtureInventory(
|
|
|
SNAPSHOT_DIR,
|
|
|
- ['missing.expected.md', 'models.expected.md'],
|
|
|
+ ['welcome.expected.md', 'missing.expected.md', 'models.expected.md'],
|
|
|
)
|
|
|
})
|
|
|
})
|