U2 Task 6 fix round 1 (review minors 1 to 9). - R-6: `Dialog` takes `veilCloses`; the annotation dialog passes false, so its veil ignores clicks centred too. Other dialogs unchanged. - Save merges each name on its own (an EN refreshed meanwhile survives an FR-only edit); the merged annotation is typed per kind, no cast. - Tests: the category change and the region row really run (a second category and a region in the fixture); EN kept under an FR edit; focus to the drawing when a filter hides the row; a centred veil ignores a click; act() around the store write; ui.Dialog restores innerHeight and visualViewport after each test. - e2e: `pickAnnotation` no longer scrolls; `scrollToTop` is explicit where a low row leaves the drawing out of view (editor-zones x3, editor-geometry). editor-geometry runs the accepted repair from the page's end, buttons pressed in place, scroll unchanged. The touch and double-click tests wait on the clicks themselves; the stray click on the veil can fail. - CreationPanel's `required.fields` recorded as a shortcut for Task 7; TODO lines updated. focusTarget comment wrapped.
291 lines
10 KiB
TypeScript
291 lines
10 KiB
TypeScript
import { fr } from '@/i18n/fr'
|
|
import type { CDPSession, Page, TestInfo } from '@playwright/test'
|
|
import { expect, expectAccessible, test } from '../support/browser'
|
|
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
|
|
import {
|
|
clientOf,
|
|
editorActor,
|
|
openEditor,
|
|
openProperties,
|
|
pickAnnotation,
|
|
pointOf,
|
|
seedDraft,
|
|
selectionTag,
|
|
shapeWith,
|
|
shownPoints,
|
|
toolButton,
|
|
} from '../support/editor'
|
|
import { expectNoShift, keepNativeFrames } from '../support/layout'
|
|
|
|
// U2 Task 6 (A1, A2, A3, R-6, R-14, Review Focus 3 and 5): the properties dialog over the
|
|
// right column, never over the drawing; opened by « Propriétés », a second click or a
|
|
// double click; a typed form survives a Back question and a width crossing.
|
|
|
|
const dict = fr
|
|
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
|
|
|
|
const POINT = 'Pt Alpha'
|
|
const ZONE = 'Zone Beta'
|
|
const zone = {
|
|
...pointOf('zone-b', 'main', { cx: 0, cy: 0, r: 1 }, ZONE),
|
|
kind: 'zone',
|
|
geometry: {
|
|
type: 'polygon',
|
|
points: [
|
|
[100, 100],
|
|
[400, 100],
|
|
[400, 400],
|
|
[100, 400],
|
|
],
|
|
},
|
|
}
|
|
|
|
async function open(page: Page, width = 1280) {
|
|
await page.setViewportSize({ width, height: 800 })
|
|
const actor = await editorActor('fr')
|
|
const seed = await seedDraft(actor, {
|
|
shape: shapeWith(
|
|
pointOf('pt-a', 'main', { cx: 700, cy: 250, r: 30 }, POINT),
|
|
zone,
|
|
),
|
|
})
|
|
await openEditor(page, dict, actor, seed.sheetId)
|
|
await expect(toolButton(page, dict, 'point')).toBeEnabled()
|
|
return actor
|
|
}
|
|
|
|
const strip = (page: Page) => page.getByTestId('edit-strip')
|
|
const dialog = (page: Page) => page.getByRole('dialog')
|
|
const box = async (page: Page, selector: string) =>
|
|
(await page.locator(selector).locator('visible=true').first().boundingBox())!
|
|
|
|
/**
|
|
* Counts the clicks and double clicks the document receives, from now on, in the capture
|
|
* phase before any other listener: a wait on the click itself, never on a delay.
|
|
*/
|
|
async function countClicks(page: Page) {
|
|
await page.evaluate(() => {
|
|
const scope = window as unknown as { __clicks: Record<string, number> }
|
|
scope.__clicks = { click: 0, dblclick: 0 }
|
|
for (const type of ['click', 'dblclick'])
|
|
document.addEventListener(type, () => (scope.__clicks[type] += 1), true)
|
|
})
|
|
return (type: 'click' | 'dblclick') =>
|
|
page.evaluate(
|
|
(kind) =>
|
|
(window as unknown as { __clicks: Record<string, number> }).__clicks[
|
|
kind
|
|
],
|
|
type,
|
|
)
|
|
}
|
|
|
|
type TouchPoint = { x: number; y: number }
|
|
const touch = (
|
|
cdp: CDPSession,
|
|
type: 'touchStart' | 'touchEnd',
|
|
points: TouchPoint[],
|
|
) =>
|
|
cdp.send('Input.dispatchTouchEvent', {
|
|
type,
|
|
touchPoints: points.map((p, id) => ({ x: p.x, y: p.y, id })),
|
|
})
|
|
|
|
test.describe('the properties dialog (U2 Task 6)', () => {
|
|
test.use({ locale: 'fr-FR', actionTimeout: 15_000 })
|
|
test.beforeEach(async ({ context }, info) => {
|
|
test.skip(isPhone(info), 'editing needs 1 024 px') // floor-guard: allow C16 editing needs >= 1024 px; phone read-only covered in editor-access
|
|
await routeToSandbox(context)
|
|
})
|
|
test.afterEach(async ({ context }) => {
|
|
await dropLateReplays(context)
|
|
})
|
|
|
|
for (const width of [1024, 1180, 1280]) {
|
|
test(`at ${width} px: over the column, never over the drawing; nothing moves`, async ({
|
|
page,
|
|
requests,
|
|
}) => {
|
|
await keepNativeFrames(page)
|
|
const actor = await open(page, width)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
// The strip's commands fit (A6): for a point (its slider) and for a zone, the last
|
|
// one lies whole inside the strip.
|
|
for (const name of [POINT, ZONE]) {
|
|
await pickAnnotation(page, dict, name)
|
|
await expect(selectionTag(page)).toContainText(name)
|
|
const fence = (await strip(page).boundingBox())!
|
|
const last = (await strip(page)
|
|
.getByRole('button', { name: dict['editor.annotations.deselect'] })
|
|
.boundingBox())!
|
|
expect(last.x + last.width).toBeLessThanOrEqual(fence.x + fence.width)
|
|
}
|
|
await page.evaluate(() => window.scrollTo(0, 0))
|
|
await expectNoShift(page, async () => {
|
|
await strip(page)
|
|
.getByRole('button', { name: dict['editor.annotations.properties'] })
|
|
.click()
|
|
await expect(dialog(page)).toBeVisible()
|
|
})
|
|
const aside = await box(page, '[data-annotation-aside="edit"]')
|
|
const canvas = await box(page, '[data-testid="annotation-canvas"]')
|
|
const panelBox = page.getByTestId('dialog-panel')
|
|
// Once its opening scale (0.96 to 1) is over: its box is then its place.
|
|
const top = Math.max(12, aside.y)
|
|
await expect
|
|
.poll(async () => Math.abs((await panelBox.boundingBox())!.y - top))
|
|
.toBeLessThan(1)
|
|
const panel = (await panelBox.boundingBox())!
|
|
expect(panel.x).toBeGreaterThanOrEqual(aside.x - 1)
|
|
expect(panel.x + panel.width).toBeLessThanOrEqual(
|
|
aside.x + aside.width + 1,
|
|
)
|
|
expect(panel.x).toBeGreaterThanOrEqual(canvas.x + canvas.width)
|
|
await expectNoShift(page, async () => {
|
|
await page.keyboard.press('Escape')
|
|
await expect(dialog(page)).toHaveCount(0)
|
|
})
|
|
})
|
|
}
|
|
|
|
test('axe in read and edit modes; a click on the veil does nothing (R-6)', async ({
|
|
page,
|
|
requests,
|
|
}) => {
|
|
const actor = await open(page)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
await pickAnnotation(page, dict, POINT)
|
|
const sheet = await openProperties(page, dict)
|
|
await expectAccessible(page, 'the properties dialog, read mode')
|
|
await page.mouse.click(20, 400)
|
|
await expect(sheet).toBeVisible()
|
|
await sheet
|
|
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
|
|
.click()
|
|
await expect(sheet.locator('#annotation-edit-fr')).toBeFocused()
|
|
await expectAccessible(page, 'the properties dialog, edit mode')
|
|
})
|
|
|
|
test('a typed form, then Back: it asks; « Abandonner » writes nothing', async ({
|
|
page,
|
|
requests,
|
|
}) => {
|
|
const actor = await open(page)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
await pickAnnotation(page, dict, POINT)
|
|
const sheet = await openProperties(page, dict)
|
|
await sheet
|
|
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
|
|
.click()
|
|
const name = sheet.locator('#annotation-edit-fr')
|
|
await name.fill('Pt brouillon')
|
|
await page.goBack()
|
|
await expect(
|
|
sheet.getByText(dict['editor.findings.discard_ask']),
|
|
).toBeVisible()
|
|
await expect(name).toHaveValue('Pt brouillon')
|
|
await sheet
|
|
.getByRole('button', { name: dict['editor.findings.discard'] })
|
|
.click()
|
|
await expect(dialog(page)).toHaveCount(0)
|
|
await expect(selectionTag(page)).toContainText(POINT)
|
|
await expect(
|
|
page.getByTestId('history-buttons').getByRole('button', {
|
|
name: dict['editor.history.undo_title'],
|
|
}),
|
|
).toHaveAttribute('aria-disabled', 'true')
|
|
})
|
|
|
|
test('a double click on the selected zone opens it, no vertex added (R-8)', async ({
|
|
page,
|
|
requests,
|
|
}) => {
|
|
const actor = await open(page)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
await pickAnnotation(page, dict, ZONE)
|
|
const before = await shownPoints(page)
|
|
const inside = await clientOf(page, 250, 250)
|
|
const clicks = await countClicks(page)
|
|
await page.mouse.dblclick(inside.x, inside.y)
|
|
// The second click and the dblclick have landed (on the veil): the dialog stays.
|
|
await expect.poll(() => clicks('dblclick')).toBe(1)
|
|
expect(await clicks('click')).toBe(2)
|
|
await expect(dialog(page)).toBeVisible()
|
|
await page.keyboard.press('Escape')
|
|
await expect(dialog(page)).toHaveCount(0)
|
|
expect(await shownPoints(page)).toEqual(before)
|
|
})
|
|
|
|
test('a width crossing below 1 024 px with a typed form, and back: the draft is intact', async ({
|
|
page,
|
|
requests,
|
|
}) => {
|
|
const actor = await open(page)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
await pickAnnotation(page, dict, POINT)
|
|
const sheet = await openProperties(page, dict)
|
|
await sheet
|
|
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
|
|
.click()
|
|
const name = sheet.locator('#annotation-edit-fr')
|
|
await name.fill('Pt traversée')
|
|
await page.setViewportSize({ width: 800, height: 800 })
|
|
await expect(sheet).toBeVisible()
|
|
await expect(name).toHaveValue('Pt traversée')
|
|
await expect(
|
|
sheet.getByRole('button', { name: dict['editor.findings.save'] }),
|
|
).toBeDisabled()
|
|
await page.setViewportSize({ width: 1280, height: 800 })
|
|
await expect(name).toHaveValue('Pt traversée')
|
|
await expect(
|
|
sheet.getByRole('button', { name: dict['editor.findings.save'] }),
|
|
).toBeEnabled()
|
|
await sheet
|
|
.getByRole('button', { name: dict['editor.findings.save'] })
|
|
.click()
|
|
await expect(sheet.getByTestId('annotation-read')).toContainText(
|
|
'Pt traversée',
|
|
)
|
|
})
|
|
})
|
|
|
|
test.describe('the properties dialog by touch (U2 Task 6, Review Focus 5)', () => {
|
|
test.use({
|
|
locale: 'fr-FR',
|
|
actionTimeout: 15_000,
|
|
hasTouch: true,
|
|
viewport: { width: 1280, height: 800 },
|
|
})
|
|
test.beforeEach(async ({ context }, info) => {
|
|
test.skip(isPhone(info), 'touch at 1 280 px runs on desktop') // floor-guard: allow C16 editing needs >= 1024 px; phone read-only covered in editor-access
|
|
await routeToSandbox(context)
|
|
})
|
|
test.afterEach(async ({ context }) => {
|
|
await dropLateReplays(context)
|
|
})
|
|
|
|
test('a tap on the selected shape opens the dialog, and it stays open', async ({
|
|
page,
|
|
context,
|
|
requests,
|
|
}) => {
|
|
const actor = await open(page)
|
|
requests.forbid(actor.account.email, actor.account.password)
|
|
await pickAnnotation(page, dict, ZONE)
|
|
const cdp = await context.newCDPSession(page)
|
|
const inside = await clientOf(page, 250, 250)
|
|
const clicks = await countClicks(page)
|
|
await touch(cdp, 'touchStart', [inside])
|
|
await touch(cdp, 'touchEnd', [])
|
|
// The click the browser synthesises after the tap has landed: the dialog stays open.
|
|
await expect.poll(() => clicks('click')).toBe(1)
|
|
await expect(dialog(page)).toBeVisible()
|
|
await expect(selectionTag(page)).toContainText(ZONE)
|
|
// A stray click on the veil, over the drawing (R-6): it lands, nothing closes.
|
|
const stray = await clientOf(page, 900, 600)
|
|
await page.mouse.click(stray.x, stray.y)
|
|
await expect.poll(() => clicks('click')).toBe(2)
|
|
await expect(dialog(page)).toBeVisible()
|
|
})
|
|
})
|