From b5c25fe9e7af4b591c17cfffa2122db70cd459e6 Mon Sep 17 00:00:00 2001 From: Frank Noirot Date: Fri, 21 Mar 2025 12:32:45 -0400 Subject: [PATCH] More test updates to use inline `in` setting --- e2e/playwright/sketch-tests.spec.ts | 6 +++++- e2e/playwright/testing-constraints.spec.ts | 16 +++++++++++++--- e2e/playwright/testing-gizmo.spec.ts | 2 +- e2e/playwright/testing-settings.spec.ts | 4 ++-- e2e/playwright/various.spec.ts | 3 ++- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/e2e/playwright/sketch-tests.spec.ts b/e2e/playwright/sketch-tests.spec.ts index 0544f32ea..a2bc12780 100644 --- a/e2e/playwright/sketch-tests.spec.ts +++ b/e2e/playwright/sketch-tests.spec.ts @@ -2491,7 +2491,11 @@ extrude001 = extrude(profile003, length = 5) page, }) => { await page.addInitScript(async () => { - localStorage.setItem('persistCode', `myVar = 5`) + localStorage.setItem( + 'persistCode', + `@settings(defaultLengthUnit = in) + myVar = 5` + ) }) await page.setBodyDimensions({ width: 1000, height: 500 }) diff --git a/e2e/playwright/testing-constraints.spec.ts b/e2e/playwright/testing-constraints.spec.ts index 57ae5e8da..2a0234141 100644 --- a/e2e/playwright/testing-constraints.spec.ts +++ b/e2e/playwright/testing-constraints.spec.ts @@ -1117,9 +1117,19 @@ test.describe('Electron constraint tests', () => { await context.folderSetupFn(async (dir) => { const bracketDir = path.join(dir, 'test-sample') await fsp.mkdir(bracketDir, { recursive: true }) - await fsp.copyFile( - executorInputPath('angled_line.kcl'), - path.join(bracketDir, 'main.kcl') + await fsp.writeFile( + path.join(bracketDir, 'main.kcl'), + `@settings(defaultLengthUnit = in) + const part001 = startSketchOn(XY) + |> startProfileAt([4.83, 12.56], %) + |> line(end = [15.1, 2.48]) + |> line(end = [3.15, -9.85], tag = $seg01) + |> line(end = [-15.17, -4.1]) + |> angledLine([segAng(seg01), 12.35], %) + |> line(end = [-13.02, 10.03]) + |> close() + |> extrude(length = 4)`, + 'utf-8' ) }) diff --git a/e2e/playwright/testing-gizmo.spec.ts b/e2e/playwright/testing-gizmo.spec.ts index a08382412..75b222b32 100644 --- a/e2e/playwright/testing-gizmo.spec.ts +++ b/e2e/playwright/testing-gizmo.spec.ts @@ -255,7 +255,7 @@ test.describe(`Testing gizmo, fixture-based`, () => { await context.addInitScript(() => { localStorage.setItem( 'persistCode', - ` + `@settings(defaultLengthUnit = in) const sketch002 = startSketchOn(XZ) |> startProfileAt([-108.83, -57.48], %) |> angledLine([0, 105.13], %, $rectangleSegmentA001) diff --git a/e2e/playwright/testing-settings.spec.ts b/e2e/playwright/testing-settings.spec.ts index d3bf9cce9..5f9df92a6 100644 --- a/e2e/playwright/testing-settings.spec.ts +++ b/e2e/playwright/testing-settings.spec.ts @@ -950,9 +950,9 @@ test.describe('Testing settings', () => { ) }) - await test.step(`Initial units from settings`, async () => { + await test.step(`Initial units from settings are ignored`, async () => { await homePage.openProject('project-000') - await expect(unitsIndicator).toHaveText('Current units are: in') + await expect(unitsIndicator).toHaveText('Current units are: mm') }) await test.step(`Manually write inline settings`, async () => { diff --git a/e2e/playwright/various.spec.ts b/e2e/playwright/various.spec.ts index 3591a6f7d..01bd81bc7 100644 --- a/e2e/playwright/various.spec.ts +++ b/e2e/playwright/various.spec.ts @@ -483,7 +483,8 @@ test('Sketch on face', async ({ page, homePage, scene, cmdBar, toolbar }) => { await page.addInitScript(async () => { localStorage.setItem( 'persistCode', - `sketch001 = startSketchOn(XZ) + `@settings(defaultLengthUnit = in) +sketch001 = startSketchOn(XZ) |> startProfileAt([3.29, 7.86], %) |> line(end = [2.48, 2.44]) |> line(end = [2.66, 1.17])