From 600317939389880bb22bf6228c214abfc4e70dc5 Mon Sep 17 00:00:00 2001 From: 49lf Date: Mon, 23 Sep 2024 10:00:55 -0400 Subject: [PATCH] wip fixing tests --- e2e/playwright/testing-settings.spec.ts | 21 +++++++++++++++---- .../ModelingSidebar/ModelingSidebar.tsx | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/e2e/playwright/testing-settings.spec.ts b/e2e/playwright/testing-settings.spec.ts index d2ff955081..a60f799e98 100644 --- a/e2e/playwright/testing-settings.spec.ts +++ b/e2e/playwright/testing-settings.spec.ts @@ -606,19 +606,32 @@ const extrude001 = extrude(5, sketch001) ` ) }) - await page.setViewportSize({ width: 1200, height: 500 }) + const viewport = { width: 1200, height: 500 } + await page.setViewportSize(viewport) + await u.waitForAuthSkipAppStart() + + const getMiddleOfModelingArea = async (viewport) => { + const panes = page.getByTestId('pane-section') + const bb = await panes.boundingBox() + const goRightPx = bb.width > 0 ? (viewport.width - bb.width) / 2 : 0 + return { + x: viewport.width / 2 + goRightPx, + y: viewport.height / 2, + } + } // Selectors and constants const editSketchButton = page.getByRole('button', { name: 'Edit Sketch' }) const lineToolButton = page.getByTestId('line') const segmentOverlays = page.getByTestId('segment-overlay') - const sketchOriginLocation = { x: 600, y: 250 } + const sketchOriginLocation = await getMiddleOfModelingArea(viewport) const darkThemeSegmentColor: [number, number, number] = [215, 215, 215] const lightThemeSegmentColor: [number, number, number] = [90, 90, 90] await test.step(`Get into sketch mode`, async () => { - await u.waitForAuthSkipAppStart() - await page.mouse.click(700, 200) + const aLineToClickOn = await u.getBoundingBox('[data-overlay-index="0"]') + await page.mouse.move(aLineToClickOn.x, aLineToClickOn.y) + await expect(editSketchButton).toBeVisible() await editSketchButton.click() diff --git a/src/components/ModelingSidebar/ModelingSidebar.tsx b/src/components/ModelingSidebar/ModelingSidebar.tsx index 3fd34e5567..92e6d870c0 100644 --- a/src/components/ModelingSidebar/ModelingSidebar.tsx +++ b/src/components/ModelingSidebar/ModelingSidebar.tsx @@ -248,6 +248,7 @@ export const ModelingSidebar = forwardRef<