Merge remote-tracking branch 'origin' into kurt-bring-back-multi-profile

.github/ci-cd-scripts/playwright-browser-chrome.sh

@@ -1,59 +0,0 @@
-# bash strict mode
-set -euo pipefail
-
-if [[ ! -f "test-results/.last-run.json" ]]; then
-    # if no last run artifact, than run plawright normally
-    echo "run playwright normally"
-    if [[ "$3" == ubuntu-latest* ]]; then
-        yarn test:playwright:browser:chrome:ubuntu -- --shard=$1/$2 || true
-    elif [[ "$3" == windows-latest* ]]; then
-        yarn test:playwright:browser:chrome:windows -- --shard=$1/$2 || true
-    else
-        echo "Do not run playwright. Unable to detect os runtime."
-        exit 1
-    fi
-    # # send to axiom
-    node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-fi
-
-retry=1
-max_retrys=4
-
-# retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
-while [[ $retry -le $max_retrys ]]; do
-    if [[ -f "test-results/.last-run.json" ]]; then
-        failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-        if [[ $failed_tests -gt 0 ]]; then
-            echo "retried=true" >>$GITHUB_OUTPUT
-            echo "run playwright with last failed tests and retry $retry"
-            if [[ "$3" == ubuntu-latest* ]]; then
-                yarn test:playwright:browser:chrome:ubuntu -- --last-failed || true
-            elif [[ "$3" == windows-latest* ]]; then
-                yarn test:playwright:browser:chrome:windows -- --last-failed || true
-            else
-                echo "Do not run playwright. Unable to detect os runtime."
-                exit 1
-            fi
-            # send to axiom
-            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-            retry=$((retry + 1))
-        else
-            echo "retried=false" >>$GITHUB_OUTPUT
-            exit 0
-        fi
-    else
-        echo "retried=false" >>$GITHUB_OUTPUT
-        exit 0
-    fi
-done
-
-echo "retried=false" >>$GITHUB_OUTPUT
-
-if [[ -f "test-results/.last-run.json" ]]; then
-    failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-    if [[ $failed_tests -gt 0 ]]; then
-        # if it still fails after 3 retrys, then fail the job
-        exit 1
-    fi
-fi
-exit 0

.github/ci-cd-scripts/playwright-electron.sh

@@ -1,15 +1,17 @@
+#!/bin/bash
+
 # bash strict mode
 set -euo pipefail
 
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-        if [[ "$1" == ubuntu-latest* ]]; then
+        if [[ "$3" == *ubuntu* ]]; then
-            xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
+            xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --shard=$1/$2 || true
-        elif [[ "$1" == windows-latest* ]]; then
+        elif [[ "$3" == *windows* ]]; then
-            yarn test:playwright:electron:windows || true
+            yarn test:playwright:electron:windows -- --shard=$1/$2 || true
-        elif [[ "$1" == macos-14* ]]; then
+        elif [[ "$3" == *macos* ]]; then
-            yarn test:playwright:electron:macos || true
+            yarn test:playwright:electron:macos  -- --shard=$1/$2 || true
         else
             echo "Do not run playwright. Unable to detect os runtime."
             exit 1
@@ -28,11 +30,11 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$1" == ubuntu-latest* ]]; then
+            if [[ "$3" == *ubuntu* ]]; then
                 xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$1" == windows-latest* ]]; then
+            elif [[ "$3" == *windows* ]]; then
                 yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$1" == macos-14* ]]; then
+            elif [[ "$3" == *macos* ]]; then
                 yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/workflows/e2e-tests.yml

@@ -18,6 +18,7 @@ permissions:
 jobs:
 
   check-rust-changes:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     outputs:
       rust-changed: ${{ steps.filter.outputs.rust }}
@@ -33,20 +34,20 @@ jobs:
             rust:
               - 'src/wasm-lib/**'
 
-  browser:
+  electron:
-    timeout-minutes: ${{ matrix.os == 'macos-14' && 60 || 50 }}
+    if: github.event.pull_request.draft == false
-    name: playwright:browser:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
+    timeout-minutes: 60
+    name: playwright:electron:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
+        # TODO: enable self-hosted-windows-8-cores once available
+        os: [namespace-profile-ubuntu-8-cores, namespace-profile-macos-8-cores, windows-16-cores]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
-    - name: Tune GitHub-hosted runner network
-      uses: smorimoto/tune-github-hosted-runner-network@v1
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
@@ -101,7 +102,8 @@ jobs:
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
       shell: bash
-      if:  ${{ !startsWith(matrix.os, 'windows') }}
+      # TODO: figure out what to do with this, it's failing
+      if: false
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
         chmod +x /tmp/vector.sh
@@ -123,13 +125,13 @@ jobs:
       if: steps.download-wasm.outcome == 'failure'
       shell: bash
       run: yarn build:wasm
-    - name: build web
+    - name: build electron
-      run: yarn build:local
       shell: bash
+      run: yarn tron:package
     - name: Run ubuntu/chrome snapshots
       shell: bash
       run: |
-        yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       env:
         CI: true
         NODE_ENV: development
@@ -186,12 +188,12 @@ jobs:
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
-    - name: Run playwright/chrome flow (with retries)
+    - name: Run playwright/electron flow (with retries)
       id: retry
       if: ${{ !cancelled() && (success() || failure()) }}
       shell: bash
       run: |
-        .github/ci-cd-scripts/playwright-browser-chrome.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
+        .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
       env:
         CI: true
         FAIL_ON_CONSOLE_ERRORS: true
@@ -199,11 +201,6 @@ jobs:
         VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         VITE_KC_SKIP_AUTH: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-    - name: send to axiom
-      if: always()
-      shell: bash
-      run: |
-        node playwrightProcess.mjs | tee /tmp/github-actions.log
     - uses: actions/upload-artifact@v4
       if: always()
       with:
@@ -221,136 +218,3 @@ jobs:
         retention-days: 30
         overwrite: true
 
-
-  electron:
-    name: playwright:electron:${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
-    timeout-minutes: 60
-    runs-on: ${{ matrix.os }}
-    needs: check-rust-changes
-    steps:
-    - name: Tune GitHub-hosted runner network
-      uses: smorimoto/tune-github-hosted-runner-network@v1
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@main
-    - name: Install dependencies
-      shell: bash
-      run: yarn
-    - name: Cache Playwright Browsers
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/ms-playwright/
-        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
-    - name: Install Playwright Browsers
-      shell: bash
-      run: yarn playwright install chromium --with-deps
-    - name: Download Wasm Cache
-      id: download-wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v7
-      continue-on-error: true
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        name: wasm-bundle
-        workflow: build-and-store-wasm.yml
-        branch: main
-        path: src/wasm-lib/pkg
-    - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      shell: bash
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      continue-on-error: true
-    - name: Setup Rust
-      uses: dtolnay/rust-toolchain@stable
-    - name: Cache Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: OR Cache Wasm (because wasm cache failed)
-      if: steps.download-wasm.outcome == 'failure'
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: install good sed
-      if:  ${{ startsWith(matrix.os, 'macos') }}
-      shell: bash
-      run: |
-        brew install gnu-sed
-        echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
-    - name: Install vector
-      if:  ${{ startsWith(matrix.os, 'ubuntu') }}
-      shell: bash
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
-        chmod +x /tmp/vector.sh
-        /tmp/vector.sh -y -no-modify-path
-        mkdir -p /tmp/vector
-        cp .github/workflows/vector.toml /tmp/vector.toml
-        sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-        sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
-        cat /tmp/vector.toml
-        ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
-    - name: Build Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      shell: bash
-      run: yarn build:wasm
-    - name: OR Build Wasm (because wasm cache failed)
-      if: steps.download-wasm.outcome == 'failure'
-      shell: bash
-      run: yarn build:wasm
-    - name: build electron
-      shell: bash
-      run: yarn tron:package
-    - uses: actions/download-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
-      continue-on-error: true
-      with:
-        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
-        path: test-results/
-    - name: Run electron tests (with retries)
-      id: retry
-      if: ${{ !cancelled() && (success() || failure()) }}
-      shell: bash
-      run: |
-        .github/ci-cd-scripts/playwright-electron.sh ${{ matrix.os }}
-      env:
-        CI: true
-        FAIL_ON_CONSOLE_ERRORS: true
-        NODE_ENV: development
-        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        VITE_KC_SKIP_AUTH: true
-        IS_UBUNTU: ${{ startsWith(matrix.os, 'ubuntu') && 'true' || 'false' }}
-        #DEBUG: 'pw:browser*'
-    - name: send to axiom
-      if: ${{ !cancelled() && (success() || failure()) && !startsWith(matrix.os, 'windows') }}
-      shell: bash
-      run: |
-        node playwrightProcess.mjs | tee /tmp/github-actions.log
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
-      with:
-        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
-        path: test-results/
-        include-hidden-files: true
-        retention-days: 30
-        overwrite: true
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
-      with:
-        name: playwright-report-electron-${{ matrix.os }}-${{ github.sha }}
-        path: playwright-report/
-        include-hidden-files: true
-        retention-days: 30
-        overwrite: true

README.md

@@ -388,23 +388,6 @@ yarn test:unit:local
 
 #### E2E Tests
 
-**Playwright Browser**
-
-These E2E tests run in a browser (without electron).
-There are tests that are skipped if they are ran in a windows OS or Linux OS. We can use playwright tags to implement test skipping.
-
-Breaking down the command `yarn test:playwright:browser:chrome:windows`
-- The application is `playwright`
-- The runtime is a `browser`
-- The specific `browser` is `chrome`
-- The test should run in a `windows` environment. It will skip tests that are broken or flaky in the windows OS.
-
-```
-yarn test:playwright:browser:chrome
-yarn test:playwright:browser:chrome:windows
-yarn test:playwright:browser:chrome:ubuntu
-```
-
 **Playwright Electron**
 
 These E2E tests run in electron. There are tests that are skipped if they are ran in a windows, linux, or macos environment. We can use playwright tags to implement test skipping.

e2e/playwright/app-header-tests.spec.ts

@@ -1,22 +1,11 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-
-import { setupElectron, tearDown } from './test-utils'
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Electron app header tests', () => {
   test(
     'Open Command Palette button has correct shortcut',
     { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
+    async ({ page }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
 
       // No space before the shortcut since it checks textContent.
       let text
@@ -34,21 +23,14 @@ test.describe('Electron app header tests', () => {
       const commandsButton = page.getByRole('button', { name: 'Commands' })
       await expect(commandsButton).toBeVisible()
       await expect(commandsButton).toHaveText(text)
-
-      await electronApp.close()
     }
   )
 
   test(
     'User settings has correct shortcut',
     { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
+    async ({ page }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
 
       // Open the user sidebar menu.
       await page.getByTestId('user-sidebar-toggle').click()
@@ -59,8 +41,6 @@ test.describe('Electron app header tests', () => {
       const userSettingsButton = page.getByTestId('user-settings')
       await expect(userSettingsButton).toBeVisible()
       await expect(userSettingsButton).toHaveText(text)
-
-      await electronApp.close()
     }
   )
 })

e2e/playwright/basic-sketch.spec.ts

@@ -1,29 +1,26 @@
-import { test, expect, Page } from '@playwright/test'
+import { test, expect, Page } from './zoo-test'
 import {
   getUtils,
   TEST_COLORS,
-  setup,
-  tearDown,
   commonPoints,
   PERSIST_MODELING_CONTEXT,
 } from './test-utils'
-
+import { HomePageFixture } from './fixtures/homePageFixture'
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.setTimeout(120000)
 
-async function doBasicSketch(page: Page, openPanes: string[]) {
+async function doBasicSketch(
+  page: Page,
+  homePage: HomePageFixture,
+  openPanes: string[]
+) {
   const u = await getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.setBodyDimensions({ width: 1200, height: 500 })
   const PUR = 400 / 37.5 //pixeltoUnitRatio
 
-  await u.waitForAuthSkipAppStart()
+  await homePage.goToModelingScene()
+  await u.waitForPageLoad()
+  await page.waitForTimeout(1000)
   await u.openDebugPanel()
 
   // If we have the code pane open, we should see the code.
@@ -155,13 +152,11 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
 }
 
 test.describe('Basic sketch', () => {
-  test('code pane open at start', { tag: ['@skipWin'] }, async ({ page }) => {
+  test.fixme('code pane open at start', async ({ page, homePage }) => {
-    // Skip on windows it is being weird.
+    await doBasicSketch(page, homePage, ['code'])
-    test.skip(process.platform === 'win32', 'Skip on windows')
-    await doBasicSketch(page, ['code'])
   })
 
-  test('code pane closed at start', async ({ page }) => {
+  test.fixme('code pane closed at start', async ({ page, homePage }) => {
     // Load the app with the code panes
     await page.addInitScript(async (persistModelingContext) => {
       localStorage.setItem(
@@ -169,6 +164,6 @@ test.describe('Basic sketch', () => {
         JSON.stringify({ openPanes: [] })
       )
     }, PERSIST_MODELING_CONTEXT)
-    await doBasicSketch(page, [])
+    await doBasicSketch(page, homePage, [])
   })
 })

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -1,27 +1,21 @@
-import { test, expect } from '@playwright/test'
+import { test, expect, Page } from './zoo-test'
-import { getUtils, setup, tearDown } from './test-utils'
+import { HomePageFixture } from './fixtures/homePageFixture'
+import { getUtils } from './test-utils'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import { uuidv4 } from 'lib/utils'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Can create sketches on all planes and their back sides', () => {
   const sketchOnPlaneAndBackSideTest = async (
-    page: any,
+    page: Page,
+    homePage: HomePageFixture,
     plane: string,
     clickCoords: { x: number; y: number }
   ) => {
     const u = await getUtils(page)
     const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openDebugPanel()
 
     const coord =
@@ -82,32 +76,39 @@ test.describe('Can create sketches on all planes and their back sides', () => {
     await u.clearCommandLogs()
     await u.removeCurrentCode()
   }
-  test('XY', async ({ page }) => {
+  test('XY', async ({ page, homePage }) => {
     await sketchOnPlaneAndBackSideTest(
       page,
+      homePage,
       'XY',
       { x: 600, y: 388 } // red plane
       // { x: 600, y: 400 }, // red plane // clicks grid helper and that causes problems, should fix so that these coords work too.
     )
   })
 
-  test('YZ', async ({ page }) => {
+  test('YZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, 'YZ', { x: 700, y: 250 }) // green plane
+    await sketchOnPlaneAndBackSideTest(page, homePage, 'YZ', { x: 700, y: 250 }) // green plane
   })
 
-  test('XZ', async ({ page }) => {
+  test('XZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, '-XZ', { x: 700, y: 80 }) // blue plane
+    await sketchOnPlaneAndBackSideTest(page, homePage, '-XZ', { x: 700, y: 80 }) // blue plane
   })
 
-  test('-XY', async ({ page }) => {
+  test('-XY', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, '-XY', { x: 600, y: 118 }) // back of red plane
+    await sketchOnPlaneAndBackSideTest(page, homePage, '-XY', {
+      x: 600,
+      y: 118,
+    }) // back of red plane
   })
 
-  test('-YZ', async ({ page }) => {
+  test('-YZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, '-YZ', { x: 700, y: 219 }) // back of green plane
+    await sketchOnPlaneAndBackSideTest(page, homePage, '-YZ', {
+      x: 700,
+      y: 219,
+    }) // back of green plan
   })
 
-  test('-XZ', async ({ page }) => {
+  test('-XZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, 'XZ', { x: 700, y: 427 }) // back of blue plane
+    await sketchOnPlaneAndBackSideTest(page, homePage, 'XZ', { x: 700, y: 427 }) // back of blue plane
   })
 })

e2e/playwright/code-pane-and-errors.spec.ts

@@ -1,28 +1,15 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import {
+import { getUtils, executorInputPath } from './test-utils'
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
 import { join } from 'path'
 import { bracket } from 'lib/exampleKcl'
 import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from './storageStates'
 import fsp from 'fs/promises'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Code pane and errors', () => {
   test('Typing KCL errors induces a badge on the code pane button', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
@@ -31,18 +18,18 @@ test.describe('Code pane and errors', () => {
       localStorage.setItem(
         'persistCode',
         `// Extruded Triangle
-sketch001 = startSketchOn('XZ')
+  sketch001 = startSketchOn('XZ')
     |> startProfileAt([0, 0], %)
     |> line([10, 0], %)
     |> line([-5, 10], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-extrude001 = extrude(5, sketch001)`
+  extrude001 = extrude(5, sketch001)`
       )
     })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -62,11 +49,11 @@ extrude001 = extrude(5, sketch001)`
     await expect(codePaneButtonHolder).toContainText('notification')
   })
 
-  test('Opening and closing the code pane will consistently show error diagnostics', async ({
+  test.skip('Opening and closing the code pane will consistently show error diagnostics', async ({
     page,
+    homePage,
+    editor,
   }) => {
-    await page.goto('http://localhost:3000')
-
     const u = await getUtils(page)
 
     // Load the app with the working starter code
@@ -74,8 +61,8 @@ extrude001 = extrude(5, sketch001)`
       localStorage.setItem('persistCode', code)
     }, bracket)
 
-    await page.setViewportSize({ width: 1200, height: 900 })
+    await page.setBodyDimensions({ width: 1200, height: 900 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -91,8 +78,9 @@ extrude001 = extrude(5, sketch001)`
     await expect(codePaneButtonHolder).not.toContainText('notification')
 
     // Delete a character to break the KCL
-    await u.openKclCodePanel()
+    await editor.openPane()
-    await page.getByText('thickness, bracketLeg1Sketch)').click()
+    await editor.scrollToText('thickness, bracketLeg1Sketch)')
+    await page.getByText('extrude(thickness, bracketLeg1Sketch)').click()
     await page.keyboard.press('Backspace')
 
     // Ensure that a badge appears on the button
@@ -116,7 +104,10 @@ extrude001 = extrude(5, sketch001)`
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
     // Open the code pane
-    await u.openKclCodePanel()
+    await editor.openPane()
+
+    // Go to our problematic code again (missing closing paren!)
+    await editor.scrollToText('extrude(thickness, bracketLeg1Sketch')
 
     // Ensure that a badge appears on the button
     await expect(codePaneButtonHolder).toContainText('notification')
@@ -129,18 +120,16 @@ extrude001 = extrude(5, sketch001)`
     await expect(page.locator('.cm-tooltip').first()).toBeVisible()
   })
 
-  test('When error is not in view you can click the badge to scroll to it', async ({
+  test.fixme(
-    page,
+    'When error is not in view you can click the badge to scroll to it',
-  }) => {
+    async ({ page, homePage, context }) => {
-    const u = await getUtils(page)
-
       // Load the app with the working starter code
-    await page.addInitScript((code) => {
+      await context.addInitScript((code) => {
         localStorage.setItem('persistCode', code)
       }, TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW)
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       await page.waitForTimeout(1000)
 
@@ -164,24 +153,25 @@ extrude001 = extrude(5, sketch001)`
       await expect(
         page
           .getByText(
-          'sketch profile must lie entirely on one side of the revolution axis'
+            'Modeling command failed: [ApiError { error_code: InternalEngine, message: "Solid3D revolve failed:  sketch profile must lie entirely on one side of the revolution axis" }]'
           )
           .first()
       ).toBeVisible()
-  })
+    }
+  )
 
   test('When error is not in view WITH LINTS you can click the badge to scroll to it', async ({
+    context,
     page,
+    homePage,
   }) => {
-    const u = await getUtils(page)
-
     // Load the app with the working starter code
-    await page.addInitScript((code) => {
+    await context.addInitScript((code) => {
       localStorage.setItem('persistCode', code)
     }, TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW)
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await page.waitForTimeout(1000)
 
@@ -241,11 +231,9 @@ extrude001 = extrude(5, sketch001)`
 test(
   'Opening multiple panes persists when switching projects',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ context, page }, testInfo) => {
     // Setup multiple projects.
-    const { electronApp, page } = await setupElectron({
+    await context.folderSetupFn(async (dir) => {
-      testInfo,
-      folderSetupFn: async (dir) => {
       const routerTemplateDir = join(dir, 'router-template-slate')
       const bracketDir = join(dir, 'bracket')
       await Promise.all([
@@ -262,11 +250,10 @@ test(
           join(bracketDir, 'main.kcl')
         ),
       ])
-      },
     })
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     await test.step('Opening the bracket project should load', async () => {
       await expect(page.getByText('bracket')).toBeVisible()
@@ -309,30 +296,21 @@ test(
       await expect(page.locator('#variables-pane')).toBeVisible()
       await expect(page.locator('#logs-pane')).toBeVisible()
     })
-
-    await electronApp.close()
   }
 )
 
 test(
   'external change of file contents are reflected in editor',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ context, page }, testInfo) => {
     const PROJECT_DIR_NAME = 'lee-was-here'
-    const {
+    const { dir: projectsDir } = await context.folderSetupFn(async (dir) => {
-      electronApp,
-      page,
-      dir: projectsDir,
-    } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
       const aProjectDir = join(dir, PROJECT_DIR_NAME)
       await fsp.mkdir(aProjectDir, { recursive: true })
-      },
     })
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     await test.step('Open the project', async () => {
       await expect(page.getByText(PROJECT_DIR_NAME)).toBeVisible()
@@ -351,7 +329,5 @@ test(
       )
       await u.editorTextMatches(content)
     })
-
-    await electronApp.close()
   }
 )

e2e/playwright/command-bar-tests.spec.ts

@@ -1,19 +1,12 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Command bar tests', () => {
   test('Extrude from command bar selects extrude line after', async ({
     page,
+    homePage,
   }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -29,9 +22,9 @@ test.describe('Command bar tests', () => {
     })
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -52,7 +45,8 @@ test.describe('Command bar tests', () => {
     )
   })
 
-  test('Fillet from command bar', async ({ page }) => {
+  // TODO: fix this test after the electron migration
+  test.fixme('Fillet from command bar', async ({ page, homePage }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -63,13 +57,13 @@ test.describe('Command bar tests', () => {
     |> line([0, -10], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-extrude001 = extrude(-10, sketch001)`
+  extrude001 = extrude(-10, sketch001)`
       )
     })
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
@@ -93,10 +87,10 @@ extrude001 = extrude(-10, sketch001)`
 
   test('Command bar can change a setting, and switch back and forth between arguments', async ({
     page,
+    homePage,
   }) => {
-    const u = await getUtils(page)
+    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     const cmdSearchBar = page.getByPlaceholder('Search commands')
@@ -153,7 +147,7 @@ extrude001 = extrude(-10, sketch001)`
     // Check that the visibility changed
     await expect(paneSelector).not.toBeVisible()
 
-    commandOptionInput = page.getByPlaceholder('off')
+    commandOptionInput = page.locator('[id="option-input"]')
 
     // Test case for https://github.com/KittyCAD/modeling-app/issues/2882
     await commandBarButton.click()
@@ -174,10 +168,10 @@ extrude001 = extrude(-10, sketch001)`
 
   test('Command bar keybinding works from code editor and can change a setting', async ({
     page,
+    homePage,
   }) => {
-    const u = await getUtils(page)
+    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
 
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
@@ -221,7 +215,7 @@ extrude001 = extrude(-10, sketch001)`
     await expect(page.locator('body')).not.toHaveClass(`body-bg dark`)
   })
 
-  test('Can extrude from the command bar', async ({ page }) => {
+  test('Can extrude from the command bar', async ({ page, homePage }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -237,9 +231,9 @@ extrude001 = extrude(-10, sketch001)`
     })
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // Make sure the stream is up
     await u.openDebugPanel()
@@ -293,26 +287,19 @@ extrude001 = extrude(-10, sketch001)`
     await continueButton.click()
     await submitButton.click()
 
-    // Check that the code was updated
     await u.waitForCmdReceive('extrude')
-    // Unfortunately this indentation seems to matter for the test
+
-    await expect(page.locator('.cm-content')).toHaveText(
+    await expect(page.locator('.cm-content')).toContainText(
-      `distance = sqrt(20)
+      'extrude001 = extrude(distance001, sketch001)'
-distance001 = ${KCL_DEFAULT_LENGTH}
-sketch001 = startSketchOn('XZ')
-    |> startProfileAt([-6.95, 10.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -20.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)
-extrude001 = extrude(distance001, sketch001)`.replace(/(\r\n|\n|\r)/gm, '') // remove newlines
     )
   })
 
-  test('Can switch between sketch tools via command bar', async ({ page }) => {
+  test('Can switch between sketch tools via command bar', async ({
-    const u = await getUtils(page)
+    page,
-    await page.setViewportSize({ width: 1200, height: 500 })
+    homePage,
-    await u.waitForAuthSkipAppStart()
+  }) => {
+    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await homePage.goToModelingScene()
 
     const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
     const cmdBarButton = page.getByRole('button', { name: 'Commands' })

e2e/playwright/copilot-ghost-test.spec.ts

@@ -1,23 +1,16 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 test.describe('Copilot ghost text', () => {
   // eslint-disable-next-line jest/valid-title
   test.skip(true, 'Needs to get covered again')
 
-  test('completes code in empty file', async ({ page }) => {
+  test('completes code in empty file', async ({ page, homePage }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -52,12 +45,13 @@ test.describe('Copilot ghost text', () => {
 
   test.skip('copilot disabled in sketch mode no select plane', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -101,12 +95,13 @@ test.describe('Copilot ghost text', () => {
 
   test('copilot disabled in sketch mode after selecting plane', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -184,12 +179,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-ghostText')).not.toBeVisible()
   })
 
-  test('ArrowUp in code rejects the suggestion', async ({ page }) => {
+  test('ArrowUp in code rejects the suggestion', async ({ page, homePage }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -212,12 +207,15 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowDown in code rejects the suggestion', async ({ page }) => {
+  test('ArrowDown in code rejects the suggestion', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -240,12 +238,15 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowLeft in code rejects the suggestion', async ({ page }) => {
+  test('ArrowLeft in code rejects the suggestion', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -268,12 +269,15 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowRight in code rejects the suggestion', async ({ page }) => {
+  test('ArrowRight in code rejects the suggestion', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -296,12 +300,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('Enter in code scoots it down', async ({ page }) => {
+  test('Enter in code scoots it down', async ({ page, homePage }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -326,12 +330,15 @@ test.describe('Copilot ghost text', () => {
     )
   })
 
-  test('Ctrl+shift+z in code rejects the suggestion', async ({ page }) => {
+  test('Ctrl+shift+z in code rejects the suggestion', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -360,12 +367,13 @@ test.describe('Copilot ghost text', () => {
 
   test('Ctrl+z in code rejects the suggestion and undos the last code', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await page.waitForTimeout(800)
     await u.codeLocator.click()
@@ -420,15 +428,17 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
     // TODO when we make codemirror a widget, we can test this.
-    //await expect(page.locator('.cm-content')).toHaveText(``)
+    //await expect(page.locator('.cm-content')).toHaveText(``) })
-  })
 
-  test('delete in code rejects the suggestion', async ({ page }) => {
+    test('delete in code rejects the suggestion', async ({
+      page,
+      homePage,
+    }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       await u.codeLocator.click()
       await expect(page.locator('.cm-content')).toHaveText(``)
@@ -453,12 +463,15 @@ test.describe('Copilot ghost text', () => {
       await expect(page.locator('.cm-content')).toHaveText(``)
     })
 
-  test('backspace in code rejects the suggestion', async ({ page }) => {
+    test('backspace in code rejects the suggestion', async ({
+      page,
+      homePage,
+    }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       await u.codeLocator.click()
       await expect(page.locator('.cm-content')).toHaveText(``)
@@ -483,12 +496,15 @@ test.describe('Copilot ghost text', () => {
       await expect(page.locator('.cm-content')).toHaveText(``)
     })
 
-  test('focus outside code pane rejects the suggestion', async ({ page }) => {
+    test('focus outside code pane rejects the suggestion', async ({
+      page,
+      homePage,
+    }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       await u.codeLocator.click()
       await expect(page.locator('.cm-content')).toHaveText(``)
@@ -514,4 +530,5 @@ test.describe('Copilot ghost text', () => {
 
       await expect(page.locator('.cm-content')).toHaveText(``)
     })
+  })
 })

e2e/playwright/debug-pane.spec.ts

@@ -1,14 +1,6 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
-
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 function countNewlines(input: string): number {
   let count = 0
@@ -24,13 +16,14 @@ test.describe('Debug pane', () => {
   test('Artifact IDs in the artifact graph are stable across code edits', async ({
     page,
     context,
+    homePage,
   }) => {
     const code = `sketch001 = startSketchOn('XZ')
     |> startProfileAt([0, 0], %)
-|> line([1, 1], %)
+  |> line([1, 1], %)
-`
+  `
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     const tree = page.getByTestId('debug-feature-tree')
     const segment = tree.locator('li', {
@@ -39,7 +32,7 @@ test.describe('Debug pane', () => {
     })
 
     await test.step('Test setup', async () => {
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
       await u.openKclCodePanel()
       await u.openDebugPanel()
       // Set the code in the code editor.

e2e/playwright/desktop-export.spec.ts

@@ -1,39 +1,31 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import { join } from 'path'
+import path from 'path'
 import {
   getUtils,
-  setupElectron,
-  tearDown,
   executorInputPath,
+  getPlaywrightDownloadDir,
 } from './test-utils'
 import fsp from 'fs/promises'
 
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test(
   'export works on the first try',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ page, context }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
+    await context.folderSetupFn(async (dir) => {
-      testInfo,
+      const bracketDir = path.join(dir, 'bracket')
-      folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
       await Promise.all([fsp.mkdir(bracketDir, { recursive: true })])
       await Promise.all([
         fsp.copyFile(
           executorInputPath('router-template-slate.kcl'),
-            join(bracketDir, 'other.kcl')
+          path.join(bracketDir, 'other.kcl')
         ),
         fsp.copyFile(
           executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
+          path.join(bracketDir, 'main.kcl')
         ),
       ])
-      },
     })
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     page.on('console', console.log)
 
@@ -93,12 +85,16 @@ test(
       await expect(successToastMessage).toBeVisible()
       await expect(exportingToastMessage).not.toBeVisible()
 
+      const firstFileFullPath = path.resolve(
+        getPlaywrightDownloadDir(page),
+        exportFileName
+      )
       await test.step('Check the export size', async () => {
         await expect
           .poll(
             async () => {
               try {
-                const outputGltf = await fsp.readFile(exportFileName)
+                const outputGltf = await fsp.readFile(firstFileFullPath)
                 return outputGltf.byteLength
               } catch (e) {
                 return 0
@@ -107,9 +103,6 @@ test(
             { timeout: 15_000 }
           )
           .toBeGreaterThan(300_000)
-
-        // clean up exported file
-        await fsp.rm(exportFileName)
       })
     })
 
@@ -170,12 +163,16 @@ test(
           expect(exportingToastMessage).not.toBeVisible(),
         ]))
 
+      const secondFileFullPath = path.resolve(
+        getPlaywrightDownloadDir(page),
+        exportFileName
+      )
       await test.step('Check the export size', async () => {
         await expect
           .poll(
             async () => {
               try {
-                const outputGltf = await fsp.readFile(exportFileName)
+                const outputGltf = await fsp.readFile(secondFileFullPath)
                 return outputGltf.byteLength
               } catch (e) {
                 return 0
@@ -184,13 +181,7 @@ test(
             { timeout: 15_000 }
           )
           .toBeGreaterThan(100_000)
-
-        // clean up exported file
-        await fsp.rm(exportFileName)
       })
-      await electronApp.close()
     })
-
-    await electronApp.close()
   }
 )

e2e/playwright/editor-tests.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 import fsp from 'fs/promises'
 import { uuidv4 } from 'lib/utils'
 import {
@@ -6,26 +6,16 @@ import {
   darkModePlaneColorXZ,
   executorInputPath,
   getUtils,
-  setup,
-  setupElectron,
-  tearDown,
 } from './test-utils'
+
 import { join } from 'path'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Editor tests', () => {
-  test('can comment out code with ctrl+/', async ({ page }) => {
+  test('can comment out code with ctrl+/', async ({ page, homePage }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -64,41 +54,15 @@ test.describe('Editor tests', () => {
   |> close(%)`)
   })
 
-  test('if you click the format button it formats your code', async ({
+  test('ensure we use the cache, and do not re-execute', async ({
+    homePage,
     page,
   }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
-
+    await u.waitForPageLoad()
-    // check no error to begin with
-    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-    await u.codeLocator.click()
-    await page.keyboard.type(`sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
-    await page.locator('#code-pane button:first-child').click()
-    await page.locator('button:has-text("Format code")').click()
-
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`sketch001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`)
-  })
-
-  test('ensure we use the cache, and do not re-execute', async ({ page }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn('XY')
@@ -112,7 +76,7 @@ test.describe('Editor tests', () => {
     await u.openDebugPanel()
     await expect(
       page.locator('[data-receive-command-type="scene_clear_all"]')
-    ).toHaveCount(2)
+    ).toHaveCount(1)
     await expect(
       page.locator('[data-message-type="execution-done"]')
     ).toHaveCount(2)
@@ -136,16 +100,101 @@ test.describe('Editor tests', () => {
     ).toHaveCount(3)
     await expect(
       page.locator('[data-receive-command-type="scene_clear_all"]')
+    ).toHaveCount(1)
+  })
+
+  test('ensure we use the cache, and do not clear on append', async ({
+    homePage,
+    page,
+  }) => {
+    const u = await getUtils(page)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
+
+    await u.codeLocator.click()
+    await page.keyboard.type(`sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
+
+    // Ensure we execute the first time.
+    await u.openDebugPanel()
+    await expect(
+      page.locator('[data-receive-command-type="scene_clear_all"]')
+    ).toHaveCount(1)
+    await expect(
+      page.locator('[data-message-type="execution-done"]')
     ).toHaveCount(2)
+
+    // Add whitespace to the end of the code.
+    await u.codeLocator.click()
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('End')
+    await page.keyboard.press('Enter')
+    await page.keyboard.press('Enter')
+    await page.keyboard.type('const x = 1')
+    await page.keyboard.press('Enter')
+
+    await u.openDebugPanel()
+    await expect(
+      page.locator('[data-message-type="execution-done"]')
+    ).toHaveCount(3)
+    await expect(
+      page.locator('[data-receive-command-type="scene_clear_all"]')
+    ).toHaveCount(1)
+  })
+
+  test('if you click the format button it formats your code', async ({
+    page,
+    homePage,
+  }) => {
+    const u = await getUtils(page)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+
+    await homePage.goToModelingScene()
+
+    // check no error to begin with
+    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
+
+    await u.codeLocator.click()
+    await page.keyboard.type(`sketch001 = startSketchOn('XY')
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
+    await page.locator('#code-pane button:first-child').click()
+    await page.locator('button:has-text("Format code")').click()
+
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
   })
 
   test('if you click the format button it formats your code and executes so lints are still there', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -196,9 +245,7 @@ test.describe('Editor tests', () => {
     ).toBeVisible()
   })
 
-  test('fold gutters work', async ({ page }) => {
+  test('fold gutters work', async ({ page, homePage }) => {
-    const u = await getUtils(page)
-
     const fullCode = `sketch001 = startSketchOn('XY')
    |> startProfileAt([-10, -10], %)
    |> line([20, 0], %)
@@ -216,9 +263,9 @@ test.describe('Editor tests', () => {
    |> close(%)`
       )
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // TODO: Jess needs to fix this but you have to mod the code to get them to show
     // up, its an annoying codemirror thing.
@@ -269,7 +316,10 @@ test.describe('Editor tests', () => {
     await expect(foldGutterFoldLine).not.toBeVisible()
   })
 
-  test('hover over functions shows function description', async ({ page }) => {
+  test('hover over functions shows function description', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -282,9 +332,9 @@ test.describe('Editor tests', () => {
     |> close(%)`
       )
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -313,6 +363,7 @@ test.describe('Editor tests', () => {
 
   test('if you use the format keyboard binding it formats your code', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
@@ -327,9 +378,9 @@ test.describe('Editor tests', () => {
       )
       localStorage.setItem('disableAxis', 'true')
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -355,6 +406,7 @@ test.describe('Editor tests', () => {
 
   test('if you use the format keyboard binding it formats your code and executes so lints are shown', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
@@ -369,9 +421,9 @@ test.describe('Editor tests', () => {
       )
       localStorage.setItem('disableAxis', 'true')
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -414,11 +466,14 @@ test.describe('Editor tests', () => {
     ).toBeVisible()
   })
 
-  test('if you write kcl with lint errors you get lints', async ({ page }) => {
+  test('if you write kcl with lint errors you get lints', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-info')).not.toBeVisible()
@@ -454,7 +509,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-lint-marker-info')).not.toBeVisible()
   })
 
-  test('if you fixup kcl errors you clear lints', async ({ page }) => {
+  test('if you fixup kcl errors you clear lints', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -468,9 +526,9 @@ test.describe('Editor tests', () => {
       )
     })
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -492,22 +550,27 @@ test.describe('Editor tests', () => {
     ).not.toBeVisible()
   })
 
-  test('if you write invalid kcl you get inlined errors', async ({ page }) => {
+  test('if you write invalid kcl you get inlined errors', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-    /* add the following code to the editor ($ error is not a valid line)
+    /* add the following code to the editor (~ error is not a valid line)
-      $ error
+      * the old check here used $ but this is for tags so it changed meaning.
-      topAng = 30
+      * hopefully ~ doesn't change meaning
-      bottomAng = 25
+    ~ error
+    const topAng = 30
+    const bottomAng = 25
    */
     await u.codeLocator.click()
-    await page.keyboard.type('$ error')
+    await page.keyboard.type('~ error')
 
     // press arrows to clear autocomplete
     await page.keyboard.press('ArrowLeft')
@@ -519,17 +582,17 @@ test.describe('Editor tests', () => {
     await page.keyboard.type('bottomAng = 25')
     await page.keyboard.press('Enter')
 
-    // error in gutter
+    // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
     await expect(
-      page.getByText('Tag names must not be empty').first()
+      page.getByText("found unknown token '~'").first()
     ).toBeVisible()
 
     // select the line that's causing the error and delete it
-    await page.getByText('$ error').click()
+    await page.getByText('~ error').click()
     await page.keyboard.press('End')
     await page.keyboard.down('Shift')
     await page.keyboard.press('Home')
@@ -565,10 +628,9 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
   })
 
-  // TODO currently multiple source ranges are not supported
+  test.fixme(
-  test.skip('error with 2 source ranges gets 2 diagnostics', async ({
+    'error with 2 source ranges gets 2 diagnostics',
-    page,
+    async ({ page, homePage }) => {
-  }) => {
       const u = await getUtils(page)
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -590,9 +652,11 @@ test.describe('Editor tests', () => {
     `
         )
       })
-    await page.setViewportSize({ width: 1000, height: 500 })
+      await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
+      await page.waitForTimeout(1000)
 
       await u.openDebugPanel()
       await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -618,7 +682,7 @@ test.describe('Editor tests', () => {
       await page.keyboard.press('ArrowDown')
       await page.keyboard.press('Enter')
       await page.keyboard.type(`extrusion = startSketchOn('XY')
-    |> circle({ center = [0, 0], radius = dia/2 }, %)
+  |> circle({ center: [0, 0], radius: dia/2 }, %)
     |> hole(squareHole(length, width, height), %)
     |> extrude(height, %)`)
 
@@ -631,12 +695,14 @@ test.describe('Editor tests', () => {
 
       // Make sure there are two diagnostics
       await expect(page.locator('.cm-lint-marker-error')).toHaveCount(2)
-  })
+    }
+  )
   test('if your kcl gets an error from the engine it is inlined', async ({
+    context,
     page,
+    homePage,
   }) => {
-    const u = await getUtils(page)
+    await context.addInitScript(async () => {
-    await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `box = startSketchOn('XY')
@@ -654,17 +720,16 @@ test.describe('Editor tests', () => {
     |> line([0, -10], %)
     |> close(%)
     |> revolve({
-  axis = revolveAxis,
+    axis: revolveAxis,
-  angle = 90
+    angle: 90
     }, %)
     `
       )
     })
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await page.goto('/')
+    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
 
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
@@ -675,12 +740,15 @@ test.describe('Editor tests', () => {
     await expect(page.getByText(searchText)).toBeVisible()
   })
   test.describe('Autocomplete works', () => {
-    test('with enter/click to accept the completion', async ({ page }) => {
+    test('with enter/click to accept the completion', async ({
+      page,
+      homePage,
+    }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // tests clicking on an option, selection the first option
       // and arrowing down to an option
@@ -749,12 +817,12 @@ test.describe('Editor tests', () => {
       await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
     })
 
-    test('with tab to accept the completion', async ({ page }) => {
+    test('with tab to accept the completion', async ({ page, homePage }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // this test might be brittle as we add and remove functions
       // but should also be easy to update.
@@ -820,9 +888,13 @@ test.describe('Editor tests', () => {
         |> xLine(5, %) // lin`)
     })
   })
-  test('Can undo a click and point extrude with ctrl+z', async ({ page }) => {
+  test('Can undo a click and point extrude with ctrl+z', async ({
+    page,
+    context,
+    homePage,
+  }) => {
     const u = await getUtils(page)
-    await page.addInitScript(async () => {
+    await context.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
@@ -833,9 +905,9 @@ test.describe('Editor tests', () => {
       )
     })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
     ).not.toBeDisabled()
@@ -894,7 +966,10 @@ test.describe('Editor tests', () => {
   |> close(%)`)
   })
 
-  test('Can undo a sketch modification with ctrl+z', async ({ page }) => {
+  test('Can undo a sketch modification with ctrl+z', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -908,9 +983,9 @@ test.describe('Editor tests', () => {
       )
     })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
     ).not.toBeDisabled()
@@ -937,7 +1012,7 @@ test.describe('Editor tests', () => {
     })
     await page.waitForTimeout(100)
 
-    const startPX = [665, 397]
+    const startPX = [1200 / 2, 500 / 2]
 
     const dragPX = 40
 
@@ -951,9 +1026,9 @@ test.describe('Editor tests', () => {
 
     await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
 
-    // drag startProfieAt handle
+    // drag startProfileAt handle
     await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: startPX[0], y: startPX[1] },
+      sourcePosition: { x: startPX[0] + 68, y: startPX[1] + 147 },
       targetPosition: { x: startPX[0] + dragPX, y: startPX[1] + dragPX },
     })
     await page.waitForTimeout(100)
@@ -991,12 +1066,12 @@ test.describe('Editor tests', () => {
     // expect the code to have changed
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([2.71, -2.71], %)
-  |> line([15.39, -2.78], %)
+    |> line([15.4, -2.78], %)
     |> tangentialArcTo([27.6, -3.05], %)
     |> close(%)
     |> extrude(5, %)
-`)
+  `)
 
     // Hit undo
     await page.keyboard.down('Control')
@@ -1005,8 +1080,8 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([2.71, -2.71], %)
-  |> line([15.39, -2.78], %)
+    |> line([15.4, -2.78], %)
     |> tangentialArcTo([24.95, -0.38], %)
     |> close(%)
     |> extrude(5, %)`)
@@ -1018,12 +1093,12 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([2.71, -2.71], %)
     |> line([12.73, -0.09], %)
     |> tangentialArcTo([24.95, -0.38], %)
     |> close(%)
     |> extrude(5, %)
-`)
+  `)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -1043,10 +1118,8 @@ test.describe('Editor tests', () => {
   test.fixme(
     `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
+    async ({ page, context }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
+      await context.folderSetupFn(async (dir) => {
-        testInfo,
-        folderSetupFn: async (dir) => {
         const bracketDir = join(dir, 'cube')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.copyFile(
@@ -1054,10 +1127,10 @@ test.describe('Editor tests', () => {
           join(bracketDir, 'cube.obj')
         )
         await fsp.writeFile(join(bracketDir, 'main.kcl'), '')
-        },
       })
+
       const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
+      await page.setBodyDimensions(viewportSize)
 
       // Locators and constants
       const u = await getUtils(page)
@@ -1115,8 +1188,6 @@ test.describe('Editor tests', () => {
           })
           .toBeGreaterThan(15)
       })
-
-      await electronApp.close()
     }
   )
 })

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -1,4 +1,4 @@
-import type { Page } from '@playwright/test'
+import type { Page, Locator } from '@playwright/test'
 import { expect } from '@playwright/test'
 
 type CmdBarSerialised =
@@ -26,9 +26,11 @@ type CmdBarSerialised =
 
 export class CmdBarFixture {
   public page: Page
+  cmdBarOpenBtn!: Locator
 
   constructor(page: Page) {
     this.page = page
+    this.cmdBarOpenBtn = page.getByTestId('command-bar-open-button')
   }
   reConstruct = (page: Page) => {
     this.page = page
@@ -116,4 +118,21 @@ export class CmdBarFixture {
       await this.page.keyboard.press('Enter')
     }
   }
+
+  openCmdBar = async (selectCmd?: 'promptToEdit') => {
+    // TODO why does this button not work in electron tests?
+    // await this.cmdBarOpenBtn.click()
+    await this.page.keyboard.down('ControlOrMeta')
+    await this.page.keyboard.press('KeyK')
+    await this.page.keyboard.up('ControlOrMeta')
+    await expect(this.page.getByPlaceholder('Search commands')).toBeVisible()
+    if (selectCmd === 'promptToEdit') {
+      const promptEditCommand = this.page.getByText(
+        'Use Zoo AI to edit your kcl'
+      )
+      await expect(promptEditCommand.first()).toBeVisible()
+      await promptEditCommand.first().scrollIntoViewIfNeeded()
+      await promptEditCommand.first().click()
+    }
+  }
 }

e2e/playwright/fixtures/editorFixture.ts

@@ -29,7 +29,7 @@ export class EditorFixture {
   reConstruct = (page: Page) => {
     this.page = page
 
-    this.codeContent = page.locator('.cm-content')
+    this.codeContent = page.locator('.cm-content[data-language="kcl"]')
     this.diagnosticsTooltip = page.locator('.cm-tooltip-lint')
     this.diagnosticsGutterIcon = page.locator('.cm-lint-marker-error')
     this.activeLine = this.page.locator('.cm-activeLine')
@@ -54,13 +54,13 @@ export class EditorFixture {
         }
       }
       if (!shouldNormalise) {
-        const expectStart = expect(this.codeContent)
+        const expectStart = expect.poll(() => this.codeContent.textContent())
         if (not) {
-          const result = await expectStart.not.toContainText(code, { timeout })
+          const result = await expectStart.not.toContain(code)
           await resetPane()
           return result
         }
-        const result = await expectStart.toContainText(code, { timeout })
+        const result = await expectStart.toContain(code)
         await resetPane()
         return result
       }
@@ -147,4 +147,28 @@ export class EditorFixture {
   openPane() {
     return openPane(this.page, this.paneButtonTestId)
   }
+  scrollToText(text: string, placeCursor?: boolean) {
+    return this.page.evaluate(
+      (args: { text: string; placeCursor?: boolean }) => {
+        // error TS2339: Property 'docView' does not exist on type 'EditorView'.
+        // Except it does so :shrug:
+        // @ts-ignore
+        let index = window.editorManager._editorView?.docView.view.state.doc
+          .toString()
+          .indexOf(args.text)
+        window.editorManager._editorView?.focus()
+        window.editorManager._editorView?.dispatch({
+          selection: window.EditorSelection.create([
+            window.EditorSelection.cursor(index),
+          ]),
+          effects: [
+            window.EditorView.scrollIntoView(
+              window.EditorSelection.range(index, index + 1)
+            ),
+          ],
+        })
+      },
+      { text, placeCursor }
+    )
+  }
 }

e2e/playwright/fixtures/fixtureSetup.ts

@@ -1,11 +1,11 @@
 import type {
   BrowserContext,
   ElectronApplication,
-  Page,
   TestInfo,
+  Page,
 } from '@playwright/test'
-import { test as base } from '@playwright/test'
+
-import { getUtils, setup, setupElectron, tearDown } from '../test-utils'
+import { getUtils, setup, setupElectron } from '../test-utils'
 import fsp from 'fs/promises'
 import { join } from 'path'
 import { CmdBarFixture } from './cmdBarFixture'
@@ -20,11 +20,13 @@ export class AuthenticatedApp {
   public readonly page: Page
   public readonly context: BrowserContext
   public readonly testInfo: TestInfo
-  public readonly viewPortSize = { width: 1000, height: 500 }
+  public readonly viewPortSize = { width: 1200, height: 500 }
+  public electronApp: undefined | ElectronApplication
+  public dir: string = ''
 
   constructor(context: BrowserContext, page: Page, testInfo: TestInfo) {
-    this.page = page
     this.context = context
+    this.page = page
     this.testInfo = testInfo
   }
 
@@ -49,9 +51,7 @@ export class AuthenticatedApp {
   }
 }
 
-interface Fixtures {
+export interface Fixtures {
-  app: AuthenticatedApp
-  tronApp: AuthenticatedTronApp
   cmdBar: CmdBarFixture
   editor: EditorFixture
   toolbar: ToolbarFixture
@@ -61,9 +61,11 @@ interface Fixtures {
 export class AuthenticatedTronApp {
   public readonly _page: Page
   public page: Page
-  public readonly context: BrowserContext
+  public context: BrowserContext
   public readonly testInfo: TestInfo
-  public electronApp?: ElectronApplication
+  public electronApp: ElectronApplication | undefined
+  public readonly viewPortSize = { width: 1200, height: 500 }
+  public dir: string = ''
 
   constructor(context: BrowserContext, page: Page, testInfo: TestInfo) {
     this._page = page
@@ -79,15 +81,22 @@ export class AuthenticatedTronApp {
       appSettings?: Partial<SaveSettingsPayload>
     } = { fixtures: {} }
   ) {
-    const { electronApp, page } = await setupElectron({
+    const { electronApp, page, context, dir } = await setupElectron({
       testInfo: this.testInfo,
       folderSetupFn: arg.folderSetupFn,
       cleanProjectDir: arg.cleanProjectDir,
       appSettings: arg.appSettings,
     })
     this.page = page
+    this.context = context
     this.electronApp = electronApp
-    await page.setViewportSize({ width: 1200, height: 500 })
+    this.dir = dir
+
+    // Easier to access throughout utils
+    this.page.dir = dir
+
+    // Setup localStorage, addCookies, reload
+    await setup(this.context, this.page, this.testInfo)
 
     for (const key of unsafeTypedKeys(arg.fixtures)) {
       const fixture = arg.fixtures[key]
@@ -110,32 +119,20 @@ export class AuthenticatedTronApp {
     })
 }
 
-export const test = base.extend<Fixtures>({
+export const fixtures = {
-  app: async ({ page, context }, use, testInfo) => {
+  cmdBar: async ({ page }: { page: Page }, use: any) => {
-    await use(new AuthenticatedApp(context, page, testInfo))
-  },
-  tronApp: async ({ page, context }, use, testInfo) => {
-    await use(new AuthenticatedTronApp(context, page, testInfo))
-  },
-  cmdBar: async ({ page }, use) => {
     await use(new CmdBarFixture(page))
   },
-  editor: async ({ page }, use) => {
+  editor: async ({ page }: { page: Page }, use: any) => {
     await use(new EditorFixture(page))
   },
-  toolbar: async ({ page }, use) => {
+  toolbar: async ({ page }: { page: Page }, use: any) => {
     await use(new ToolbarFixture(page))
   },
-  scene: async ({ page }, use) => {
+  scene: async ({ page }: { page: Page }, use: any) => {
     await use(new SceneFixture(page))
   },
-  homePage: async ({ page }, use) => {
+  homePage: async ({ page }: { page: Page }, use: any) => {
     await use(new HomePageFixture(page))
   },
-})
+}
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-export { expect } from '@playwright/test'

e2e/playwright/fixtures/homePageFixture.ts

@@ -14,10 +14,14 @@ interface HomePageState {
 export class HomePageFixture {
   public page: Page
 
+  projectSection!: Locator
   projectCard!: Locator
   projectCardTitle!: Locator
   projectCardFile!: Locator
   projectCardFolder!: Locator
+  projectButtonNew!: Locator
+  projectButtonContinue!: Locator
+  projectTextName!: Locator
   sortByDateBtn!: Locator
   sortByNameBtn!: Locator
 
@@ -28,11 +32,19 @@ export class HomePageFixture {
   reConstruct = (page: Page) => {
     this.page = page
 
+    this.projectSection = this.page.getByTestId('home-section')
+
     this.projectCard = this.page.getByTestId('project-link')
     this.projectCardTitle = this.page.getByTestId('project-title')
     this.projectCardFile = this.page.getByTestId('project-file-count')
     this.projectCardFolder = this.page.getByTestId('project-folder-count')
 
+    this.projectButtonNew = this.page.getByTestId('home-new-file')
+    this.projectTextName = this.page.getByTestId('cmd-bar-arg-value')
+    this.projectButtonContinue = this.page.getByRole('button', {
+      name: 'Continue',
+    })
+
     this.sortByDateBtn = this.page.getByTestId('home-sort-by-modified')
     this.sortByNameBtn = this.page.getByTestId('home-sort-by-name')
   }
@@ -91,10 +103,25 @@ export class HomePageFixture {
       .toEqual(expectedState)
   }
 
+  createAndGoToProject = async (projectTitle: string) => {
+    await expect(this.projectSection).not.toHaveText('Loading your Projects...')
+    await this.projectButtonNew.click()
+    await this.projectTextName.click()
+    await this.projectTextName.fill(projectTitle)
+    await this.projectButtonContinue.click()
+  }
+
   openProject = async (projectTitle: string) => {
     const projectCard = this.projectCard.locator(
       this.page.getByText(projectTitle)
     )
     await projectCard.click()
   }
+
+  goToModelingScene = async (name: string = 'testDefault') => {
+    // On web this is a no-op. There is no project view.
+    if (process.env.PLATFORM === 'web') return
+
+    await this.createAndGoToProject(name)
+  }
 }

e2e/playwright/fixtures/sceneFixture.ts

@@ -54,8 +54,9 @@ export class SceneFixture {
 
   expectState = async (expected: SceneSerialised) => {
     return expect
-      .poll(() => this._serialiseScene(), {
+      .poll(async () => await this._serialiseScene(), {
-        message: `Expected scene state to match`,
+        intervals: [1_000, 2_000, 10_000],
+        timeout: 60000,
       })
       .toEqual(expected)
   }
@@ -193,7 +194,10 @@ export class SceneFixture {
         type: 'default_camera_get_settings',
       },
     })
-    await this.waitForExecutionDone()
+    await this.page
+      .locator(`[data-receive-command-type="default_camera_get_settings"]`)
+      .first()
+      .waitFor()
     const position = await Promise.all([
       this.page.getByTestId('cam-x-position').inputValue().then(Number),
       this.page.getByTestId('cam-y-position').inputValue().then(Number),
@@ -228,6 +232,7 @@ export class SceneFixture {
   }
 
   async clickGizmoMenuItem(name: string) {
+    await this.gizmo.hover()
     await this.gizmo.click({ button: 'right' })
     const buttonToTest = this.page.getByRole('button', {
       name: name,

e2e/playwright/fixtures/toolbarFixture.ts

@@ -1,5 +1,5 @@
 import type { Page, Locator } from '@playwright/test'
-import { expect } from './fixtureSetup'
+import { expect } from '../zoo-test'
 import { doAndWaitForImageDiff } from '../test-utils'
 
 export class ToolbarFixture {

e2e/playwright/machines.spec.ts

@@ -1,29 +1,22 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import { setupElectron, tearDown, executorInputPath } from './test-utils'
+import { executorInputPath } from './test-utils'
 import { join } from 'path'
 import fsp from 'fs/promises'
 
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test(
   'When machine-api server not found butt is disabled and shows the reason',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ context, page }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
+    await context.folderSetupFn(async (dir) => {
-      testInfo,
-      folderSetupFn: async (dir) => {
       const bracketDir = join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
         executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         join(bracketDir, 'main.kcl')
       )
-      },
     })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     await expect(page.getByText('bracket')).toBeVisible()
 
@@ -47,28 +40,23 @@ test(
     // that the machine-api server is not found
     await makeButton.hover()
     await expect(page.getByText(notFoundText).first()).toBeVisible()
-
-    await electronApp.close()
   }
 )
 
 test(
   'When machine-api server not found home screen & project status shows the reason',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ context, page }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
+    await context.folderSetupFn(async (dir) => {
-      testInfo,
-      folderSetupFn: async (dir) => {
       const bracketDir = join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
         executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         join(bracketDir, 'main.kcl')
       )
-      },
     })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     const notFoundText = 'Machine API server was not discovered'
 
@@ -91,7 +79,5 @@ test(
 
     await networkMachineToggle.hover()
     await expect(page.getByText(notFoundText).nth(1)).toBeVisible()
-
-    await electronApp.close()
   }
 )

e2e/playwright/null.spec.ts

@@ -0,0 +1,12 @@
+// These tests are meant to simply test starting and stopping the electron
+// application, check it can make it to the project pane, and nothing more.
+// It also tests our test wrappers are working.
+// Additionally this serves as a nice minimal example.
+
+import { test, expect } from './zoo-test'
+
+test.describe('Open the application', () => {
+  test('see the project view', async ({ page, context }) => {
+    await expect(page.getByTestId('home-section')).toBeVisible()
+  })
+})

e2e/playwright/onboarding-tests.spec.ts

@@ -1,86 +1,78 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 import { join } from 'path'
 import fsp from 'fs/promises'
-import {
+import { getUtils, executorInputPath, createProject } from './test-utils'
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-  createProject,
-} from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import {
   TEST_SETTINGS_KEY,
   TEST_SETTINGS_ONBOARDING_START,
   TEST_SETTINGS_ONBOARDING_EXPORT,
-  TEST_SETTINGS_ONBOARDING_PARAMETRIC_MODELING,
   TEST_SETTINGS_ONBOARDING_USER_MENU,
 } from './storageStates'
 import * as TOML from '@iarna/toml'
 import { expectPixelColor } from './fixtures/sceneFixture'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
+// Because onboarding relies on an app setting we need to set it as incompletel
-  if (testInfo.tags.includes('@electron')) {
+// for all these tests.
-    return
-  }
-  await setup(context, page)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Onboarding tests', () => {
-  test('Onboarding code is shown in the editor', async ({ page }) => {
-    const u = await getUtils(page)
-
-    // Override beforeEach test setup
-    await page.addInitScript(
-      async ({ settingsKey }) => {
-        // Give no initial code, so that the onboarding start is shown immediately
-        localStorage.removeItem('persistCode')
-        localStorage.removeItem(settingsKey)
-      },
-      { settingsKey: TEST_SETTINGS_KEY }
-    )
-
-    await page.setViewportSize({ width: 1200, height: 1000 })
-
-    await u.waitForAuthSkipAppStart()
-
-    // Test that the onboarding pane loaded
-    await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
-
-    // *and* that the code is shown in the editor
-    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
-
-    // Make sure the model loaded
-    const XYPlanePoint = { x: 774, y: 116 } as const
-    const modelColor: [number, number, number] = [45, 45, 45]
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    expect(await u.getGreatestPixDiff(XYPlanePoint, modelColor)).toBeLessThan(8)
-  })
-
   test(
-    'Desktop: fresh onboarding executes and loads',
+    'Onboarding code is shown in the editor',
-    { tag: '@electron' },
+    {
-    async ({ browserName: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
       appSettings: {
         app: {
           onboardingStatus: 'incomplete',
         },
       },
       cleanProjectDir: true,
-      })
+    },
+    async ({ context, page, homePage }) => {
+      const u = await getUtils(page)
+      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await homePage.goToModelingScene()
 
+      // Test that the onboarding pane loaded
+      await expect(
+        page.getByText('Welcome to Modeling App! This')
+      ).toBeVisible()
+
+      // Test that the onboarding pane loaded
+      await expect(
+        page.getByText('Welcome to Modeling App! This')
+      ).toBeVisible()
+
+      // *and* that the code is shown in the editor
+      await expect(page.locator('.cm-content')).toContainText(
+        '// Shelf Bracket'
+      )
+
+      // Make sure the model loaded
+      const XYPlanePoint = { x: 774, y: 116 } as const
+      const modelColor: [number, number, number] = [45, 45, 45]
+      await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
+      expect(await u.getGreatestPixDiff(XYPlanePoint, modelColor)).toBeLessThan(
+        8
+      )
+    }
+  )
+
+  test(
+    'Desktop: fresh onboarding executes and loads',
+    {
+      tag: '@electron',
+      appSettings: {
+        app: {
+          onboardingStatus: 'incomplete',
+        },
+      },
+      cleanProjectDir: true,
+    },
+    async ({ page, homePage }, testInfo) => {
       const u = await getUtils(page)
 
-      const viewportSize = { width: 1200, height: 1000 }
+      const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
+      await page.setBodyDimensions(viewportSize)
 
       await test.step(`Create a project and open to the onboarding`, async () => {
         await createProject({ name: 'project-link', page })
@@ -108,66 +100,71 @@ test.describe('Onboarding tests', () => {
 
         //await expectPixelColor(page, modelColor, XYPlanePoint, 8)
       })
-
-      await electronApp.close()
     }
   )
 
-  test('Code resets after confirmation', async ({ page }) => {
+  test(
+    'Code resets after confirmation',
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: 'incomplete',
+        },
+      },
+      cleanProjectDir: true,
+    },
+    async ({ context, page, homePage }) => {
       const initialCode = `sketch001 = startSketchOn('XZ')`
 
       // Load the page up with some code so we see the confirmation warning
       // when we go to replay onboarding
-    await page.addInitScript((code) => {
+      await context.addInitScript((code) => {
         localStorage.setItem('persistCode', code)
       }, initialCode)
 
-    const u = await getUtils(page)
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-    await page.setViewportSize({ width: 1200, height: 1000 })
+      await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
 
       // Replay the onboarding
       await page.getByRole('link', { name: 'Settings' }).last().click()
-    const replayButton = page.getByRole('button', { name: 'Replay onboarding' })
+      const replayButton = page.getByRole('button', {
+        name: 'Replay onboarding',
+      })
       await expect(replayButton).toBeVisible()
       await replayButton.click()
 
       // Ensure we see the warning, and that the code has not yet updated
-    await expect(
+      await expect(page.getByText('Would you like to create')).toBeVisible()
-      page.getByText('Replaying onboarding resets your code')
-    ).toBeVisible()
       await expect(page.locator('.cm-content')).toHaveText(initialCode)
 
       const nextButton = page.getByTestId('onboarding-next')
-    await expect(nextButton).toBeVisible()
+      await nextButton.hover()
       await nextButton.click()
 
       // Ensure we see the introduction and that the code has been reset
       await expect(page.getByText('Welcome to Modeling App!')).toBeVisible()
-    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
+      await expect(page.locator('.cm-content')).toContainText(
+        '// Shelf Bracket'
+      )
 
-    // Ensure we persisted the code to local storage.
+      // There used to be old code here that checked if we stored the reset
-    // Playwright's addInitScript method unfortunately will reset
+      // code into localStorage but that isn't the case on desktop. It gets
-    // this code if we try reloading the page as a test,
+      // saved to the file system, which we have other tests for.
-    // so this is our best way to test persistence afaik.
+    }
-    expect(
+  )
-      await page.evaluate(() => {
-        return localStorage.getItem('persistCode')
-      })
-    ).toContain('// Shelf Bracket')
-
-    // Make sure the model loaded
-    const XYPlanePoint = { x: 986, y: 522 } as const
-    const modelColor: [number, number, number] = [76, 76, 76]
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    await expectPixelColor(page, modelColor, XYPlanePoint, 8)
-  })
-
-  test('Click through each onboarding step', async ({ page }) => {
-    const u = await getUtils(page)
 
+  test(
+    'Click through each onboarding step',
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: 'incomplete',
+        },
+      },
+    },
+    async ({ context, page, homePage }) => {
       // Override beforeEach test setup
-    await page.addInitScript(
+      await context.addInitScript(
         async ({ settingsKey, settings }) => {
           // Give no initial code, so that the onboarding start is shown immediately
           localStorage.setItem('persistCode', '')
@@ -175,118 +172,113 @@ test.describe('Onboarding tests', () => {
         },
         {
           settingsKey: TEST_SETTINGS_KEY,
-        settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_START }),
+          settings: TOML.stringify({
+            settings: TEST_SETTINGS_ONBOARDING_START,
+          }),
         }
       )
 
-    await page.setViewportSize({ width: 1200, height: 1080 })
+      await page.setBodyDimensions({ width: 1200, height: 1080 })
-
+      await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
 
       // Test that the onboarding pane loaded
-    await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
+      await expect(
+        page.getByText('Welcome to Modeling App! This')
+      ).toBeVisible()
 
       const nextButton = page.getByTestId('onboarding-next')
 
       while ((await nextButton.innerText()) !== 'Finish') {
-      await expect(nextButton).toBeVisible()
+        await nextButton.hover()
         await nextButton.click()
       }
 
       // Finish the onboarding
-    await expect(nextButton).toBeVisible()
+      await nextButton.hover()
       await nextButton.click()
 
       // Test that the onboarding pane is gone
       await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
-    await expect(page.url()).not.toContain('onboarding')
+      await expect.poll(() => page.url()).not.toContain('/onboarding')
-
-    await u.openAndClearDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // TODO: jess to fix
-    // Make sure the model loaded
-    //const XYPlanePoint = { x: 774, y: 516 } as const
-    // const modelColor: [number, number, number] = [129, 129, 129]
-    // await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    // await expectPixelColor(page, modelColor, XYPlanePoint, 20)
-  })
-
-  test('Onboarding redirects and code updating', async ({ page }) => {
-    const u = await getUtils(page)
-
-    // Override beforeEach test setup
-    await page.addInitScript(
-      async ({ settingsKey, settings }) => {
-        // Give some initial code, so we can test that it's cleared
-        localStorage.setItem('persistCode', 'sigmaAllow = 15000')
-        localStorage.setItem(settingsKey, settings)
-      },
-      {
-        settingsKey: TEST_SETTINGS_KEY,
-        settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_EXPORT }),
     }
   )
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+  test(
+    'Onboarding redirects and code updating',
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: '/export',
+        },
+      },
+      cleanProjectDir: true,
+    },
+    async ({ context, page, homePage }) => {
+      const originalCode = 'sigmaAllow = 15000'
 
-    await u.waitForAuthSkipAppStart()
-
-    // Test that the redirect happened
-    await expect(page.url().split(':3000').slice(-1)[0]).toBe(
-      `/file/%2Fbrowser%2Fmain.kcl/onboarding/export`
-    )
-
-    // Test that you come back to this page when you refresh
-    await page.reload()
-    await expect(page.url().split(':3000').slice(-1)[0]).toBe(
-      `/file/%2Fbrowser%2Fmain.kcl/onboarding/export`
-    )
-
-    // Test that the onboarding pane loaded
-    const title = page.locator('[data-testid="onboarding-content"]')
-    await expect(title).toBeAttached()
-
-    // Test that the code changes when you advance to the next step
-    await page.locator('[data-testid="onboarding-next"]').click()
-    await expect(page.locator('.cm-content')).toHaveText('')
-
-    // Test that the code is not empty when you click on the next step
-    await page.locator('[data-testid="onboarding-next"]').click()
-    await expect(page.locator('.cm-content')).toHaveText(/.+/)
-  })
-
-  test('Onboarding code gets reset to demo on Interactive Numbers step', async ({
-    page,
-  }) => {
-    test.skip(
-      process.platform === 'darwin',
-      "Skip on macOS, because Playwright isn't behaving the same as the actual browser"
-    )
-    const u = await getUtils(page)
-    const badCode = `// This is bad code we shouldn't see`
       // Override beforeEach test setup
-    await page.addInitScript(
+      await context.addInitScript(
-      async ({ settingsKey, settings, badCode }) => {
+        async ({ settingsKey, settings }) => {
-        localStorage.setItem('persistCode', badCode)
+          // Give some initial code, so we can test that it's cleared
+          localStorage.setItem('persistCode', originalCode)
           localStorage.setItem(settingsKey, settings)
         },
         {
           settingsKey: TEST_SETTINGS_KEY,
           settings: TOML.stringify({
-          settings: TEST_SETTINGS_ONBOARDING_PARAMETRIC_MODELING,
+            settings: TEST_SETTINGS_ONBOARDING_EXPORT,
           }),
-        badCode,
         }
       )
 
-    await page.setViewportSize({ width: 1200, height: 1080 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
-    await page.waitForURL('**' + onboardingPaths.PARAMETRIC_MODELING, {
+      // Test that the redirect happened
-      waitUntil: 'domcontentloaded',
+      await expect.poll(() => page.url()).toContain('/onboarding/export')
-    })
+
+      // Test that you come back to this page when you refresh
+      await page.reload()
+      await expect.poll(() => page.url()).toContain('/onboarding/export')
+
+      // Test that the code changes when you advance to the next step
+      await page.getByTestId('onboarding-next').hover()
+      await page.getByTestId('onboarding-next').click()
+
+      // Test that the onboarding pane loaded
+      const title = page.locator('[data-testid="onboarding-content"]')
+      await expect(title).toBeAttached()
+
+      await expect(page.locator('.cm-content')).not.toHaveText(originalCode)
+
+      // Test that the code is not empty when you click on the next step
+      await page.locator('[data-testid="onboarding-next"]').hover()
+      await page.locator('[data-testid="onboarding-next"]').click()
+      await expect(page.locator('.cm-content')).toHaveText(/.+/)
+    }
+  )
+
+  test(
+    'Onboarding code gets reset to demo on Interactive Numbers step',
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: '/parametric-modeling',
+        },
+      },
+      cleanProjectDir: true,
+    },
+
+    async ({ context, page, homePage }) => {
+      const u = await getUtils(page)
+      const badCode = `// This is bad code we shouldn't see`
+
+      await page.setBodyDimensions({ width: 1200, height: 1080 })
+      await homePage.goToModelingScene()
+
+      await expect
+        .poll(() => page.url())
+        .toContain(onboardingPaths.PARAMETRIC_MODELING)
 
       const bracketNoNewLines = bracket.replace(/\n/g, '')
 
@@ -302,6 +294,7 @@ test.describe('Onboarding tests', () => {
       await expect(u.codeLocator).toHaveText(badCode)
 
       // Click to the next step
+      await page.locator('[data-testid="onboarding-next"]').hover()
       await page.locator('[data-testid="onboarding-next"]').click()
       await page.waitForURL('**' + onboardingPaths.INTERACTIVE_NUMBERS, {
         waitUntil: 'domcontentloaded',
@@ -309,13 +302,25 @@ test.describe('Onboarding tests', () => {
 
       // Check that the code has been reset
       await expect(u.codeLocator).toHaveText(bracketNoNewLines)
-  })
+    }
+  )
 
-  test('Avatar text updates depending on image load success', async ({
+  // (lee) The two avatar tests are weird because even on main, we don't have
-    page,
+  // anything to do with the avatar inside the onboarding test. Due to the
-  }) => {
+  // low impact of an avatar not showing I'm changing this to fixme.
+  test.fixme(
+    'Avatar text updates depending on image load success',
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: 'incomplete',
+        },
+      },
+      cleanProjectDir: true,
+    },
+    async ({ context, page, homePage }) => {
       // Override beforeEach test setup
-    await page.addInitScript(
+      await context.addInitScript(
         async ({ settingsKey, settings }) => {
           localStorage.setItem(settingsKey, settings)
         },
@@ -327,11 +332,8 @@ test.describe('Onboarding tests', () => {
         }
       )
 
-    const u = await getUtils(page)
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
-
-    await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
 
       // Test that the text in this step is correct
       const avatarLocator = await page
@@ -359,13 +361,16 @@ test.describe('Onboarding tests', () => {
       })
 
       // 404 the CI avatar image
-    await page.route('https://lh3.googleusercontent.com/**', async (route) => {
+      await page.route(
+        'https://lh3.googleusercontent.com/**',
+        async (route) => {
           await route.fulfill({
             status: 404,
             contentType: 'text/plain',
             body: 'Not Found!',
           })
-    })
+        }
+      )
 
       await page.reload({ waitUntil: 'domcontentloaded' })
 
@@ -373,13 +378,22 @@ test.describe('Onboarding tests', () => {
       await expect(avatarLocator).not.toBeVisible()
       await expect(onboardingOverlayLocator).toBeVisible()
       await expect(onboardingOverlayLocator).toContainText('the menu button')
-  })
+    }
+  )
 
-  test("Avatar text doesn't mention avatar when no avatar", async ({
+  test.fixme(
-    page,
+    "Avatar text doesn't mention avatar when no avatar",
-  }) => {
+    {
+      appSettings: {
+        app: {
+          onboardingStatus: 'incomplete',
+        },
+      },
+      cleanProjectDir: true,
+    },
+    async ({ context, page, homePage }) => {
       // Override beforeEach test setup
-    await page.addInitScript(
+      await context.addInitScript(
         async ({ settingsKey, settings }) => {
           localStorage.setItem(settingsKey, settings)
           localStorage.setItem('FORCE_NO_IMAGE', 'FORCE_NO_IMAGE')
@@ -392,11 +406,8 @@ test.describe('Onboarding tests', () => {
         }
       )
 
-    const u = await getUtils(page)
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await homePage.goToModelingScene()
-    await u.waitForAuthSkipAppStart()
-
-    await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
 
       // Test that the text in this step is correct
       const sidebar = page.getByTestId('user-sidebar-toggle')
@@ -422,23 +433,28 @@ test.describe('Onboarding tests', () => {
       for (const feature of userMenuFeatures) {
         await expect(onboardingOverlayLocator).toContainText(feature)
       }
-  })
+    }
+  )
 })
 
 test(
   'Restarting onboarding on desktop takes one attempt',
-  { tag: '@electron' },
+  {
-  async ({ browser: _ }, testInfo) => {
+    appSettings: {
-    const { electronApp, page } = await setupElectron({
+      app: {
-      testInfo,
+        onboardingStatus: 'dismissed',
-      folderSetupFn: async (dir) => {
+      },
+    },
+    cleanProjectDir: true,
+  },
+  async ({ context, page, homePage }, testInfo) => {
+    await context.folderSetupFn(async (dir) => {
       const routerTemplateDir = join(dir, 'router-template-slate')
       await fsp.mkdir(routerTemplateDir, { recursive: true })
       await fsp.copyFile(
         executorInputPath('router-template-slate.kcl'),
         join(routerTemplateDir, 'main.kcl')
       )
-      },
     })
 
     // Our constants
@@ -450,9 +466,8 @@ test(
     const restartOnboardingButton = page.getByRole('button', {
       name: 'Reset onboarding',
     })
-    const restartConfirmationButton = page.getByRole('button', {
+    const nextButton = page.getByTestId('onboarding-next')
-      name: 'Make a new project',
+
-    })
     const tutorialProjectIndicator = page
       .getByTestId('project-sidebar-toggle')
       .filter({ hasText: 'Tutorial Project 00' })
@@ -471,7 +486,7 @@ test(
     })
 
     await test.step('Navigate into project', async () => {
-      await page.setViewportSize({ width: 1200, height: 1000 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
       page.on('console', console.log)
 
@@ -487,8 +502,8 @@ test(
       await helpMenuButton.click()
       await restartOnboardingButton.click()
 
-      await expect(restartConfirmationButton).toBeVisible()
+      await nextButton.hover()
-      await restartConfirmationButton.click()
+      await nextButton.click()
     })
 
     await test.step('Confirm that the onboarding has restarted', async () => {
@@ -520,11 +535,9 @@ test(
 
       await restartOnboardingSettingsButton.click()
       // Since the code is empty, we should not see the confirmation dialog
-      await expect(restartConfirmationButton).not.toBeVisible()
+      await expect(nextButton).not.toBeVisible()
       await expect(tutorialProjectIndicator).toBeVisible()
       await expect(tutorialModalText).toBeVisible()
     })
-
-    await electronApp.close()
   }
 )

e2e/playwright/point-click.spec.ts

@@ -1,20 +1,36 @@
-import { test, expect, AuthenticatedApp } from './fixtures/fixtureSetup'
+import { test, expect, Page } from './zoo-test'
 import { EditorFixture } from './fixtures/editorFixture'
 import { SceneFixture } from './fixtures/sceneFixture'
 import { ToolbarFixture } from './fixtures/toolbarFixture'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { getUtils } from './test-utils'
 
 // test file is for testing point an click code gen functionality that's not sketch mode related
 
-test(
+test('verify extruding circle works', async ({
-  'verify extruding circle works',
+  context,
-  { tag: ['@skipWin'] },
+  homePage,
-  async ({ app, cmdBar, editor, toolbar, scene }) => {
+  cmdBar,
-    test.skip(
+  editor,
-      process.platform === 'win32',
+  toolbar,
-      'Fails on windows in CI, can not be replicated locally on windows.'
+  scene,
+}) => {
+  // TODO: fix this test on windows after the electron migration
+  test.skip(process.platform === 'win32', 'Skip on windows')
+  const file = await fs.readFile(
+    path.resolve(
+      __dirname,
+      '../../',
+      './src/wasm-lib/tests/executor/inputs/test-circle-extrude.kcl'
+    ),
+    'utf-8'
   )
-    const file = await app.getInputFile('test-circle-extrude.kcl')
+  await context.addInitScript((file) => {
-    await app.initialise(file)
+    localStorage.setItem('persistCode', file)
+  }, file)
+  await homePage.goToModelingScene()
+
   const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)
 
   await test.step('because there is sweepable geometry, verify extrude is enable when nothing is selected', async () => {
@@ -27,7 +43,17 @@ test(
     const circleSnippet =
       'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
     await editor.expectState({
-        activeLines: [],
+      activeLines: ["constsketch002=startSketchOn('XZ')"],
+      highlightedCode: circleSnippet,
+      diagnostics: [],
+    })
+
+    await test.step('check code model connection works and that button is still enable once circle is selected ', async () => {
+      await moveToCircle()
+      const circleSnippet =
+        'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
+      await editor.expectState({
+        activeLines: ["constsketch002=startSketchOn('XZ')"],
         highlightedCode: circleSnippet,
         diagnostics: [],
       })
@@ -40,6 +66,8 @@ test(
       })
       await expect(toolbar.extrudeButton).toBeEnabled()
     })
+    await expect(toolbar.extrudeButton).toBeEnabled()
+  })
 
   await test.step('do extrude flow and check extrude code is added to editor', async () => {
     await toolbar.extrudeButton.click()
@@ -66,13 +94,14 @@ test(
 
     await editor.expectEditor.toContain(expectString)
   })
-  }
+})
-)
 
 test.describe('verify sketch on chamfer works', () => {
+  // TODO: fix this test on windows after the electron migration
+  test.skip(process.platform === 'win32', 'Skip on windows')
   const _sketchOnAChamfer =
     (
-      app: AuthenticatedApp,
+      page: Page,
       editor: EditorFixture,
       toolbar: ToolbarFixture,
       scene: SceneFixture
@@ -124,7 +153,7 @@ test.describe('verify sketch on chamfer works', () => {
         await toolbar.startSketchPlaneSelection()
         await clickChamfer()
         // timeout wait for engine animation is unavoidable
-        await app.page.waitForTimeout(600)
+        await page.waitForTimeout(1000)
         await editor.expectEditor.toContain(afterChamferSelectSnippet)
       })
       await test.step('make sure a basic sketch can be added', async () => {
@@ -152,18 +181,29 @@ test.describe('verify sketch on chamfer works', () => {
         })
       })
     }
-  test(
+  test('works on all edge selections and can break up multi edges in a chamfer array', async ({
-    'works on all edge selections and can break up multi edges in a chamfer array',
+    context,
-    { tag: ['@skipWin'] },
+    page,
-    async ({ app, editor, toolbar, scene }) => {
+    homePage,
-      test.skip(
+    editor,
-        process.platform === 'win32',
+    toolbar,
-        'Fails on windows in CI, can not be replicated locally on windows.'
+    scene,
+  }) => {
+    const file = await fs.readFile(
+      path.resolve(
+        __dirname,
+        '../../',
+        './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
+      ),
+      'utf-8'
     )
-      const file = await app.getInputFile('e2e-can-sketch-on-chamfer.kcl')
+    await context.addInitScript((file) => {
-      await app.initialise(file)
+      localStorage.setItem('persistCode', file)
+    }, file)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
 
-      const sketchOnAChamfer = _sketchOnAChamfer(app, editor, toolbar, scene)
+    const sketchOnAChamfer = _sketchOnAChamfer(page, editor, toolbar, scene)
 
     await sketchOnAChamfer({
       clickCoords: { x: 570, y: 220 },
@@ -177,8 +217,7 @@ test.describe('verify sketch on chamfer works', () => {
       getOppositeEdge(seg01)
     ]}, %)`,
 
-        afterChamferSelectSnippet:
+      afterChamferSelectSnippet: 'sketch002 = startSketchOn(extrude001, seg03)',
-          'sketch002 = startSketchOn(extrude001, seg03)',
       afterRectangle1stClickSnippet:
         'startProfileAt([205.96, 254.59], sketch002)',
       afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
@@ -204,8 +243,7 @@ test.describe('verify sketch on chamfer works', () => {
          ]
        }, %)`,
 
-        afterChamferSelectSnippet:
+      afterChamferSelectSnippet: 'sketch003 = startSketchOn(extrude001, seg04)',
-          'sketch003 = startSketchOn(extrude001, seg04)',
       afterRectangle1stClickSnippet:
         'startProfileAt([-209.64, 255.28], sketch003)',
       afterRectangle2ndClickSnippet: `angledLine([0,11.56],%,$rectangleSegmentA003)
@@ -226,8 +264,7 @@ test.describe('verify sketch on chamfer works', () => {
            getNextAdjacentEdge(seg02)
          ]
        }, %)`,
-        afterChamferSelectSnippet:
+      afterChamferSelectSnippet: 'sketch004 = startSketchOn(extrude001, seg05)',
-          'sketch004 = startSketchOn(extrude001, seg05)',
       afterRectangle1stClickSnippet:
         'startProfileAt([82.57, 322.96], sketch004)',
       afterRectangle2ndClickSnippet: `angledLine([0,11.16],%,$rectangleSegmentA004)
@@ -245,8 +282,7 @@ test.describe('verify sketch on chamfer works', () => {
          length = 30,
          tags = [getNextAdjacentEdge(yo)]
        }, %)`,
-        afterChamferSelectSnippet:
+      afterChamferSelectSnippet: 'sketch005 = startSketchOn(extrude001, seg06)',
-          'sketch005 = startSketchOn(extrude001, seg06)',
       afterRectangle1stClickSnippet:
         'startProfileAt([-23.43, 19.69], sketch005)',
       afterRectangle2ndClickSnippet: `angledLine([0,9.1],%,$rectangleSegmentA005)
@@ -341,23 +377,31 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
         { shouldNormalise: true }
       )
     })
-    }
+  })
-  )
 
-  test(
+  test('Works on chamfers that are non in a pipeExpression can break up multi edges in a chamfer array', async ({
-    'Works on chamfers that are non in a pipeExpression can break up multi edges in a chamfer array',
+    context,
-    { tag: ['@skipWin'] },
+    page,
-    async ({ app, editor, toolbar, scene }) => {
+    homePage,
-      test.skip(
+    editor,
-        process.platform === 'win32',
+    toolbar,
-        'Fails on windows in CI, can not be replicated locally on windows.'
+    scene,
+  }) => {
+    const file = await fs.readFile(
+      path.resolve(
+        __dirname,
+        '../../',
+        './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl'
+      ),
+      'utf-8'
     )
-      const file = await app.getInputFile(
+    await context.addInitScript((file) => {
-        'e2e-can-sketch-on-chamfer-no-pipeExpr.kcl'
+      localStorage.setItem('persistCode', file)
-      )
+    }, file)
-      await app.initialise(file)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
 
-      const sketchOnAChamfer = _sketchOnAChamfer(app, editor, toolbar, scene)
+    const sketchOnAChamfer = _sketchOnAChamfer(page, editor, toolbar, scene)
 
     await sketchOnAChamfer({
       clickCoords: { x: 570, y: 220 },
@@ -371,8 +415,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
       getOppositeEdge(seg01)
     ]}, extrude001)`,
       beforeChamferSnippetEnd: '}, extrude001)',
-        afterChamferSelectSnippet:
+      afterChamferSelectSnippet: 'sketch002 = startSketchOn(extrude001, seg03)',
-          'sketch002 = startSketchOn(extrude001, seg03)',
       afterRectangle1stClickSnippet:
         'startProfileAt([205.96, 254.59], sketch002)',
       afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
@@ -424,48 +467,54 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
 `,
       { shouldNormalise: true }
     )
-    }
+  })
-  )
 })
 
 test(`Verify axis, origin, and horizontal snapping`, async ({
-  app,
+  page,
+  homePage,
   editor,
   toolbar,
   scene,
 }) => {
+  const viewPortSize = { width: 1200, height: 500 }
+
+  await page.setBodyDimensions(viewPortSize)
+
+  await homePage.goToModelingScene()
+
   // Constants and locators
   // These are mappings from screenspace to KCL coordinates,
   // until we merge in our coordinate system helpers
   const xzPlane = [
-    app.viewPortSize.width * 0.65,
+    viewPortSize.width * 0.65,
-    app.viewPortSize.height * 0.3,
+    viewPortSize.height * 0.3,
   ] as const
   const originSloppy = {
     screen: [
-      app.viewPortSize.width / 2 + 3, // 3px off the center of the screen
+      viewPortSize.width / 2 + 3, // 3px off the center of the screen
-      app.viewPortSize.height / 2,
+      viewPortSize.height / 2,
     ],
     kcl: [0, 0],
   } as const
   const xAxisSloppy = {
     screen: [
-      app.viewPortSize.width * 0.75,
+      viewPortSize.width * 0.75,
-      app.viewPortSize.height / 2 - 3, // 3px off the X-axis
+      viewPortSize.height / 2 - 3, // 3px off the X-axis
     ],
-    kcl: [16.95, 0],
+    kcl: [20.34, 0],
   } as const
   const offYAxis = {
     screen: [
-      app.viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
+      viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
-      app.viewPortSize.height * 0.3,
+      viewPortSize.height * 0.3,
     ],
-    kcl: [6.78, 6.78],
+    kcl: [8.14, 6.78],
   } as const
   const yAxisSloppy = {
     screen: [
-      app.viewPortSize.width / 2 + 5, // 5px off the Y-axis
+      viewPortSize.width / 2 + 5, // 5px off the Y-axis
-      app.viewPortSize.height * 0.3,
+      viewPortSize.height * 0.3,
     ],
     kcl: [0, 6.78],
   } as const
@@ -486,15 +535,13 @@ test(`Verify axis, origin, and horizontal snapping`, async ({
     afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], sketch001)`,
   }
 
-  await app.initialise()
-
   await test.step(`Start a sketch on the XZ plane`, async () => {
     await editor.closePane()
     await toolbar.startSketchPlaneSelection()
     await moveToXzPlane()
     await clickOnXzPlane()
     // timeout wait for engine animation is unavoidable
-    await app.page.waitForTimeout(600)
+    await page.waitForTimeout(600)
     await editor.expectEditor.toContain(expectedCodeSnippets.sketchOnXzPlane)
   })
   await test.step(`Place a point a few pixels off the middle, verify it still snaps to 0,0`, async () => {
@@ -529,11 +576,15 @@ test(`Verify axis, origin, and horizontal snapping`, async ({
 })
 
 test(`Verify user can double-click to edit a sketch`, async ({
-  app,
+  context,
+  page,
+  homePage,
   editor,
   toolbar,
   scene,
 }) => {
+  const u = await getUtils(page)
+
   const initialCode = `closedSketch = startSketchOn('XZ')
   |> circle({ center = [8, 5], radius = 2 }, %)
 openSketch = startSketchOn('XY')
@@ -542,15 +593,24 @@ openSketch = startSketchOn('XY')
   |> xLine(5, %)
   |> tangentialArcTo([10, 0], %)
 `
-  await app.initialise(initialCode)
+  const viewPortSize = { width: 1000, height: 500 }
+  await page.setBodyDimensions(viewPortSize)
+
+  await context.addInitScript((code) => {
+    localStorage.setItem('persistCode', code)
+  }, initialCode)
+
+  await homePage.goToModelingScene()
+  await u.waitForPageLoad()
+  await page.waitForTimeout(1000)
 
   const pointInsideCircle = {
-    x: app.viewPortSize.width * 0.63,
+    x: viewPortSize.width * 0.63,
-    y: app.viewPortSize.height * 0.5,
+    y: viewPortSize.height * 0.5,
   }
   const pointOnPathAfterSketching = {
-    x: app.viewPortSize.width * 0.58,
+    x: viewPortSize.width * 0.65,
-    y: app.viewPortSize.height * 0.5,
+    y: viewPortSize.height * 0.5,
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_clickOpenPath, moveToOpenPath, dblClickOpenPath] =
@@ -583,41 +643,59 @@ openSketch = startSketchOn('XY')
       diagnostics: [],
     })
   })
+  await page.waitForTimeout(1000)
 
   await exitSketch()
+  await page.waitForTimeout(1000)
+
+  // Drag the sketch line out of the axis view which blocks the click
+  await page.dragAndDrop('#stream', '#stream', {
+    sourcePosition: {
+      x: viewPortSize.width * 0.7,
+      y: viewPortSize.height * 0.5,
+    },
+    targetPosition: {
+      x: viewPortSize.width * 0.7,
+      y: viewPortSize.height * 0.4,
+    },
+  })
+
+  await page.waitForTimeout(500)
 
   await test.step(`Double-click on the open sketch`, async () => {
     await moveToOpenPath()
     await scene.expectPixelColor([250, 250, 250], pointOnPathAfterSketching, 15)
     // There is a full execution after exiting sketch that clears the scene.
-    await app.page.waitForTimeout(500)
+    await page.waitForTimeout(500)
     await dblClickOpenPath()
     await expect(toolbar.startSketchBtn).not.toBeVisible()
     await expect(toolbar.exitSketchBtn).toBeVisible()
     // Wait for enter sketch mode to complete
-    await app.page.waitForTimeout(500)
+    await page.waitForTimeout(500)
     await editor.expectState({
-      activeLines: [`|>xLine(5,%)`],
+      activeLines: [`|>tangentialArcTo([10,0],%)`],
-      highlightedCode: 'xLine(5,%)',
+      highlightedCode: 'tangentialArcTo([10,0],%)',
       diagnostics: [],
     })
   })
 })
 
 test(`Offset plane point-and-click`, async ({
-  app,
+  context,
+  page,
+  homePage,
   scene,
   editor,
   toolbar,
   cmdBar,
 }) => {
-  await app.initialise()
-
   // One dumb hardcoded screen pixel value
   const testPoint = { x: 700, y: 150 }
   const [clickOnXzPlane] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
   const expectedOutput = `plane001 = offsetPlane('XZ', 5)`
 
+  await homePage.goToModelingScene()
+
   await test.step(`Look for the blue of the XZ plane`, async () => {
     await scene.expectPixelColor([50, 51, 96], testPoint, 15)
   })
@@ -660,8 +738,9 @@ const loftPointAndClickCases = [
 ]
 loftPointAndClickCases.forEach(({ shouldPreselect }) => {
   test(`Loft point-and-click (preselected sketches: ${shouldPreselect})`, async ({
-    app,
+    context,
     page,
+    homePage,
     scene,
     editor,
     toolbar,
@@ -673,7 +752,11 @@ loftPointAndClickCases.forEach(({ shouldPreselect }) => {
     sketch002 = startSketchOn(plane001)
     |> circle({ center = [0, 0], radius = 20 }, %)
 `
-    await app.initialise(initialCode)
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
 
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 575, y: 200 }
@@ -692,7 +775,7 @@ loftPointAndClickCases.forEach(({ shouldPreselect }) => {
       await clickOnSketch1()
       await page.keyboard.down('Shift')
       await clickOnSketch2()
-      await app.page.waitForTimeout(500)
+      await page.waitForTimeout(500)
       await page.keyboard.up('Shift')
     }
 
@@ -751,17 +834,25 @@ const shellPointAndClickCapCases = [
 ]
 shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
   test(`Shell point-and-click cap (preselected sketches: ${shouldPreselect})`, async ({
-    app,
+    context,
+    page,
+    homePage,
     scene,
     editor,
     toolbar,
     cmdBar,
   }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const initialCode = `sketch001 = startSketchOn('XZ')
     |> circle({ center = [0, 0], radius = 30 }, %)
     extrude001 = extrude(30, sketch001)
     `
-    await app.initialise(initialCode)
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
 
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 575, y: 200 }
@@ -788,7 +879,7 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
           commandName: 'Shell',
         })
         await clickOnCap()
-        await app.page.waitForTimeout(500)
+        await page.waitForTimeout(500)
         await cmdBar.progressCmdBar()
         await cmdBar.progressCmdBar()
         await cmdBar.expectState({
@@ -804,7 +895,7 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
     } else {
       await test.step(`Preselect the cap`, async () => {
         await clickOnCap()
-        await app.page.waitForTimeout(500)
+        await page.waitForTimeout(500)
       })
 
       await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {
@@ -836,8 +927,9 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
 })
 
 test('Shell point-and-click wall', async ({
-  app,
+  context,
   page,
+  homePage,
   scene,
   editor,
   toolbar,
@@ -852,7 +944,11 @@ test('Shell point-and-click wall', async ({
   |> close(%)
 extrude001 = extrude(40, sketch001)
   `
-  await app.initialise(initialCode)
+  await context.addInitScript((initialCode) => {
+    localStorage.setItem('persistCode', initialCode)
+  }, initialCode)
+  await page.setBodyDimensions({ width: 1000, height: 500 })
+  await homePage.goToModelingScene()
 
   // One dumb hardcoded screen pixel value
   const testPoint = { x: 580, y: 180 }
@@ -883,7 +979,7 @@ extrude001 = extrude(40, sketch001)
     await clickOnCap()
     await page.keyboard.down('Shift')
     await clickOnWall()
-    await app.page.waitForTimeout(500)
+    await page.waitForTimeout(500)
     await page.keyboard.up('Shift')
     await cmdBar.progressCmdBar()
     await cmdBar.progressCmdBar()

e2e/playwright/prompt-to-edit.spec.ts

@@ -0,0 +1,190 @@
+import { test, expect } from './zoo-test'
+
+/* eslint-disable jest/no-conditional-expect */
+
+const file = `sketch001 = startSketchOn('XZ')
+profile001 = startProfileAt([57.81, 250.51], sketch001)
+  |> line([121.13, 56.63], %, $seg02)
+  |> line([83.37, -34.61], %, $seg01)
+  |> line([19.66, -116.4], %)
+  |> line([-221.8, -41.69], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(200, profile001)
+sketch002 = startSketchOn('XZ')
+  |> startProfileAt([-73.64, -42.89], %)
+  |> xLine(173.71, %)
+  |> line([-22.12, -94.4], %)
+  |> xLine(-156.98, %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude002 = extrude(50, sketch002)
+sketch003 = startSketchOn('XY')
+  |> startProfileAt([52.92, 157.81], %)
+  |> angledLine([0, 176.4], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       53.4
+     ], %, $rectangleSegmentB001)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $rectangleSegmentC001)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude003 = extrude(20, sketch003)
+`
+
+test.describe('Check the happy path, for basic changing color', () => {
+  const cases = [
+    {
+      desc: 'User accepts change',
+      shouldReject: false,
+    },
+    {
+      desc: 'User rejects change',
+      shouldReject: true,
+    },
+  ] as const
+  for (const { desc, shouldReject } of cases) {
+    test(`${desc}`, async ({
+      context,
+      homePage,
+      cmdBar,
+      editor,
+      page,
+      scene,
+    }) => {
+      await context.addInitScript((file) => {
+        localStorage.setItem('persistCode', file)
+      }, file)
+      await homePage.goToModelingScene()
+
+      const body1CapCoords = { x: 571, y: 351 }
+      const greenCheckCoords = { x: 565, y: 345 }
+      const body2WallCoords = { x: 609, y: 153 }
+      const [clickBody1Cap] = scene.makeMouseHelpers(
+        body1CapCoords.x,
+        body1CapCoords.y
+      )
+      const yellow: [number, number, number] = [179, 179, 131]
+      const green: [number, number, number] = [108, 152, 75]
+      const notGreen: [number, number, number] = [132, 132, 132]
+      const body2NotGreen: [number, number, number] = [88, 88, 88]
+      const submittingToast = page.getByText('Submitting to Text-to-CAD API...')
+      const successToast = page.getByText('Prompt to edit successful')
+      const acceptBtn = page.getByRole('button', { name: 'checkmark Accept' })
+      const rejectBtn = page.getByRole('button', { name: 'close Reject' })
+
+      await test.step('wait for scene to load select body and check selection came through', async () => {
+        await scene.expectPixelColor([134, 134, 134], body1CapCoords, 15)
+        await clickBody1Cap()
+        await scene.expectPixelColor(yellow, body1CapCoords, 20)
+        await editor.expectState({
+          highlightedCode: '',
+          activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],
+          diagnostics: [],
+        })
+      })
+
+      await test.step('fire off edit prompt', async () => {
+        await cmdBar.openCmdBar('promptToEdit')
+        // being specific about the color with a hex means asserting pixel color is more stable
+        await page
+          .getByTestId('cmd-bar-arg-value')
+          .fill('make this neon green please, use #39FF14')
+        await page.waitForTimeout(100)
+        await cmdBar.progressCmdBar()
+        await expect(submittingToast).toBeVisible()
+        await expect(submittingToast).not.toBeVisible({ timeout: 2 * 60_000 }) // can take a while
+        await expect(successToast).toBeVisible()
+      })
+
+      await test.step('verify initial change', async () => {
+        await scene.expectPixelColor(green, greenCheckCoords, 15)
+        await scene.expectPixelColor(body2NotGreen, body2WallCoords, 15)
+        await editor.expectEditor.toContain('appearance({')
+      })
+
+      if (!shouldReject) {
+        await test.step('check accept works and can be "undo"ed', async () => {
+          await acceptBtn.click()
+          await expect(successToast).not.toBeVisible()
+
+          await scene.expectPixelColor(green, greenCheckCoords, 15)
+          await editor.expectEditor.toContain('appearance({')
+
+          // ctrl-z works after accepting
+          await page.keyboard.down('ControlOrMeta')
+          await page.keyboard.press('KeyZ')
+          await page.keyboard.up('ControlOrMeta')
+          await editor.expectEditor.not.toContain('appearance({')
+          await scene.expectPixelColor(notGreen, greenCheckCoords, 15)
+        })
+      } else {
+        await test.step('check reject works', async () => {
+          await rejectBtn.click()
+          await expect(successToast).not.toBeVisible()
+
+          await scene.expectPixelColor(notGreen, greenCheckCoords, 15)
+          await editor.expectEditor.not.toContain('appearance({')
+        })
+      }
+    })
+  }
+})
+
+test.describe('bad path', () => {
+  test(`bad edit prompt`, async ({
+    context,
+    homePage,
+    cmdBar,
+    editor,
+    toolbar,
+    page,
+    scene,
+  }) => {
+    await context.addInitScript((file) => {
+      localStorage.setItem('persistCode', file)
+    }, file)
+    await homePage.goToModelingScene()
+
+    const body1CapCoords = { x: 571, y: 351 }
+    const [clickBody1Cap] = scene.makeMouseHelpers(
+      body1CapCoords.x,
+      body1CapCoords.y
+    )
+    const yellow: [number, number, number] = [179, 179, 131]
+    const submittingToast = page.getByText('Submitting to Text-to-CAD API...')
+    const failToast = page.getByText(
+      'Failed to edit your KCL code, please try again with a different prompt or selection'
+    )
+
+    await test.step('wait for scene to load and select body', async () => {
+      await scene.expectPixelColor([134, 134, 134], body1CapCoords, 15)
+
+      await clickBody1Cap()
+      await scene.expectPixelColor(yellow, body1CapCoords, 20)
+
+      await editor.expectState({
+        highlightedCode: '',
+        activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],
+        diagnostics: [],
+      })
+    })
+
+    await test.step('fire of bad prompt', async () => {
+      await cmdBar.openCmdBar('promptToEdit')
+      await page
+        .getByTestId('cmd-bar-arg-value')
+        .fill('ansheusha asnthuatshoeuhtaoetuhthaeu laughs in dvorak')
+      await page.waitForTimeout(100)
+      await cmdBar.progressCmdBar()
+      await expect(submittingToast).toBeVisible()
+    })
+    await test.step('check fail toast appeared', async () => {
+      await expect(submittingToast).not.toBeVisible({ timeout: 2 * 60_000 }) // can take a while
+      await expect(failToast).toBeVisible()
+    })
+  })
+})

e2e/playwright/regression-tests.spec.ts

@@ -1,36 +1,26 @@
-import { test, expect, Page } from '@playwright/test'
+import { test, expect, Page } from './zoo-test'
-import { join } from 'path'
+import path from 'path'
 import * as fsp from 'fs/promises'
-import {
+import { getUtils, executorInputPath } from './test-utils'
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from './storageStates'
 import { bracket } from 'lib/exampleKcl'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Regression tests', () => {
   // bugs we found that don't fit neatly into other categories
-  test('bad model has inline error #3251', async ({ page }) => {
+  test('bad model has inline error #3251', async ({
+    context,
+    page,
+    homePage,
+  }) => {
     // because the model has `line([0,0]..` it is valid code, but the model is invalid
     // regression test for https://github.com/KittyCAD/modeling-app/issues/3251
     // Since the bad model also found as issue with the artifact graph, which in tern blocked the editor diognostics
     const u = await getUtils(page)
-    await page.addInitScript(async () => {
+    await context.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch2 = startSketchOn("XY")
-sketch001 = startSketchAt([-0, -0])
+  sketch001 = startSketchAt([-0, -0])
     |> line([0, 0], %)
     |> line([-4.84, -5.29], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
@@ -38,9 +28,10 @@ sketch001 = startSketchAt([-0, -0])
       )
     })
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
@@ -56,6 +47,7 @@ sketch001 = startSketchAt([-0, -0])
   })
   test('user should not have to press down twice in cmdbar', async ({
     page,
+    homePage,
   }) => {
     // because the model has `line([0,0]..` it is valid code, but the model is invalid
     // regression test for https://github.com/KittyCAD/modeling-app/issues/3251
@@ -64,26 +56,38 @@ sketch001 = startSketchAt([-0, -0])
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `sketch2 = startSketchOn("XY")
+        `sketch001 = startSketchOn('XY')
-sketch001 = startSketchAt([-0, -0])
+  |> startProfileAt([82.33, 238.21], %)
-  |> line([0, 0], %)
+  |> angledLine([0, 288.63], %, $rectangleSegmentA001)
-  |> line([-4.84, -5.29], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       197.97
+     ], %, $rectangleSegmentB001)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $rectangleSegmentC001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)`
+  |> close(%)
+extrude001 = extrude(50, sketch001)
+`
       )
     })
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await page.goto('/')
+    await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
     await test.step('Check arrow down works', async () => {
+      await page.getByTestId('command-bar-open-button').hover()
       await page.getByTestId('command-bar-open-button').click()
 
-      await page
+      const floppy = page.getByRole('option', {
-        .getByRole('option', { name: 'floppy disk arrow Export' })
+        name: 'floppy disk arrow Export',
-        .click()
+      })
+
+      await floppy.click()
 
       // press arrow down key twice
       await page.keyboard.press('ArrowDown')
@@ -115,7 +119,7 @@ sketch001 = startSketchAt([-0, -0])
       )
     })
   })
-  test('executes on load', async ({ page }) => {
+  test('executes on load', async ({ page, homePage }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -127,9 +131,10 @@ sketch001 = startSketchAt([-0, -0])
   |> line([-23.44, 0.52], %)`
       )
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     // expand variables section
     const variablesTabButton = page.getByTestId('variables-pane-button')
@@ -148,14 +153,15 @@ sketch001 = startSketchAt([-0, -0])
     ).toBeVisible()
   })
 
-  test('re-executes', async ({ page }) => {
+  test('re-executes', async ({ page, homePage }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem('persistCode', `myVar = 5`)
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const variablesTabButton = page.getByTestId('variables-pane-button')
     await variablesTabButton.click()
@@ -174,7 +180,7 @@ sketch001 = startSketchAt([-0, -0])
       page.locator('.pretty-json-container >> text=myVar:67')
     ).toBeVisible()
   })
-  test('ProgramMemory can be serialised', async ({ page }) => {
+  test('ProgramMemory can be serialised', async ({ page, homePage }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -193,13 +199,14 @@ sketch001 = startSketchAt([-0, -0])
       }, %)`
       )
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
     const messages: string[] = []
 
     // Listen for all console events and push the message text to an array
     page.on('console', (message) => messages.push(message.text()))
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -212,19 +219,26 @@ sketch001 = startSketchAt([-0, -0])
       })
     })
   })
-  test('ensure the Zoo logo is not a link in browser app', async ({ page }) => {
+
+  // Not relevant to us anymore, or at least for the time being.
+  test.skip('ensure the Zoo logo is not a link in browser app', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const zooLogo = page.locator('[data-testid="app-logo"]')
     // Make sure it's not a link
     await expect(zooLogo).not.toHaveAttribute('href')
   })
+
   test(
     'Position _ Is Out Of Range... regression test',
     { tag: ['@skipWin'] },
-    async ({ page }) => {
+    async ({ context, page, homePage }) => {
       // SKip on windows, its being weird.
       test.skip(
         process.platform === 'win32',
@@ -233,8 +247,8 @@ sketch001 = startSketchAt([-0, -0])
 
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await page.addInitScript(async () => {
+      await context.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
           `exampleSketch = startSketchOn("XZ")
@@ -250,8 +264,9 @@ sketch001 = startSketchAt([-0, -0])
       })
 
       await expect(async () => {
-        await page.goto('/')
+        await homePage.goToModelingScene()
         await u.waitForPageLoad()
+
         // error in guter
         await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
           timeout: 1_000,
@@ -306,6 +321,7 @@ sketch001 = startSketchAt([-0, -0])
 
   test('when engine fails export we handle the failure and alert the user', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(
@@ -316,9 +332,10 @@ sketch001 = startSketchAt([-0, -0])
       { code: TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR }
     )
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -374,7 +391,6 @@ sketch001 = startSketchAt([-0, -0])
 
     // wait for execution done
     await u.openDebugPanel()
-    await u.clearCommandLogs()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
@@ -408,7 +424,7 @@ sketch001 = startSketchAt([-0, -0])
   test(
     'ensure you can not export while an export is already going',
     { tag: ['@skipLinux', '@skipWin'] },
-    async ({ page }) => {
+    async ({ page, homePage }) => {
       // This is being weird on ubuntu and windows.
       test.skip(
         // eslint-disable-next-line jest/valid-title
@@ -428,9 +444,10 @@ sketch001 = startSketchAt([-0, -0])
           }
         )
 
-        await page.setViewportSize({ width: 1000, height: 500 })
+        await page.setBodyDimensions({ width: 1000, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         // wait for execution done
         await u.openDebugPanel()
@@ -500,20 +517,17 @@ sketch001 = startSketchAt([-0, -0])
   test(
     `Network health indicator only appears in modeling view`,
     { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
+    async ({ context, page }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
+      await context.folderSetupFn(async (dir) => {
-        testInfo,
+        const bracketDir = path.join(dir, 'bracket')
-        folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, 'bracket')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.copyFile(
           executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
+          path.join(bracketDir, 'main.kcl')
         )
-        },
       })
 
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
       const u = await getUtils(page)
 
       // Locators
@@ -539,18 +553,19 @@ sketch001 = startSketchAt([-0, -0])
         await u.waitForPageLoad()
         await expect(networkHealthIndicator).toContainText('Connected')
       })
-
-      await electronApp.close()
     }
   )
 
   test(`View gizmo stays visible even when zoomed out all the way`, async ({
     page,
+    homePage,
   }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const u = await getUtils(page)
 
     // Constants and locators
-    const planeColor: [number, number, number] = [161, 220, 155]
+    const planeColor: [number, number, number] = [170, 220, 170]
     const bgColor: [number, number, number] = [27, 27, 27]
     const middlePixelIsColor = async (color: [number, number, number]) => {
       return u.getGreatestPixDiff({ x: 600, y: 250 }, color)
@@ -561,8 +576,9 @@ sketch001 = startSketchAt([-0, -0])
       await page.addInitScript(async () => {
         localStorage.setItem('persistCode', '')
       })
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
       await u.closeKclCodePanel()
     })
 
@@ -572,7 +588,7 @@ sketch001 = startSketchAt([-0, -0])
           timeout: 5000,
           message: 'Plane color is visible',
         })
-        .toBeLessThan(15)
+        .toBeLessThanOrEqual(15)
 
       let maxZoomOuts = 10
       let middlePixelIsBackgroundColor =
@@ -590,7 +606,7 @@ sketch001 = startSketchAt([-0, -0])
       }
 
       expect(middlePixelIsBackgroundColor, {
-        message: 'We no longer the default planes',
+        message: 'We should not see the default planes',
       }).toBeTruthy()
     })
 

e2e/playwright/snapshot-tests.spec.ts

@@ -47,7 +47,11 @@ test.beforeEach(async ({ page }) => {
 
 test.setTimeout(60_000)
 
-test(
+// We test this end to end already - getting this to work on web just to take
+// a snapshot of it feels weird. I'd rather our regular tests fail.
+// The primary failure is doExport now relies on the filesystem. We can follow
+// up with another PR if we want this back.
+test.skip(
   'exports of each format should work',
   { tag: ['@snapshot', '@skipWin', '@skipMacos'] },
   async ({ page, context }) => {

e2e/playwright/storageStates.ts

@@ -109,242 +109,21 @@ keychain = startSketchOn("XY")
   |> close(%)
   |> extrude(thickness, %)
 
-// generated from  /home/paultag/Downloads/zma-logomark.svg
+keychain1 = startSketchOn("XY")
-fn svg = (surface, origin, depth) => {
+  |> startProfileAt([0, 0], %)
-  let a0 = surface |> startProfileAt([origin[0] + 45.430427, origin[1] + -14.627736], %)
+  |> lineTo([width, 0], %)
-    |> bezierCurve({
+  |> lineTo([width, height], %)
-    control1: [ 0, 0.764157 ],
+  |> lineTo([0, height], %)
-    control2: [ 0, 1.528314 ],
-    to: [ 0, 2.292469 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -3.03202, 0 ],
-    control2: [ -6.064039, 0 ],
-    to: [ -9.09606, 0 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0, -1.077657 ],
-    control2: [ 0, -2.155312 ],
-    to: [ 0, -3.232969 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.741805, 0 ],
-    control2: [ 5.483613, 0 ],
-    to: [ 8.225417, 0 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.740682, -2.961815 ],
-    control2: [ -5.490342, -5.925794 ],
-    to: [ -8.225417, -8.886255 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0, -0.723995 ],
-    control2: [ 0, -1.447988 ],
-    to: [ 0, -2.171981 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.712124, 0.05061 ],
-    control2: [ 1.511636, -0.09877 ],
-    to: [ 2.172096, 0.07005 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.68573, 0.740811 ],
-    control2: [ 1.371459, 1.481622 ],
-    to: [ 2.057187, 2.222436 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0, -0.76416 ],
-    control2: [ 0, -1.52832 ],
-    to: [ 0, -2.29248 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 3.032013, 0 ],
-    control2: [ 6.064026, 0 ],
-    to: [ 9.096038, 0 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0, 1.077657 ],
-    control2: [ 0, 2.155314 ],
-    to: [ 0, 3.232973 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.741312, 0 ],
-    control2: [ -5.482623, 0 ],
-    to: [ -8.223936, 0 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.741313, 2.961108 ],
-    control2: [ 5.482624, 5.922216 ],
-    to: [ 8.223936, 8.883325 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0, 0.724968 ],
-    control2: [ 0, 1.449938 ],
-    to: [ 0, 2.174907 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.712656, -0.05145 ],
-    control2: [ -1.512554, 0.09643 ],
-    to: [ -2.173592, -0.07298 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.685222, -0.739834 ],
-    control2: [ -1.370445, -1.479669 ],
-    to: [ -2.055669, -2.219505 ]
-   }, %)
   |> close(%)
-    |> extrude(depth, %)
+  |> extrude(thickness, %)
 
-  let a1 = surface |> startProfileAt([origin[0] + 57.920488, origin[1] + -15.244943], %)
+keychain2 = startSketchOn("XY")
-    |> bezierCurve({
+  |> startProfileAt([0, 0], %)
-    control1: [ -2.78904, 0.106635 ],
+  |> lineTo([width, 0], %)
-    control2: [ -5.052548, -2.969529 ],
+  |> lineTo([width, height], %)
-    to: [ -4.055141, -5.598369 ]
+  |> lineTo([0, height], %)
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.841523, -0.918736 ],
-    control2: [ 0.439412, -1.541892 ],
-    to: [ -0.368488, -2.214378 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.418245, -0.448461 ],
-    control2: [ -0.836489, -0.896922 ],
-    to: [ -1.254732, -1.345384 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.76806, 2.995359 ],
-    control2: [ -2.32667, 8.18409 ],
-    to: [ 0.897655, 10.678932 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.562822, 2.186098 ],
-    control2: [ 6.605111, 2.28043 ],
-    to: [ 9.271202, 0.226476 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.743744, -0.797465 ],
-    control2: [ -1.487487, -1.594932 ],
-    to: [ -2.231232, -2.392397 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.672938, 0.421422 ],
-    control2: [ -1.465362, 0.646946 ],
-    to: [ -2.259264, 0.64512 ]
-   }, %)
   |> close(%)
-    |> extrude(depth, %)
+  |> extrude(thickness, %)
-
-  let a2 = surface |> startProfileAt([origin[0] + 62.19406300000001, origin[1] + -19.500698999999997], %)
-    |> bezierCurve({
-    control1: [ 0.302938, 1.281141 ],
-    control2: [ -1.53575, 2.434288 ],
-    to: [ -0.10908, 3.279477 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.504637, 0.54145 ],
-    control2: [ 1.009273, 1.082899 ],
-    to: [ 1.513909, 1.624348 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.767778, -2.995425 ],
-    control2: [ 2.327135, -8.184384 ],
-    to: [ -0.897661, -10.679047 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.562947, -2.186022 ],
-    control2: [ -6.604089, -2.279606 ],
-    to: [ -9.271196, -0.227813 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.744231, 0.797952 ],
-    control2: [ 1.488461, 1.595904 ],
-    to: [ 2.232692, 2.393856 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.302377, -1.564629 ],
-    control2: [ 5.793126, -0.15358 ],
-    to: [ 6.396577, 2.547372 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.08981, 0.346302 ],
-    control2: [ 0.134865, 0.704078 ],
-    to: [ 0.13476, 1.061807 ]
-   }, %)
-    |> close(%)
-    |> extrude(depth, %)
-
-  let a3 = surface |> startProfileAt([origin[0] + 74.124866, origin[1] + -15.244943], %)
-    |> bezierCurve({
-    control1: [ -2.78904, 0.106635 ],
-    control2: [ -5.052549, -2.969529 ],
-    to: [ -4.055142, -5.598369 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.841527, -0.918738 ],
-    control2: [ 0.43941, -1.541892 ],
-    to: [ -0.368497, -2.214367 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.418254, -0.448466 ],
-    control2: [ -0.836507, -0.896931 ],
-    to: [ -1.254761, -1.345395 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.768019, 2.995371 ],
-    control2: [ -2.326624, 8.184088 ],
-    to: [ 0.897678, 10.678932 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.56289, 2.186191 ],
-    control2: [ 6.60516, 2.280307 ],
-    to: [ 9.271371, 0.226476 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.743808, -0.797465 ],
-    control2: [ -1.487616, -1.594932 ],
-    to: [ -2.231424, -2.392397 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -0.672916, 0.421433 ],
-    control2: [ -1.465344, 0.646926 ],
-    to: [ -2.259225, 0.64512 ]
-   }, %)
-    |> close(%)
-    |> extrude(depth, %)
-
-  let a4 = surface |> startProfileAt([origin[0] + 77.57333899999998, origin[1] + -16.989262999999998], %)
-    |> bezierCurve({
-    control1: [ 0.743298, 0.797463 ],
-    control2: [ 1.486592, 1.594926 ],
-    to: [ 2.229888, 2.392389 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.767827, -2.995393 ],
-    control2: [ 2.327103, -8.184396 ],
-    to: [ -0.897672, -10.679047 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ -2.562939, -2.186037 ],
-    control2: [ -6.604077, -2.279589 ],
-    to: [ -9.271185, -0.227813 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.744243, 0.797952 ],
-    control2: [ 1.488486, 1.595904 ],
-    to: [ 2.232729, 2.393856 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 2.302394, -1.564623 ],
-    control2: [ 5.793201, -0.153598 ],
-    to: [ 6.396692, 2.547372 ]
-   }, %)
-    |> bezierCurve({
-    control1: [ 0.32074, 1.215468 ],
-    control2: [ 0.06159, 2.564765 ],
-    to: [ -0.690452, 3.573243 ]
-   }, %)
-    |> close(%)
-    |> extrude(depth, %)
 
 box = startSketchOn('XY')
   |> startProfileAt([0, 0], %)
@@ -354,7 +133,7 @@ box = startSketchOn('XY')
   |> close(%)
   |> extrude(10, %)
 
-  sketch001 = startSketchOn(box, revolveAxis)
+sketch001 = startSketchOn(box, revolveAxis)
   |> startProfileAt([5, 10], %)
   |> line([0, -10], %)
   |> line([2, 0], %)
@@ -364,18 +143,12 @@ box = startSketchOn('XY')
   axis: revolveAxis,
   angle: 90
   }, %)
-  return 0
-}
 
+sketch001 = startSketchOn('XZ')
+  |> startProfileAt([0.0, 0.0], %)
+  |> xLine(0.0, %)
+  |> close(%)
 
-
+`
-svg(startSketchOn(keychain, 'end'), [-33, 32], -thickness)
-
-startSketchOn(keychain, 'end')
-  |> circle({ center: [
-       width / 2,
-       height - (keychainHoleSize + 1.5)
-     ], radius: keychainHoleSize }, %)
-  |> extrude(-thickness, %)`
 
 export const TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR = `thing = 1`

e2e/playwright/test-network-and-connection-issues.spec.ts

@@ -1,31 +1,17 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-
+import { commonPoints, getUtils } from './test-utils'
-import { commonPoints, getUtils, setup, tearDown } from './test-utils'
-import { uuidv4 } from 'lib/utils'
 import { EngineCommand } from 'lang/std/artifactGraph'
-
+import { uuidv4 } from 'lib/utils'
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Test network and connection issues', () => {
   test('simulate network down and network little widget', async ({
     page,
-    browserName,
+    homePage,
   }) => {
-    // TODO: Don't skip Mac for these. After `window.tearDown` is working in Safari, these should work on webkit
-    test.skip(
-      browserName === 'webkit',
-      'Skip on Safari until `window.tearDown` is working there'
-    )
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     const networkToggle = page.getByTestId('network-toggle')
 
@@ -64,7 +50,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Offline')
+    await expect(networkToggle).toContainText('Problem')
 
     // Click the network widget
     await networkWidget.click()
@@ -95,26 +81,19 @@ test.describe('Test network and connection issues', () => {
 
   test('Engine disconnect & reconnect in sketch mode', async ({
     page,
-    browserName,
+    homePage,
   }) => {
     // TODO: Don't skip Mac for these. After `window.tearDown` is working in Safari, these should work on webkit
-    test.skip(
-      browserName === 'webkit',
-      'Skip on Safari until `window.tearDown` is working there'
-    )
     const networkToggle = page.getByTestId('network-toggle')
 
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
     const PUR = 400 / 37.5 //pixeltoUnitRatio
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
+
     await u.openDebugPanel()
-
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled({ timeout: 15000 })
-
     // click on "Start Sketch" button
     await u.clearCommandLogs()
     await page.getByRole('button', { name: 'Start Sketch' }).click()
@@ -157,7 +136,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Offline')
+    await expect(networkToggle).toContainText('Problem')
 
     // Ensure we are not in sketch mode
     await expect(

e2e/playwright/test-utils.ts

@@ -1,22 +1,21 @@
 import {
   expect,
-  Page,
-  Download,
   BrowserContext,
   TestInfo,
   _electron as electron,
+  ElectronApplication,
   Locator,
-  test,
 } from '@playwright/test'
+import { test, Page } from './zoo-test'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import fsp from 'fs/promises'
 import fsSync from 'fs'
-import { join } from 'path'
+import path from 'path'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
 import { Protocol } from 'playwright-core/types/protocol'
 import type { Models } from '@kittycad/lib'
-import { APP_NAME, COOKIE_NAME } from 'lib/constants'
+import { COOKIE_NAME } from 'lib/constants'
 import { secrets } from './secrets'
 import {
   TEST_SETTINGS_KEY,
@@ -30,6 +29,10 @@ import { isErrorWhitelisted } from './lib/console-error-whitelist'
 import { isArray } from 'lib/utils'
 import { reportRejection } from 'lib/trap'
 
+const toNormalizedCode = (text: string) => {
+  return text.replace(/\s+/g, '')
+}
+
 type TestColor = [number, number, number]
 export const TEST_COLORS = {
   WHITE: [249, 249, 249] as TestColor,
@@ -98,11 +101,16 @@ async function removeCurrentCode(page: Page) {
 }
 
 export async function sendCustomCmd(page: Page, cmd: EngineCommand) {
-  await page.getByTestId('custom-cmd-input').fill(JSON.stringify(cmd))
+  const json = JSON.stringify(cmd)
+  await page.getByTestId('custom-cmd-input').fill(json)
+  await expect(page.getByTestId('custom-cmd-input')).toHaveValue(json)
+  await page.getByTestId('custom-cmd-send-button').scrollIntoViewIfNeeded()
   await page.getByTestId('custom-cmd-send-button').click()
 }
 
 async function clearCommandLogs(page: Page) {
+  await page.getByTestId('custom-cmd-input').fill('')
+  await page.getByTestId('clear-commands').scrollIntoViewIfNeeded()
   await page.getByTestId('clear-commands').click()
 }
 
@@ -150,6 +158,19 @@ export async function closePane(page: Page, testId: string) {
 
 async function openKclCodePanel(page: Page) {
   await openPane(page, 'code-pane-button')
+
+  // Code Mirror lazy loads text! Wowza! Let's force-load the text for tests.
+  await page.evaluate(() => {
+    // editorManager is available on the window object.
+    //@ts-ignore this is in an entirely different context that tsc can't see.
+    editorManager._editorView.dispatch({
+      selection: {
+        //@ts-ignore this is in an entirely different context that tsc can't see.
+        anchor: editorManager._editorView.docView.length,
+      },
+      scrollIntoView: true,
+    })
+  })
 }
 
 async function closeKclCodePanel(page: Page) {
@@ -165,6 +186,9 @@ async function closeKclCodePanel(page: Page) {
 
 async function openDebugPanel(page: Page) {
   await openPane(page, 'debug-pane-button')
+
+  // The debug pane needs time to load everything.
+  await page.waitForTimeout(3000)
 }
 
 export async function closeDebugPanel(page: Page) {
@@ -412,6 +436,10 @@ export async function getUtils(page: Page, test_?: typeof test) {
         .boundingBox({ timeout: 5_000 })
         .then((box) => ({ ...box, x: box?.x || 0, y: box?.y || 0 })),
     codeLocator: page.locator('.cm-content'),
+    crushKclCodeIntoOneLineAndThenMaybeSome: async () => {
+      const code = await page.locator('.cm-content').innerText()
+      return code.replaceAll(' ', '').replaceAll('\n', '')
+    },
     normalisedEditorCode: async () => {
       const code = await page.locator('.cm-content').innerText()
       return normaliseKclNumbers(code)
@@ -482,13 +510,18 @@ export async function getUtils(page: Page, test_?: typeof test) {
       )
     },
 
-    toNormalizedCode: (text: string) => {
+    toNormalizedCode(text: string) {
-      return text.replace(/\s+/g, '')
+      return toNormalizedCode(text)
     },
 
-    editorTextMatches: async (code: string) => {
+    async editorTextMatches(code: string) {
       const editor = page.locator(editorSelector)
-      return expect(editor).toHaveText(code, { useInnerText: true })
+      return expect
+        .poll(async () => {
+          const text = await editor.textContent()
+          return toNormalizedCode(text ?? '')
+        })
+        .toContain(toNormalizedCode(code))
     },
 
     pasteCodeInEditor: async (code: string) => {
@@ -514,7 +547,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
           page.getByRole('button', { name: 'Start Sketch' })
         ).not.toBeDisabled()
         await page.getByTestId('create-file-button').click()
-        await page.getByTestId('file-rename-field').fill(name)
+        await page.getByTestId('tree-input-field').fill(name)
         await page.keyboard.press('Enter')
       })
     },
@@ -674,6 +707,34 @@ export const makeTemplate: (
   }
 }
 
+const PLAYWRIGHT_DOWNLOAD_DIR = 'downloads-during-playwright'
+
+export const getPlaywrightDownloadDir = (page: Page) => {
+  return path.resolve(page.dir, PLAYWRIGHT_DOWNLOAD_DIR)
+}
+
+const moveDownloadedFileTo = async (page: Page, toLocation: string) => {
+  await fsp.mkdir(path.dirname(toLocation), { recursive: true })
+
+  const downloadDir = getPlaywrightDownloadDir(page)
+
+  // Expect there to be at least one file
+  await expect
+    .poll(async () => {
+      const files = await fsp.readdir(downloadDir)
+      return files.length
+    })
+    .toBeGreaterThan(0)
+
+  // Go through the downloads dir and move files to new location
+  const files = await fsp.readdir(downloadDir)
+
+  // Assumption: only ever one file here.
+  for (let file of files) {
+    await fsp.rename(path.resolve(downloadDir, file), toLocation)
+  }
+}
+
 export interface Paths {
   modelPath: string
   imagePath: string
@@ -686,7 +747,8 @@ export const doExport = async (
   exportFrom: 'dropdown' | 'sidebarButton' | 'commandBar' = 'dropdown'
 ): Promise<Paths> => {
   if (exportFrom === 'dropdown') {
-    await page.getByRole('button', { name: APP_NAME }).click()
+    await page.getByTestId('project-sidebar-toggle').click()
+
     const exportMenuButton = page.getByRole('button', {
       name: 'Export current part',
     })
@@ -727,25 +789,12 @@ export const doExport = async (
   }
   await expect(page.getByText('Confirm Export')).toBeVisible()
 
-  const getPromiseAndResolve = () => {
-    let resolve: any = () => {}
-    const promise = new Promise<Download>((r) => {
-      resolve = r
-    })
-    return [promise, resolve]
-  }
-
-  const [downloadPromise1, downloadResolve1] = getPromiseAndResolve()
-  let downloadCnt = 0
-
-  if (exportFrom === 'dropdown')
-    page.on('download', async (download) => {
-      if (downloadCnt === 0) {
-        downloadResolve1(download)
-      }
-      downloadCnt++
-    })
   await page.getByRole('button', { name: 'Submit command' }).click()
+
+  // This usually happens immediately after. If we're too slow we don't
+  // catch it.
+  await expect(page.getByText('Exported successfully')).toBeVisible()
+
   if (exportFrom === 'sidebarButton' || exportFrom === 'commandBar') {
     return {
       modelPath: '',
@@ -755,15 +804,12 @@ export const doExport = async (
   }
 
   // Handle download
-  const download = await downloadPromise1
   const downloadLocationer = (extra = '', isImage = false) =>
     `./e2e/playwright/export-snapshots/${output.type}-${
       'storage' in output ? output.storage : ''
     }${extra}.${isImage ? 'png' : output.type}`
   const downloadLocation = downloadLocationer()
 
-  await download.saveAs(downloadLocation)
-
   if (output.type === 'step') {
     // stable timestamps for step files
     const fileContents = await fsp.readFile(downloadLocation, 'utf-8')
@@ -772,6 +818,12 @@ export const doExport = async (
       '1970-01-01T00:00:00.0+00:00'
     )
     await fsp.writeFile(downloadLocation, newFileContents)
+  } else {
+    // By default all files are downloaded to the same place in playwright
+    // (declared in src/lib/exportSave)
+    // To remain consistent with our old web tests, we want to move some downloads
+    // (images) to another directory.
+    await moveDownloadedFileTo(page, downloadLocation)
   }
 
   return {
@@ -798,6 +850,8 @@ export async function tearDown(page: Page, testInfo: TestInfo) {
   // It seems it's best to give the browser about 3s to close things
   // It's not super reliable but we have no real other choice for now
   await page.waitForTimeout(3000)
+
+  await testInfo.tronApp?.close()
 }
 
 // settingsOverrides may need to be augmented to take more generic items,
@@ -808,12 +862,24 @@ export async function setup(
   testInfo?: TestInfo
 ) {
   await context.addInitScript(
-    async ({ token, settingsKey, settings, IS_PLAYWRIGHT_KEY }) => {
+    async ({
+      token,
+      settingsKey,
+      settings,
+      IS_PLAYWRIGHT_KEY,
+      PLAYWRIGHT_TEST_DIR,
+      PERSIST_MODELING_CONTEXT,
+    }) => {
       localStorage.clear()
       localStorage.setItem('TOKEN_PERSIST_KEY', token)
       localStorage.setItem('persistCode', ``)
+      localStorage.setItem(
+        PERSIST_MODELING_CONTEXT,
+        JSON.stringify({ openPanes: ['code'] })
+      )
       localStorage.setItem(settingsKey, settings)
       localStorage.setItem(IS_PLAYWRIGHT_KEY, 'true')
+      localStorage.setItem('PLAYWRIGHT_TEST_DIR', PLAYWRIGHT_TEST_DIR)
     },
     {
       token: secrets.token,
@@ -830,6 +896,8 @@ export async function setup(
         } as Partial<SaveSettingsPayload>,
       }),
       IS_PLAYWRIGHT_KEY,
+      PLAYWRIGHT_TEST_DIR: TEST_SETTINGS.app.projectDirectory,
+      PERSIST_MODELING_CONTEXT,
     }
   )
 
@@ -848,12 +916,15 @@ export async function setup(
   await page.emulateMedia({ reducedMotion: 'reduce' })
 
   // Trigger a navigation, since loading file:// doesn't.
-  await page.reload()
+  // await page.reload()
 }
 
+let electronApp: ElectronApplication | undefined = undefined
+let context: BrowserContext | undefined = undefined
+let page: Page | undefined = undefined
+
 export async function setupElectron({
   testInfo,
-  folderSetupFn,
   cleanProjectDir = true,
   appSettings,
 }: {
@@ -861,7 +932,12 @@ export async function setupElectron({
   folderSetupFn?: (projectDirName: string) => Promise<void>
   cleanProjectDir?: boolean
   appSettings?: Partial<SaveSettingsPayload>
-}) {
+}): Promise<{
+  electronApp: ElectronApplication
+  context: BrowserContext
+  page: Page
+  dir: string
+}> {
   // create or otherwise clear the folder
   const projectDirName = testInfo.outputPath('electron-test-projects-dir')
   try {
@@ -876,7 +952,7 @@ export async function setupElectron({
     await fsp.mkdir(projectDirName)
   }
 
-  const electronApp = await electron.launch({
+  const options = {
     args: ['.', '--no-sandbox'],
     env: {
       ...process.env,
@@ -886,14 +962,22 @@ export async function setupElectron({
     ...(process.env.ELECTRON_OVERRIDE_DIST_PATH
       ? { executablePath: process.env.ELECTRON_OVERRIDE_DIST_PATH + 'electron' }
       : {}),
-  })
+  }
-  const context = electronApp.context()
+
-  const page = await electronApp.firstWindow()
+  // Do this once and then reuse window on subsequent calls.
+  if (!electronApp) {
+    electronApp = await electron.launch(options)
+  }
+
+  if (!context || !page) {
+    context = electronApp.context()
+    page = await electronApp.firstWindow()
     context.on('console', console.log)
     page.on('console', console.log)
+  }
 
   if (cleanProjectDir) {
-    const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
+    const tempSettingsFilePath = path.join(projectDirName, SETTINGS_FILE_NAME)
     const settingsOverrides = TOML.stringify(
       appSettings
         ? {
@@ -920,11 +1004,7 @@ export async function setupElectron({
     await fsp.writeFile(tempSettingsFilePath, settingsOverrides)
   }
 
-  await folderSetupFn?.(projectDirName)
+  return { electronApp, page, context, dir: projectDirName }
-
-  await setup(context, page)
-
-  return { electronApp, page, dir: projectDirName }
 }
 
 function failOnConsoleErrors(page: Page, testInfo?: TestInfo) {
@@ -1010,7 +1090,7 @@ export async function createProject({
 }
 
 export function executorInputPath(fileName: string): string {
-  return join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
+  return path.join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
 }
 
 export async function doAndWaitForImageDiff(
@@ -1101,3 +1181,12 @@ export function getPixelRGBs(page: Page) {
     })
   }
 }
+
+export async function pollEditorLinesSelectedLength(page: Page, lines: number) {
+  return expect
+    .poll(async () => {
+      const lines = await page.locator('.cm-activeLine').all()
+      return lines.length
+    })
+    .toBe(lines)
+}

e2e/playwright/testing-camera-movement.spec.ts

@@ -1,23 +1,20 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import { uuidv4 } from 'lib/utils'
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
-
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Testing Camera Movement', () => {
-  test('Can move camera reliably', async ({ page, context }) => {
+  test('Can move camera reliably', async ({ page, context, homePage }) => {
-    test.skip(process.platform === 'darwin', 'Can move camera reliably')
+    // TODO: fix this test on windows too after the electron migration
+    const winOrMac =
+      process.platform === 'win32' || process.platform === 'darwin'
+    // eslint-disable-next-line
+    test.skip(winOrMac, 'Skip on windows')
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
     await u.openAndClearDebugPanel()
     await u.closeKclCodePanel()
 
@@ -181,18 +178,19 @@ test.describe('Testing Camera Movement', () => {
     }, [0, -85, -85])
   })
 
-  test('Zoom should be consistent when exiting or entering sketches', async ({
+  // TODO: fix after electron migration is merged
-    page,
+  test.fixme(
-  }) => {
+    'Zoom should be consistent when exiting or entering sketches',
+    async ({ page, homePage }) => {
       // start new sketch pan and zoom before exiting, when exiting the sketch should stay in the same place
       // than zoom and pan outside of sketch mode and enter again and it should not change from where it is
       // than again for sketching
 
-    test.skip(process.platform !== 'darwin', 'Zoom should be consistent')
       const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
       await u.openDebugPanel()
 
       await expect(
@@ -342,9 +340,15 @@ test.describe('Testing Camera Movement', () => {
       await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
         timeout: 10_000,
       })
-  })
+    }
+  )
 
-  test(`Zoom by scroll should not fire while orbiting`, async ({ page }) => {
+  test(`Zoom by scroll should not fire while orbiting`, async ({
+    homePage,
+    page,
+  }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     /**
      * Currently we only allow zooming by scroll when no other camera movement is happening,
      * set within cameraMouseDragGuards in cameraControls.ts,
@@ -383,7 +387,8 @@ test.describe('Testing Camera Movement', () => {
     const expectedOrbitCamZPosition = 64.0
 
     await test.step(`Test setup`, async () => {
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
       await u.closeKclCodePanel()
       // This test requires the mouse controls to be set to Solidworks
       await u.openDebugPanel()
@@ -480,9 +485,14 @@ test.describe('Testing Camera Movement', () => {
     }
   })
 
-  test('Right-click opens context menu when not dragged', async ({ page }) => {
+  test('Right-click opens context menu when not dragged', async ({
+    homePage,
+    page,
+  }) => {
     const u = await getUtils(page)
-    await u.waitForAuthSkipAppStart()
+
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await test.step(`The menu should not show if we drag the mouse`, async () => {
       await page.mouse.move(900, 200)

e2e/playwright/testing-constraints.spec.ts

@@ -1,29 +1,16 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import {
+import * as fsp from 'fs/promises'
-  test as testFixture,
-  expect as expectFixture,
-} from './fixtures/fixtureSetup'
-import { join } from 'path'
 import {
   getUtils,
-  setup,
-  tearDown,
   TEST_COLORS,
+  pollEditorLinesSelectedLength,
   executorInputPath,
 } from './test-utils'
-import * as fsp from 'fs/promises'
 import { XOR } from 'lib/utils'
-
+import path from 'node:path'
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Testing constraints', () => {
-  test('Can constrain line length', async ({ page }) => {
+  test('Can constrain line length', async ({ page, homePage }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -37,46 +24,40 @@ test.describe('Testing constraints', () => {
     })
 
     const u = await getUtils(page)
-    // constants and locators
+    const PUR = 400 / 37.5 //pixeltoUnitRatio
-    const lengthValue = {
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-      old: '20',
-      new: '25',
-    }
-    const cmdBarKclInput = page
-      .getByTestId('cmd-bar-arg-value')
-      .getByRole('textbox')
-    const cmdBarSubmitButton = page.getByRole('button', {
-      name: 'arrow right Continue',
-    })
-    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
     // Click the line of code for line.
-    // TODO remove this and reinstate `await topHorzSegmentClick()`
+    await page.getByText(`line([0, 20], %)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-    await page.getByText(`line([0, ${lengthValue.old}], %)`).click()
     await page.waitForTimeout(100)
 
     // enter sketch again
     await page.getByRole('button', { name: 'Edit Sketch' }).click()
-    await page.waitForTimeout(500) // wait for animation
+
+    // Wait for overlays to populate
+    await page.waitForTimeout(1000)
+
+    const startXPx = 500
+
+    await page.getByText(`line([0, 20], %)`).click()
+    await page.waitForTimeout(100)
+    await page.getByTestId('constraint-length').click()
+    await page.getByTestId('cmd-bar-arg-value').getByRole('textbox').fill('20')
     await page
-      .getByRole('button', { name: 'dimension Length', exact: true })
+      .getByRole('button', {
+        name: 'arrow right Continue',
+      })
       .click()
-    await expect(cmdBarKclInput).toHaveText('20')
-    await cmdBarKclInput.fill(lengthValue.new)
-    await expect(
-      page.getByText(`Can't calculate`),
-      `Something went wrong with the KCL expression evaluation`
-    ).not.toBeVisible()
-    await cmdBarSubmitButton.click()
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `length001 = ${lengthValue.new}sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
+      `length001 = 20sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
     )
 
     // Make sure we didn't pop out of sketch mode.
@@ -84,26 +65,29 @@ test.describe('Testing constraints', () => {
       page.getByRole('button', { name: 'Exit Sketch' })
     ).toBeVisible()
 
-    await page.waitForTimeout(500) // wait for animation
+    await page.waitForTimeout(2500) // wait for animation
 
     // Exit sketch
-    await page.keyboard.press('Escape')
+    await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
-    await expect(
+    await expect
-      page.getByRole('button', { name: 'Exit Sketch' })
+      .poll(async () => {
-    ).not.toBeVisible()
+        await page.keyboard.press('Escape', { delay: 500 })
+        return page.getByRole('button', { name: 'Exit Sketch' }).isVisible()
       })
-  test(`Remove constraints`, async ({ page }) => {
+      .toBe(false)
+  })
+  test(`Remove constraints`, async ({ page, homePage }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `yo = 79
-part001 = startSketchOn('XZ')
+  part001 = startSketchOn('XZ')
     |> startProfileAt([-7.54, -26.74], %)
     |> line([74.36, 130.4], %, $seg01)
     |> line([78.92, -120.11], %)
     |> angledLine([segAng(seg01), yo], %)
     |> line([41.19, 58.97 + 5], %)
-part002 = startSketchOn('XZ')
+  part002 = startSketchOn('XZ')
     |> startProfileAt([299.05, 120], %)
     |> xLine(-385.34, %, $seg_what)
     |> yLine(-170.06, %)
@@ -112,13 +96,17 @@ part002 = startSketchOn('XZ')
       )
     })
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await page.getByText('line([74.36, 130.4], %, $seg01)').click()
     await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+    // Wait for overlays to populate
+    await page.waitForTimeout(1000)
+
     const line3 = await u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`)
 
     await page.mouse.click(line3.x, line3.y)
@@ -131,14 +119,16 @@ part002 = startSketchOn('XZ')
     await page.getByRole('button', { name: 'remove constraints' }).click()
 
     await page.getByText('line([39.13, 68.63], %)').click()
+    await pollEditorLinesSelectedLength(page, 1)
     const activeLinesContent = await page.locator('.cm-activeLine').all()
-    await expect(activeLinesContent).toHaveLength(1)
     await expect(activeLinesContent[0]).toHaveText('|> line([39.13, 68.63], %)')
 
     // checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
     await expect(page.getByTestId('segment-overlay')).toHaveCount(4)
   })
   test.describe('Test perpendicular distance constraint', () => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const cases = [
       {
         testName: 'Add variable',
@@ -150,43 +140,75 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, offset } of cases) {
-      test(`${testName}`, async ({ page }) => {
+      test(`${testName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %, $seg01)
         |> line([78.92, -120.11], %)
         |> angledLine([segAng(seg01), 78.33], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
         |> xLine(segLen(seg_what), %)
         |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
+
+          const isChecked = await createNewVariableCheckbox.isChecked()
+          const addVariable = testName === 'Add variable'
+          XOR(isChecked, addVariable) && // XOR because no need to click the checkbox if the state is already correct
+            (await createNewVariableCheckbox.click())
+
+          await page
+            .getByRole('button', { name: 'Add constraining value' })
+            .click()
+
+          // Wait for the codemod to take effect
+          await expect(page.locator('.cm-content')).toContainText(`angle: -57,`)
+          await expect(page.locator('.cm-content')).toContainText(
+            `offset: ${offset},`
+          )
+
+          await pollEditorLinesSelectedLength(page, 2)
+          const activeLinesContent = await page.locator('.cm-activeLine').all()
+          await expect(activeLinesContent[0]).toHaveText(
+            `|> line([74.36, 130.4], %, $seg01)`
+          )
+          await expect(activeLinesContent[1]).toHaveText(`}, %)`)
+
+          // checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
+          await expect(page.getByTestId('segment-overlay')).toHaveCount(4)
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %, $seg01)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Give time for overlays to populate
+        await page.waitForTimeout(1000)
+
         const [line1, line3] = await Promise.all([
           u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`),
           u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`),
         ])
 
         await page.mouse.click(line1.x, line1.y)
-        await page.keyboard.down('Shift')
-        await page.mouse.click(line3.x, line3.y)
-        await page.waitForTimeout(100) // this wait is needed for webkit - not sure why
         await page.keyboard.up('Shift')
+        await page.keyboard.down('Shift')
+        await page.waitForTimeout(100)
+        await page.mouse.click(line3.x, line3.y)
+        await page.waitForTimeout(100)
+        await page.keyboard.up('Shift')
+        await page.waitForTimeout(100)
         await page
           .getByRole('button', {
             name: 'Length: open menu',
@@ -214,6 +236,7 @@ part002 = startSketchOn('XZ')
           `offset = ${offset},`
         )
 
+        await pollEditorLinesSelectedLength(page, 2)
         const activeLinesContent = await page.locator('.cm-activeLine').all()
         await expect(activeLinesContent[0]).toHaveText(
           `|> line([74.36, 130.4], %, $seg01)`
@@ -226,6 +249,8 @@ part002 = startSketchOn('XZ')
     }
   })
   test.describe('Test distance between constraint', () => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const cases = [
       {
         testName: 'Add variable',
@@ -249,18 +274,18 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page }) => {
+      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -269,13 +294,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1000, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const [line1, line3] = await Promise.all([
           u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`),
           u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`),
@@ -355,18 +384,18 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page }) => {
+      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -375,13 +404,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const [line3] = await Promise.all([
           u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`),
         ])
@@ -392,9 +425,11 @@ part002 = startSketchOn('XZ')
           await page.mouse.click(900, 250)
         }
         await page.keyboard.down('Shift')
+        await page.waitForTimeout(100)
         await page.mouse.click(line3.x, line3.y)
-        await page.waitForTimeout(100) // this wait is needed for webkit - not sure why
+        await page.waitForTimeout(100)
         await page.keyboard.up('Shift')
+        await page.waitForTimeout(100)
         await page
           .getByRole('button', {
             name: 'Length: open menu',
@@ -435,6 +470,8 @@ part002 = startSketchOn('XZ')
     }
   })
   test.describe('Test Angle constraint double segment selection', () => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const cases = [
       {
         testName: 'Add variable',
@@ -462,18 +499,18 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, addVariable, value, axisSelect } of cases) {
-      test(`${testName}`, async ({ page }) => {
+      test(`${testName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -482,13 +519,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const [line1, line3] = await Promise.all([
           u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`),
           u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`),
@@ -560,18 +601,18 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ page }) => {
+      test(`${testName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -580,13 +621,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1000, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const line3 = await u.getSegmentBodyCoords(
           `[data-overlay-index="${2}"]`
         )
@@ -617,6 +662,8 @@ part002 = startSketchOn('XZ')
     }
   })
   test.describe('Test Length constraint single selection', () => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const cases = [
       {
         testName: 'Length - Add variable',
@@ -632,7 +679,7 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ page }) => {
+      test(`${testName}`, async ({ context, homePage, page }) => {
         // constants and locators
         const cmdBarKclInput = page
           .getByTestId('cmd-bar-arg-value')
@@ -662,9 +709,9 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
@@ -720,18 +767,18 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page }) => {
+      test(`${constraintName}`, async ({ page, homePage }) => {
         await page.addInitScript(async (customCode) => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
         |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -740,13 +787,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1000, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const line1 = await u.getSegmentBodyCoords(
           `[data-overlay-index="${0}"]`
         )
@@ -765,8 +816,8 @@ part002 = startSketchOn('XZ')
         await page.keyboard.up('Shift')
 
         // check actives lines
+        await pollEditorLinesSelectedLength(page, codeAfter.length)
         const activeLinesContent = await page.locator('.cm-activeLine').all()
-        await expect(activeLinesContent).toHaveLength(codeAfter.length)
 
         const constraintMenuButton = page.getByRole('button', {
           name: 'Length: open menu',
@@ -798,6 +849,8 @@ part002 = startSketchOn('XZ')
     }
   })
   test.describe('Two segment - no modal constraints', () => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const cases = [
       {
         codeAfter: `|> angledLine([83, segLen(seg01)], %)`,
@@ -817,17 +870,17 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page }) => {
+      test(`${constraintName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -836,13 +889,17 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1000, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const line1 = await u.getBoundingBox(`[data-overlay-index="${0}"]`)
         const line3 = await u.getBoundingBox(`[data-overlay-index="${2}"]`)
 
@@ -869,8 +926,8 @@ part002 = startSketchOn('XZ')
         // check there are still 2 cursors (they should stay on the same lines as before constraint was applied)
         await expect(page.locator('.cm-cursor')).toHaveCount(2)
         // check actives lines
+        await pollEditorLinesSelectedLength(page, 2)
         const activeLinesContent = await page.locator('.cm-activeLine').all()
-        await expect(activeLinesContent).toHaveLength(2)
 
         // check both cursors are where they should be after constraint is applied
         await expect(activeLinesContent[0]).toHaveText(
@@ -894,17 +951,17 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName, axisClick } of cases) {
-      test(`${constraintName}`, async ({ page }) => {
+      test(`${constraintName}`, async ({ page, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-part001 = startSketchOn('XZ')
+      part001 = startSketchOn('XZ')
         |> startProfileAt([-7.54, -26.74], %)
         |> line([74.36, 130.4], %)
         |> line([78.92, -120.11], %)
         |> line([9.16, 77.79], %)
-part002 = startSketchOn('XZ')
+      part002 = startSketchOn('XZ')
         |> startProfileAt([299.05, 231.45], %)
         |> xLine(-425.34, %, $seg_what)
         |> yLine(-264.06, %)
@@ -913,21 +970,28 @@ part002 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
 
         await page.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+        // Wait for overlays to populate
+        await page.waitForTimeout(1000)
+
         const line3 = await u.getBoundingBox(`[data-overlay-index="${2}"]`)
 
         // select segment and axis by holding down shift
         await page.mouse.click(line3.x - 3, line3.y + 20)
+        await page.waitForTimeout(100)
         await page.keyboard.down('Shift')
         await page.waitForTimeout(100)
         await page.mouse.click(axisClick.x, axisClick.y)
+        await page.waitForTimeout(100)
         await page.keyboard.up('Shift')
+        await page.waitForTimeout(100)
         const constraintMenuButton = page.getByRole('button', {
           name: 'Length: open menu',
         })
@@ -947,9 +1011,9 @@ part002 = startSketchOn('XZ')
     }
   })
 
-  test('Horizontally constrained line remains selected after applying constraint', async ({
+  test.fixme(
-    page,
+    'Horizontally constrained line remains selected after applying constraint',
-  }) => {
+    async ({ page, homePage }) => {
       test.setTimeout(70_000)
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -960,26 +1024,21 @@ part002 = startSketchOn('XZ')
     |> line([3.13, -2.4], %)`
         )
       })
-
-    // constants and locators
-    const cmdBarKclInput = page
-      .getByTestId('cmd-bar-arg-value')
-      .getByRole('textbox')
-    const cmdBarSubmitButton = page.getByRole('button', {
-      name: 'arrow right Continue',
-    })
-
       const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
 
       await page.getByText('line([3.79, 2.68], %, $seg01)').click()
-    await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeEnabled(
+      await expect(
-      { timeout: 10_000 }
+        page.getByRole('button', { name: 'Edit Sketch' })
-    )
+      ).toBeEnabled({ timeout: 10_000 })
       await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
+      // Wait for overlays to populate
+      await page.waitForTimeout(1000)
+
       await page.waitForTimeout(100)
       const lineBefore = await u.getSegmentBodyCoords(
         `[data-overlay-index="1"]`,
@@ -1000,11 +1059,19 @@ part002 = startSketchOn('XZ')
           name: 'Length: open menu',
         })
         .click()
-    await page.getByRole('button', { name: 'Horizontal', exact: true }).click()
+      await page.waitForTimeout(500)
+      await page
+        .getByRole('button', { name: 'Horizontal', exact: true })
+        .click()
+      await page.waitForTimeout(500)
 
+      await pollEditorLinesSelectedLength(page, 1)
       let activeLinesContent = await page.locator('.cm-activeLine').all()
       await expect(activeLinesContent[0]).toHaveText(`|> xLine(3.13, %)`)
 
+      // Wait for code editor to settle.
+      await page.waitForTimeout(2000)
+
       // If the overlay-angle is updated the THREE.js scene is in a good state
       await expect(
         await page.locator('[data-overlay-index="1"]')
@@ -1014,46 +1081,55 @@ part002 = startSketchOn('XZ')
         `[data-overlay-index="1"]`,
         0
       )
-    expect(
-      await u.getGreatestPixDiff(lineAfter, TEST_COLORS.BLUE)
-    ).toBeLessThan(3)
 
-    await page.waitForTimeout(300)
+      const linebb = await u.getBoundingBox('[data-overlay-index="1"]')
-    await page
+      await page.mouse.move(linebb.x, linebb.y, { steps: 25 })
-      .getByRole('button', {
+      await page.mouse.click(linebb.x, linebb.y)
-        name: 'Length: open menu',
+
-      })
+      await expect
-      .click()
+        .poll(
+          async () => await u.getGreatestPixDiff(lineAfter, TEST_COLORS.BLUE)
+        )
+        .toBeLessThan(3)
+
+      await page.waitForTimeout(500)
+
       // await expect(page.getByRole('button', { name: 'length', exact: true })).toBeVisible()
       await page.waitForTimeout(200)
       // await page.getByRole('button', { name: 'length', exact: true }).click()
-    await page.getByTestId('dropdown-constraint-length').click()
+      await page.getByTestId('constraint-length').click()
 
-    await cmdBarKclInput.fill('10')
+      await page
-    await cmdBarSubmitButton.click()
+        .getByTestId('cmd-bar-arg-value')
+        .getByRole('textbox')
+        .fill('10')
+      await page
+        .getByRole('button', {
+          name: 'arrow right Continue',
+        })
+        .click()
 
+      await pollEditorLinesSelectedLength(page, 1)
       activeLinesContent = await page.locator('.cm-activeLine').all()
       await expect(activeLinesContent[0]).toHaveText(`|> xLine(length001, %)`)
 
       // checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
       await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
-  })
+    }
+  )
 })
-testFixture.describe('Electron constraint tests', () => {
+test.describe('Electron constraint tests', () => {
-  testFixture(
+  test(
     'Able to double click label to set constraint',
     { tag: '@electron' },
-    async ({ tronApp, homePage, scene, editor, toolbar }) => {
+    async ({ page, context, homePage, scene, editor, toolbar }) => {
-      await tronApp.initialise({
+      await context.folderSetupFn(async (dir) => {
-        fixtures: { homePage, scene, editor, toolbar },
+        const bracketDir = path.join(dir, 'test-sample')
-        folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.copyFile(
           executorInputPath('angled_line.kcl'),
-            join(bracketDir, 'main.kcl')
+          path.join(bracketDir, 'main.kcl')
         )
-        },
       })
       const [clickHandler] = scene.makeMouseHelpers(600, 300)
 
@@ -1073,23 +1149,23 @@ testFixture.describe('Electron constraint tests', () => {
 
       await test.step('Double click to constrain', async () => {
         await clickHandler()
-        await tronApp.page.getByRole('button', { name: 'Edit Sketch' }).click()
+        await page.getByRole('button', { name: 'Edit Sketch' }).click()
-        const child = tronApp.page
+        const child = page
           .locator('.segment-length-label-text')
           .first()
           .locator('xpath=..')
         await child.dblclick()
-        const cmdBarSubmitButton = tronApp.page.getByRole('button', {
+        const cmdBarSubmitButton = page.getByRole('button', {
           name: 'arrow right Continue',
         })
         await cmdBarSubmitButton.click()
-        await expectFixture(tronApp.page.locator('.cm-content')).toContainText(
+        await expect(page.locator('.cm-content')).toContainText(
           'length001 = 15.3'
         )
-        await expectFixture(tronApp.page.locator('.cm-content')).toContainText(
+        await expect(page.locator('.cm-content')).toContainText(
           '|> angledLine([9, length001], %)'
         )
-        await tronApp.page.getByRole('button', { name: 'Exit Sketch' }).click()
+        await page.getByRole('button', { name: 'Exit Sketch' }).click()
       })
     }
   )

e2e/playwright/testing-gizmo.spec.ts

@@ -1,18 +1,11 @@
-import { _test, _expect } from './playwright-deprecated'
+import { test, expect } from './zoo-test'
-import { test } from './fixtures/fixtureSetup'
+import { getUtils } from './test-utils'
-import { getUtils, setup, tearDown } from './test-utils'
 import { uuidv4 } from 'lib/utils'
 import { TEST_CODE_GIZMO } from './storageStates'
 
-_test.beforeEach(async ({ context, page }, testInfo) => {
+test.describe('Testing Gizmo', () => {
-  await setup(context, page, testInfo)
+  // TODO: fix this test on windows after the electron migration
-})
+  test.skip(process.platform === 'win32', 'Skip on windows')
-
-_test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-_test.describe('Testing Gizmo', () => {
   const cases = [
     {
       testDescription: 'top view',
@@ -57,14 +50,17 @@ _test.describe('Testing Gizmo', () => {
     expectedCameraTarget,
     testDescription,
   } of cases) {
-    _test(`check ${testDescription}`, async ({ page, browserName }) => {
+    test(`check ${testDescription}`, async ({ page, homePage }) => {
       const u = await getUtils(page)
       await page.addInitScript((TEST_CODE_GIZMO) => {
         localStorage.setItem('persistCode', TEST_CODE_GIZMO)
       }, TEST_CODE_GIZMO)
-      await page.setViewportSize({ width: 1000, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await page.setBodyDimensions({ width: 1000, height: 500 })
+
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
+
       await page.waitForTimeout(100)
       // wait for execution done
       await u.openDebugPanel()
@@ -117,30 +113,30 @@ _test.describe('Testing Gizmo', () => {
 
       await Promise.all([
         // position
-        _expect(page.getByTestId('cam-x-position')).toHaveValue(
+        expect(page.getByTestId('cam-x-position')).toHaveValue(
           expectedCameraPosition.x.toString()
         ),
-        _expect(page.getByTestId('cam-y-position')).toHaveValue(
+        expect(page.getByTestId('cam-y-position')).toHaveValue(
           expectedCameraPosition.y.toString()
         ),
-        _expect(page.getByTestId('cam-z-position')).toHaveValue(
+        expect(page.getByTestId('cam-z-position')).toHaveValue(
           expectedCameraPosition.z.toString()
         ),
         // target
-        _expect(page.getByTestId('cam-x-target')).toHaveValue(
+        expect(page.getByTestId('cam-x-target')).toHaveValue(
           expectedCameraTarget.x.toString()
         ),
-        _expect(page.getByTestId('cam-y-target')).toHaveValue(
+        expect(page.getByTestId('cam-y-target')).toHaveValue(
           expectedCameraTarget.y.toString()
         ),
-        _expect(page.getByTestId('cam-z-target')).toHaveValue(
+        expect(page.getByTestId('cam-z-target')).toHaveValue(
           expectedCameraTarget.z.toString()
         ),
       ])
     })
   }
 
-  _test('Context menu and popover menu', async ({ page }) => {
+  test('Context menu and popover menu', async ({ page, homePage }) => {
     const testCase = {
       testDescription: 'Right view',
       expectedCameraPosition: { x: 5660.02, y: -152, z: 26 },
@@ -152,9 +148,9 @@ _test.describe('Testing Gizmo', () => {
     await page.addInitScript((TEST_CODE_GIZMO) => {
       localStorage.setItem('persistCode', TEST_CODE_GIZMO)
     }, TEST_CODE_GIZMO)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await page.waitForTimeout(100)
     // wait for execution done
     await u.openDebugPanel()
@@ -196,7 +192,7 @@ _test.describe('Testing Gizmo', () => {
     const buttonToTest = page.getByRole('button', {
       name: testCase.testDescription,
     })
-    await _expect(buttonToTest).toBeVisible()
+    await expect(buttonToTest).toBeVisible()
     await buttonToTest.click()
 
     // Now assert we've moved to the correct view
@@ -215,23 +211,23 @@ _test.describe('Testing Gizmo', () => {
 
     await Promise.all([
       // position
-      _expect(page.getByTestId('cam-x-position')).toHaveValue(
+      expect(page.getByTestId('cam-x-position')).toHaveValue(
         testCase.expectedCameraPosition.x.toString()
       ),
-      _expect(page.getByTestId('cam-y-position')).toHaveValue(
+      expect(page.getByTestId('cam-y-position')).toHaveValue(
         testCase.expectedCameraPosition.y.toString()
       ),
-      _expect(page.getByTestId('cam-z-position')).toHaveValue(
+      expect(page.getByTestId('cam-z-position')).toHaveValue(
         testCase.expectedCameraPosition.z.toString()
       ),
       // target
-      _expect(page.getByTestId('cam-x-target')).toHaveValue(
+      expect(page.getByTestId('cam-x-target')).toHaveValue(
         testCase.expectedCameraTarget.x.toString()
       ),
-      _expect(page.getByTestId('cam-y-target')).toHaveValue(
+      expect(page.getByTestId('cam-y-target')).toHaveValue(
         testCase.expectedCameraTarget.y.toString()
       ),
-      _expect(page.getByTestId('cam-z-target')).toHaveValue(
+      expect(page.getByTestId('cam-z-target')).toHaveValue(
         testCase.expectedCameraTarget.z.toString()
       ),
     ])
@@ -242,32 +238,59 @@ _test.describe('Testing Gizmo', () => {
     const gizmoPopoverButton = page.getByRole('button', {
       name: 'view settings',
     })
-    await _expect(gizmoPopoverButton).toBeVisible()
+    await expect(gizmoPopoverButton).toBeVisible()
     await gizmoPopoverButton.click()
-    await _expect(buttonToTest).toBeVisible()
+    await expect(buttonToTest).toBeVisible()
   })
 })
 
 test.describe(`Testing gizmo, fixture-based`, () => {
   test('Center on selection from menu', async ({
-    app,
+    context,
+    page,
+    homePage,
     cmdBar,
     editor,
     toolbar,
     scene,
   }) => {
-    test.skip(
+    await context.addInitScript(() => {
-      process.platform === 'win32',
+      localStorage.setItem(
-      'Fails on windows in CI, can not be replicated locally on windows.'
+        'persistCode',
+        `
+        const sketch002 = startSketchOn('XZ')
+          |> startProfileAt([-108.83, -57.48], %)
+          |> angledLine([0, 105.13], %, $rectangleSegmentA001)
+          |> angledLine([
+               segAng(rectangleSegmentA001) - 90,
+               77.9
+             ], %)
+          |> angledLine([
+               segAng(rectangleSegmentA001),
+               -segLen(rectangleSegmentA001)
+             ], %)
+          |> close(%)
+        const sketch001 = startSketchOn('XZ')
+          |> circle({
+               center: [818.33, 168.1],
+               radius: 182.8
+             }, %)
+          |> extrude(50, %)
+      `
       )
+    })
+
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+
+    await homePage.goToModelingScene()
+    const u = await getUtils(page)
+    await u.waitForPageLoad()
 
     await test.step(`Setup`, async () => {
-      const file = await app.getInputFile('test-circle-extrude.kcl')
-      await app.initialise(file)
       await scene.expectState({
         camera: {
-          position: [4982.21, -23865.37, 13810.64],
+          position: [11912.6, -39586.98, 21391.21],
-          target: [4982.21, 0, 2737.1],
+          target: [11912.6, -635, 3317.49],
         },
       })
     })
@@ -275,7 +298,7 @@ test.describe(`Testing gizmo, fixture-based`, () => {
 
     await test.step(`Select an edge of this circle`, async () => {
       const circleSnippet =
-        'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
+        'circle({ center: [818.33, 168.1], radius: 182.8 }, %)'
       await moveToCircle()
       await clickCircle()
       await editor.expectState({
@@ -292,8 +315,8 @@ test.describe(`Testing gizmo, fixture-based`, () => {
     await test.step(`Verify the camera moved`, async () => {
       await scene.expectState({
         camera: {
-          position: [0, -23865.37, 11073.53],
+          position: [20785.58, -40221.98, 22343.46],
-          target: [0, 0, 0],
+          target: [20785.58, -1270, 4269.74],
         },
       })
     })

e2e/playwright/testing-perspective-toggle.spec.ts

@@ -1,18 +1,8 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
-import { TEST_SETTINGS, TEST_SETTINGS_KEY } from './storageStates'
-import * as TOML from '@iarna/toml'
-
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Test toggling perspective', () => {
-  test('via command palette and toggle', async ({ page }) => {
+  test.fixme('via command palette and toggle', async ({ page, homePage }) => {
     const u = await getUtils(page)
 
     // Locators and constants
@@ -20,7 +10,7 @@ test.describe('Test toggling perspective', () => {
     const screenHeight = 500
     const checkedScreenLocation = {
       x: screenWidth * 0.71,
-      y: screenHeight * 0.4,
+      y: screenHeight * 0.2,
     }
     const backgroundColor: [number, number, number] = [29, 29, 29]
     const xzPlaneColor: [number, number, number] = [82, 55, 96]
@@ -40,8 +30,8 @@ test.describe('Test toggling perspective', () => {
     })
 
     await test.step('Setup', async () => {
-      await page.setViewportSize({ width: screenWidth, height: screenHeight })
+      await page.setBodyDimensions({ width: screenWidth, height: screenHeight })
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
       await u.closeKclCodePanel()
       await expect
         .poll(async () => locationToHaveColor(backgroundColor), {
@@ -52,11 +42,17 @@ test.describe('Test toggling perspective', () => {
       await expect(projectionToggle).toHaveAttribute('aria-checked', 'true')
     })
 
+    // Extremely wild note: flicking between ortho and persp actually changes
+    // the orientation of the axis/camera. How can you see this? Well toggle it,
+    // then refresh. You'll see it doesn't match what we left.
     await test.step('Switch to ortho via command palette', async () => {
       await commandPaletteButton.click()
+      await page.waitForTimeout(1000)
       await commandOption.click()
+      await page.waitForTimeout(1000)
       await orthoOption.click()
       await expect(commandToast).toBeVisible()
+      await expect(commandToast).not.toBeVisible()
       await expect
         .poll(async () => locationToHaveColor(xzPlaneColor), {
           timeout: 5000,
@@ -67,27 +63,9 @@ test.describe('Test toggling perspective', () => {
     })
 
     await test.step(`Refresh the page and ensure the stream is loaded in ortho`, async () => {
-      // In playwright web, the settings set while testing are not persisted because
-      // the `addInitScript` within `setup` is re-run on page reload
-      await page.addInitScript(
-        ({ settingsKey, settings }) => {
-          localStorage.setItem(settingsKey, settings)
-        },
-        {
-          settingsKey: TEST_SETTINGS_KEY,
-          settings: TOML.stringify({
-            settings: {
-              ...TEST_SETTINGS,
-              modeling: {
-                ...TEST_SETTINGS.modeling,
-                cameraProjection: 'orthographic',
-              },
-            },
-          }),
-        }
-      )
       await page.reload()
-      await u.waitForAuthSkipAppStart()
+      await page.waitForTimeout(1000)
+      await u.closeKclCodePanel()
       await expect
         .poll(async () => locationToHaveColor(xzPlaneColor), {
           timeout: 5000,

e2e/playwright/testing-samples-loading.spec.ts

@@ -1,35 +1,30 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
-import { getUtils, setup, setupElectron, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
 import { FILE_EXT } from 'lib/constants'
 import { UnitLength_type } from '@kittycad/lib/dist/types/src/models'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Testing in-app sample loading', () => {
   /**
    * Note this test implicitly depends on the KCL sample "car-wheel.kcl",
    * its title, and its units settings. https://github.com/KittyCAD/kcl-samples/blob/main/car-wheel/car-wheel.kcl
    */
   test('Web: should overwrite current code, cannot create new file', async ({
+    editor,
+    context,
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
     await test.step(`Test setup`, async () => {
-      await page.addInitScript((code) => {
+      await context.addInitScript((code) => {
         window.localStorage.setItem('persistCode', code)
       }, bracket)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
     })
 
     // Locators and constants
@@ -54,13 +49,13 @@ test.describe('Testing in-app sample loading', () => {
       })
     const warningText = page.getByText('Overwrite current file and units?')
     const confirmButton = page.getByRole('button', { name: 'Submit command' })
-    const codeLocator = page.locator('.cm-content')
     const unitsToast = (unit: UnitLength_type) =>
       page.getByText(`Set default unit to "${unit}" for this project`)
 
     await test.step(`Precondition: check the initial code`, async () => {
       await u.openKclCodePanel()
-      await expect(codeLocator).toContainText(bracket.split('\n')[0])
+      await editor.scrollToText(bracket.split('\n')[0])
+      await editor.expectEditor.toContain(bracket.split('\n')[0])
     })
 
     await test.step(`Load a KCL sample with the command palette`, async () => {
@@ -73,7 +68,7 @@ test.describe('Testing in-app sample loading', () => {
       await expect(warningText).toBeVisible()
       await confirmButton.click()
 
-      await expect(codeLocator).toContainText('// ' + newSample.title)
+      await editor.expectEditor.toContain('// ' + newSample.title)
       await expect(unitsToast('in')).toBeVisible()
     })
   })
@@ -86,16 +81,13 @@ test.describe('Testing in-app sample loading', () => {
   test(
     'Desktop: should create new file by default, optionally overwrite',
     { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
+    async ({ editor, context, page }, testInfo) => {
-      const { electronApp, page, dir } = await setupElectron({
+      const { dir } = await context.folderSetupFn(async (dir) => {
-        testInfo,
-        folderSetupFn: async (dir) => {
         const bracketDir = join(dir, 'bracket')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.writeFile(join(bracketDir, 'main.kcl'), bracket, {
           encoding: 'utf-8',
         })
-        },
       })
       const u = await getUtils(page)
 
@@ -134,19 +126,19 @@ test.describe('Testing in-app sample loading', () => {
         page.getByRole('listitem').filter({
           has: page.getByRole('button', { name }),
         })
-      const codeLocator = page.locator('.cm-content')
       const unitsToast = (unit: UnitLength_type) =>
         page.getByText(`Set default unit to "${unit}" for this project`)
 
       await test.step(`Test setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
         await projectCard.click()
         await u.waitForPageLoad()
       })
 
       await test.step(`Precondition: check the initial code`, async () => {
         await u.openKclCodePanel()
-        await expect(codeLocator).toContainText(bracket.split('\n')[0])
+        await editor.scrollToText(bracket.split('\n')[0])
+        await editor.expectEditor.toContain(bracket.split('\n')[0])
         await u.openFilePanel()
 
         await expect(projectMenuButton).toContainText('main.kcl')
@@ -163,7 +155,7 @@ test.describe('Testing in-app sample loading', () => {
       })
 
       await test.step(`Ensure we made and opened a new file`, async () => {
-        await expect(codeLocator).toContainText('// ' + sampleOne.title)
+        await editor.expectEditor.toContain('// ' + sampleOne.title)
         await expect(newlyCreatedFile(sampleOne.file)).toBeVisible()
         await expect(projectMenuButton).toContainText(sampleOne.file)
         await expect(unitsToast('in')).toBeVisible()
@@ -182,7 +174,7 @@ test.describe('Testing in-app sample loading', () => {
       })
 
       await test.step(`Ensure we overwrote the current file without navigating`, async () => {
-        await expect(codeLocator).toContainText('// ' + sampleTwo.title)
+        await editor.expectEditor.toContain('// ' + sampleTwo.title)
         await test.step(`Check actual file contents`, async () => {
           await expect
             .poll(async () => {
@@ -198,8 +190,6 @@ test.describe('Testing in-app sample loading', () => {
         await expect(projectMenuButton).toContainText(sampleOne.file)
         await expect(unitsToast('mm')).toBeVisible()
       })
-
-      await electronApp.close()
     }
   )
 })

e2e/playwright/testing-segment-overlays.spec.ts

@@ -1,19 +1,16 @@
-import { test, expect, Page } from '@playwright/test'
+import { test, expect, Page } from './zoo-test'
 
-import { deg, getUtils, setup, tearDown, wiggleMove } from './test-utils'
+import { deg, getUtils, wiggleMove } from './test-utils'
 import { LineInputsType } from 'lang/std/sketchcombos'
 import { uuidv4 } from 'lib/utils'
-
+import { EditorFixture } from './fixtures/editorFixture'
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
 
 test.describe('Testing segment overlays', () => {
+  // TODO: fix this test on windows after the electron migration
+  test.skip(process.platform === 'win32', 'Skip on windows')
   test.describe('Hover over a segment should show its overlay, hovering over the input overlays should show its popover, clicking the input overlay should constrain/unconstrain it:\nfor the following segments', () => {
+    // TODO: fix this test on mac after the electron migration
+    test.skip(process.platform === 'darwin', 'Skip on mac')
     /**
      * Clicks on an constrained element
      * @param {Page} page - The page to perform the action on
@@ -24,7 +21,7 @@ test.describe('Testing segment overlays', () => {
      * @param {number} options.steps - The number of steps to perform
      */
     const _clickConstrained =
-      (page: Page) =>
+      (page: Page, editor: EditorFixture) =>
       async ({
         hoverPos,
         constraintType,
@@ -58,10 +55,11 @@ test.describe('Testing segment overlays', () => {
         y = hoverPos.y - Math.sin(ang * deg) * 32
         await page.mouse.move(x, y)
         await wiggleMove(page, x, y, 20, 30, ang, 10, 5, locator)
+        await page.mouse.move(x, y)
 
-        await expect(page.locator('.cm-content')).toContainText(
+        await editor.expectEditor.toContain(expectBeforeUnconstrained, {
-          expectBeforeUnconstrained
+          shouldNormalise: true,
-        )
+        })
         const constrainedLocator = page.locator(
           `[data-constraint-type="${constraintType}"][data-is-constrained="true"]`
         )
@@ -71,9 +69,9 @@ test.describe('Testing segment overlays', () => {
           await page.getByTestId('constraint-symbol-popover').count()
         ).toBeGreaterThan(0)
         await constrainedLocator.click()
-        await expect(page.locator('.cm-content')).toContainText(
+        await editor.expectEditor.toContain(expectAfterUnconstrained, {
-          expectAfterUnconstrained
+          shouldNormalise: true,
-        )
+        })
 
         await page.mouse.move(0, 0)
         await page.waitForTimeout(1000)
@@ -81,6 +79,7 @@ test.describe('Testing segment overlays', () => {
         y = hoverPos.y - Math.sin(ang * deg) * 32
         await page.mouse.move(x, y)
         await wiggleMove(page, x, y, 20, 30, ang, 10, 5, locator)
+        await page.mouse.move(x, y)
 
         const unconstrainedLocator = page.locator(
           `[data-constraint-type="${constraintType}"][data-is-constrained="false"]`
@@ -100,6 +99,12 @@ test.describe('Testing segment overlays', () => {
           })
           .click()
         await expect(page.locator('.cm-content')).toContainText(expectFinal)
+        await editor.expectEditor.toContain(expectFinal, {
+          shouldNormalise: true,
+        })
+        await editor.expectEditor.toContain(expectFinal, {
+          shouldNormalise: true,
+        })
       }
 
     /**
@@ -112,7 +117,7 @@ test.describe('Testing segment overlays', () => {
      * @param {number} options.steps - The number of steps to perform
      */
     const _clickUnconstrained =
-      (page: Page) =>
+      (page: Page, editor: EditorFixture) =>
       async ({
         hoverPos,
         constraintType,
@@ -144,11 +149,12 @@ test.describe('Testing segment overlays', () => {
         y = hoverPos.y - Math.sin(ang * deg) * 32
         await page.mouse.move(x, y)
         await wiggleMove(page, x, y, 20, 30, ang, 10, 5, locator)
+        await page.mouse.move(x, y)
 
         await expect(page.getByText('Added variable')).not.toBeVisible()
-        await expect(page.locator('.cm-content')).toContainText(
+        await editor.expectEditor.toContain(expectBeforeUnconstrained, {
-          expectBeforeUnconstrained
+          shouldNormalise: true,
-        )
+        })
         const unconstrainedLocator = page.locator(
           `[data-constraint-type="${constraintType}"][data-is-constrained="false"]`
         )
@@ -166,9 +172,9 @@ test.describe('Testing segment overlays', () => {
             name: 'arrow right Continue',
           })
           .click()
-        await expect(page.locator('.cm-content')).toContainText(
+        await editor.expectEditor.toContain(expectAfterUnconstrained, {
-          expectAfterUnconstrained
+          shouldNormalise: true,
-        )
+        })
         await expect(page.getByText('Added variable')).not.toBeVisible()
 
         await page.mouse.move(0, 0)
@@ -177,6 +183,7 @@ test.describe('Testing segment overlays', () => {
         y = hoverPos.y - Math.sin(ang * deg) * 32
         await page.mouse.move(x, y)
         await wiggleMove(page, x, y, 20, 30, ang, 10, 5, locator)
+        await page.mouse.move(x, y)
 
         const constrainedLocator = page.locator(
           `[data-constraint-type="${constraintType}"][data-is-constrained="true"]`
@@ -187,11 +194,15 @@ test.describe('Testing segment overlays', () => {
           await page.getByTestId('constraint-symbol-popover').count()
         ).toBeGreaterThan(0)
         await constrainedLocator.click()
-        await expect(page.locator('.cm-content')).toContainText(expectFinal)
+        await editor.expectEditor.toContain(expectFinal, {
+          shouldNormalise: true,
+        })
       }
     test.setTimeout(120000)
     test('for segments [line, angledLine, lineTo, xLineTo]', async ({
       page,
+      editor,
+      homePage,
     }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -219,9 +230,9 @@ test.describe('Testing segment overlays', () => {
         )
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -235,8 +246,8 @@ test.describe('Testing segment overlays', () => {
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(13)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+      const clickUnconstrained = _clickUnconstrained(page, editor)
-      const clickConstrained = _clickConstrained(page)
+      const clickConstrained = _clickConstrained(page, editor)
 
       await u.openAndClearDebugPanel()
       await u.sendCustomCmd({
@@ -354,18 +365,22 @@ test.describe('Testing segment overlays', () => {
         locator: '[data-overlay-toolbar-index="3"]',
       })
     })
-    test('for segments [yLineTo, xLine]', async ({ page }) => {
+
+    // Broken on main at time of writing!
+    test.fixme(
+      'for segments [yLineTo, xLine]',
+      async ({ page, editor, homePage }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yRel001 = -14
-xRel001 = 0.5
+    xRel001 = 0.5
-angle001 = 3
+    angle001 = 3
-len001 = 32
+    len001 = 32
-yAbs001 = 11.5
+    yAbs001 = 11.5
-xAbs001 = 33
+    xAbs001 = 33
-xAbs002 = 4
+    xAbs002 = 4
-part001 = startSketchOn('XZ')
+    part001 = startSketchOn('XZ')
       |> startProfileAt([0, 0], %)
       |> line([0.5, yRel001], %)
       |> angledLine({ angle = angle001, length = len001 }, %)
@@ -379,9 +394,9 @@ part001 = startSketchOn('XZ')
           )
         })
         const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
 
         // wait for execution done
         await u.openDebugPanel()
@@ -395,7 +410,7 @@ part001 = startSketchOn('XZ')
 
         await expect(page.getByTestId('segment-overlay')).toHaveCount(8)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+        const clickUnconstrained = _clickUnconstrained(page, editor)
 
         await page.mouse.move(700, 250)
         await page.waitForTimeout(100)
@@ -406,7 +421,7 @@ part001 = startSketchOn('XZ')
         ang = await u.getAngle(`[data-overlay-index="4"]`)
         console.log('ylineTo1')
         await clickUnconstrained({
-        hoverPos: { x: yLineTo.x, y: yLineTo.y },
+          hoverPos: { x: yLineTo.x, y: yLineTo.y - 200 },
           constraintType: 'yAbsolute',
           expectBeforeUnconstrained: 'yLineTo(-10.77, %, $a)',
           expectAfterUnconstrained: 'yLineTo(yAbs002, %, $a)',
@@ -428,9 +443,12 @@ part001 = startSketchOn('XZ')
           ang: ang + 180,
           locator: '[data-overlay-toolbar-index="5"]',
         })
-    })
+      }
+    )
     test('for segments [yLine, angledLineOfXLength, angledLineOfYLength]', async ({
       page,
+      editor,
+      homePage,
     }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -459,9 +477,9 @@ part001 = startSketchOn('XZ')
         localStorage.setItem('disableAxis', 'true')
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -476,8 +494,8 @@ part001 = startSketchOn('XZ')
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(13)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+      const clickUnconstrained = _clickUnconstrained(page, editor)
-      const clickConstrained = _clickConstrained(page)
+      const clickConstrained = _clickConstrained(page, editor)
 
       let ang = 0
 
@@ -560,6 +578,8 @@ part001 = startSketchOn('XZ')
     })
     test('for segments [angledLineToX, angledLineToY, angledLineThatIntersects]', async ({
       page,
+      editor,
+      homePage,
     }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -588,9 +608,9 @@ part001 = startSketchOn('XZ')
         localStorage.setItem('disableAxis', 'true')
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -604,8 +624,8 @@ part001 = startSketchOn('XZ')
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(13)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+      const clickUnconstrained = _clickUnconstrained(page, editor)
-      const clickConstrained = _clickConstrained(page)
+      const clickConstrained = _clickConstrained(page, editor)
 
       let ang = 0
 
@@ -717,7 +737,11 @@ part001 = startSketchOn('XZ')
         locator: '[data-overlay-toolbar-index="11"]',
       })
     })
-    test('for segment [tangentialArcTo]', async ({ page }) => {
+    test('for segment [tangentialArcTo]', async ({
+      page,
+      editor,
+      homePage,
+    }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -745,9 +769,9 @@ part001 = startSketchOn('XZ')
         localStorage.setItem('disableAxis', 'true')
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -761,8 +785,8 @@ part001 = startSketchOn('XZ')
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(13)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+      const clickUnconstrained = _clickUnconstrained(page, editor)
-      const clickConstrained = _clickConstrained(page)
+      const clickConstrained = _clickConstrained(page, editor)
 
       const tangentialArcTo = await u.getBoundingBox(
         '[data-overlay-index="12"]'
@@ -791,20 +815,20 @@ part001 = startSketchOn('XZ')
         locator: '[data-overlay-toolbar-index="12"]',
       })
     })
-    test('for segment [circle]', async ({ page }) => {
+    test('for segment [circle]', async ({ page, editor, homePage }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
           `part001 = startSketchOn('XZ')
       |> circle({ center = [1 + 0, 0], radius = 8 }, %)
-`
+    `
         )
         localStorage.setItem('disableAxis', 'true')
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -820,8 +844,8 @@ part001 = startSketchOn('XZ')
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(1)
 
-      const clickUnconstrained = _clickUnconstrained(page)
+      const clickUnconstrained = _clickUnconstrained(page, editor)
-      const clickConstrained = _clickConstrained(page)
+      const clickConstrained = _clickConstrained(page, editor)
 
       const hoverPos = { x: 789, y: 114 } as const
       let ang = await u.getAngle('[data-overlay-index="0"]')
@@ -847,8 +871,8 @@ part001 = startSketchOn('XZ')
         expectAfterUnconstrained:
           'circle({ center = [xAbs001, yAbs001], radius =  8 }, %)',
         expectFinal: 'circle({ center = [xAbs001, 0], radius =  8 }, %)',
-        ang: ang + 105,
+        ang: ang + 180,
-        steps: 10,
+        steps: 30,
         locator: '[data-overlay-toolbar-index="0"]',
       })
       console.log('circle radius')
@@ -868,7 +892,7 @@ part001 = startSketchOn('XZ')
   })
   test.describe('Testing deleting a segment', () => {
     const _deleteSegmentSequence =
-      (page: Page) =>
+      (page: Page, editor: EditorFixture) =>
       async ({
         hoverPos,
         codeToBeDeleted,
@@ -894,17 +918,20 @@ part001 = startSketchOn('XZ')
         y = hoverPos.y - Math.sin(ang * deg) * 32
         await page.mouse.move(x, y)
         await wiggleMove(page, x, y, 20, 30, ang, 10, 5, locator)
+        await page.mouse.move(x, y)
 
-        await expect(page.locator('.cm-content')).toContainText(codeToBeDeleted)
+        await editor.expectEditor.toContain(codeToBeDeleted, {
+          shouldNormalise: true,
+        })
 
         await page.locator(`[data-stdlib-fn-name="${stdLibFnName}"]`).click()
         await page.getByText('Delete Segment').click()
 
-        await expect(page.locator('.cm-content')).not.toContainText(
+        await editor.expectEditor.not.toContain(codeToBeDeleted, {
-          codeToBeDeleted
+          shouldNormalise: true,
-        )
+        })
       }
-    test('all segment types', async ({ page }) => {
+    test('all segment types', async ({ page, editor, homePage }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -932,9 +959,10 @@ part001 = startSketchOn('XZ')
         localStorage.setItem('disableAxis', 'true')
       })
       const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
 
       // wait for execution done
       await u.openDebugPanel()
@@ -947,7 +975,7 @@ part001 = startSketchOn('XZ')
       await page.waitForTimeout(500)
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(13)
-      const deleteSegmentSequence = _deleteSegmentSequence(page)
+      const deleteSegmentSequence = _deleteSegmentSequence(page, editor)
 
       let segmentToDelete
 
@@ -1080,16 +1108,19 @@ part001 = startSketchOn('XZ')
         5,
         '[data-overlay-toolbar-index="2"]'
       )
+      await page.mouse.move(hoverPos.x, hoverPos.y)
 
       const codeToBeDeleted = 'lineTo([33, 11.5 + 0], %)'
-      await expect(page.locator('.cm-content')).toContainText(codeToBeDeleted)
+      await editor.expectEditor.toContain(codeToBeDeleted, {
+        shouldNormalise: true,
+      })
 
       await page.getByTestId('overlay-menu').click()
       await page.getByText('Delete Segment').click()
 
-      await expect(page.locator('.cm-content')).not.toContainText(
+      await editor.expectEditor.not.toContain(codeToBeDeleted, {
-        codeToBeDeleted
+        shouldNormalise: true,
-      )
+      })
 
       segmentToDelete = await getOverlayByIndex(1)
       ang = await u.getAngle(`[data-overlay-index="${1}"]`)
@@ -1135,7 +1166,7 @@ part001 = startSketchOn('XZ')
         const isObj = lineOfInterest.includes('{ angle = 3,')
         test(`${lineOfInterest.split('(')[0]}${isObj ? '-[obj-input]' : ''}${
           doesHaveTagOutsideSketch ? '-[tagOutsideSketch]' : ''
-        }`, async ({ page }) => {
+        }`, async ({ page, editor, homePage }) => {
           await page.addInitScript(
             async ({ lineToBeDeleted, extraLine }) => {
               localStorage.setItem(
@@ -1145,7 +1176,7 @@ part001 = startSketchOn('XZ')
           |> ${lineToBeDeleted}
           |> line([-10, -15], %)
           |> angledLine([-176, segLen(seg01)], %)        
-${extraLine ? 'myVar = segLen(seg01)' : ''}`
+        ${extraLine ? 'myVar = segLen(seg01)' : ''}`
               )
             },
             {
@@ -1154,15 +1185,31 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
             }
           )
           const u = await getUtils(page)
-          await page.setViewportSize({ width: 1200, height: 500 })
+          await page.setBodyDimensions({ width: 1200, height: 500 })
 
-          await u.waitForAuthSkipAppStart()
+          await homePage.goToModelingScene()
-          await page.waitForTimeout(300)
+          await u.waitForPageLoad()
+          await page.waitForTimeout(1000)
 
-          await page.getByText(lineOfInterest).click()
+          await expect
-          await page.waitForTimeout(100)
+            .poll(async () => {
-          await page.getByRole('button', { name: 'Edit Sketch' }).click()
+              await editor.scrollToText(lineOfInterest)
+              await page.waitForTimeout(1000)
+              await page.keyboard.press('ArrowRight')
               await page.waitForTimeout(500)
+              await page.keyboard.press('ArrowLeft')
+              await page.waitForTimeout(500)
+              try {
+                await expect(
+                  page.getByRole('button', { name: 'Edit Sketch' })
+                ).toBeVisible()
+                return true
+              } catch (_) {
+                return false
+              }
+            })
+            .toBe(true)
+          await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
           await expect(page.getByTestId('segment-overlay')).toHaveCount(3)
           const segmentToDelete = await u.getBoundingBox(
@@ -1184,9 +1231,9 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
           await page.mouse.move(hoverPos.x + x, hoverPos.y + y)
           await page.mouse.move(hoverPos.x, hoverPos.y, { steps: 5 })
 
-          await expect(page.locator('.cm-content')).toContainText(
+          await editor.expectEditor.toContain(lineOfInterest, {
-            lineOfInterest
+            shouldNormalise: true,
-          )
+          })
 
           await page.getByTestId('overlay-menu').click()
           await page.waitForTimeout(100)
@@ -1197,9 +1244,9 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
           await page.mouse.move(hoverPos.x + x, hoverPos.y + y)
           await page.mouse.move(hoverPos.x, hoverPos.y, { steps: 5 })
 
-          await expect(page.locator('.cm-content')).toContainText(
+          await editor.expectEditor.toContain(lineOfInterest, {
-            lineOfInterest
+            shouldNormalise: true,
-          )
+          })
 
           await page.getByTestId('overlay-menu').click()
           await page.waitForTimeout(100)
@@ -1215,16 +1262,18 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
               )
             ).toBeTruthy()
             // eslint-disable-next-line jest/no-conditional-expect
-            await expect(page.locator('.cm-content')).toContainText(
+            await editor.expectEditor.toContain(lineOfInterest, {
-              lineOfInterest
+              shouldNormalise: true,
-            )
+            })
           } else {
             // eslint-disable-next-line jest/no-conditional-expect
-            await expect(page.locator('.cm-content')).not.toContainText(
+            await editor.expectEditor.not.toContain(lineOfInterest, {
-              lineOfInterest
+              shouldNormalise: true,
-            )
+            })
             // eslint-disable-next-line jest/no-conditional-expect
-            await expect(page.locator('.cm-content')).not.toContainText('seg01')
+            await editor.expectEditor.not.toContain('seg01', {
+              shouldNormalise: true,
+            })
           }
         })
       }
@@ -1257,22 +1306,6 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
         before: `yLineTo(-4 + 0, %, $seg01)`,
         after: `line([0, -10], %, $seg01)`,
       },
-      {
-        before: `angledLineOfXLength([3 + 0, 30 + 0], %, $seg01)`,
-        after: `line([30, 1.57], %, $seg01)`,
-      },
-      {
-        before: `angledLineOfYLength([3 + 0, 1.5 + 0], %, $seg01)`,
-        after: `line([28.62, 1.5], %, $seg01)`,
-      },
-      {
-        before: `angledLineToX([3 + 0, 30 + 0], %, $seg01)`,
-        after: `line([25, 1.31], %, $seg01)`,
-      },
-      {
-        before: `angledLineToY([3 + 0, 7 + 0], %, $seg01)`,
-        after: `line([19.08, 1], %, $seg01)`,
-      },
       {
         before: `angledLineOfXLength({ angle = 3 + 0, length = 30 + 0 }, %, $seg01)`,
         after: `line([30, 1.57], %, $seg01)`,
@@ -1295,6 +1328,8 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
       const isObj = before.includes('{ angle = 3')
       test(`${before.split('(')[0]}${isObj ? '-[obj-input]' : ''}`, async ({
         page,
+        editor,
+        homePage,
       }) => {
         await page.addInitScript(
           async ({ lineToBeDeleted }) => {
@@ -1312,9 +1347,10 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
           }
         )
         const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-        await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
         await page.waitForTimeout(300)
 
         await page.getByText(before).click()
@@ -1347,14 +1383,16 @@ ${extraLine ? 'myVar = segLen(seg01)' : ''}`
           5,
           '[data-overlay-toolbar-index="0"]'
         )
+        await page.mouse.move(x, y)
 
-        await expect(page.locator('.cm-content')).toContainText(before)
+        await editor.expectEditor.toContain(before, { shouldNormalise: true })
 
         await page.getByTestId('overlay-menu').click()
         await page.waitForTimeout(100)
         await page.getByText('Remove constraints').click()
 
-        await expect(page.locator('.cm-content')).toContainText(after)
+        await editor.expectEditor.toContain(after, { shouldNormalise: true })
+
         // check the cursor was left in the correct place after transform
         await expect(page.locator('.cm-activeLine')).toHaveText('|> ' + after)
         await expect(page.getByTestId('segment-overlay')).toHaveCount(3)

e2e/playwright/testing-selections.spec.ts

@@ -1,24 +1,16 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import { commonPoints, getUtils, setup, tearDown } from './test-utils'
+import { commonPoints, getUtils } from './test-utils'
 import { Coords2d } from 'lang/std/sketch'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'
 import { uuidv4 } from 'lib/utils'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Testing selections', () => {
   test.setTimeout(90_000)
   test(
     'Selections work on fresh and edited sketch',
     { tag: ['@skipWin'] },
-    async ({ page }) => {
+    async ({ page, homePage }) => {
       // Skip on windows its being weird.
       test.skip(process.platform === 'win32', 'Skip on windows')
 
@@ -27,9 +19,9 @@ test.describe('Testing selections', () => {
       // source ranges are wrong, hovers won't work
       const u = await getUtils(page)
       const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
       await u.openDebugPanel()
 
       const yAxisClick = () =>
@@ -265,7 +257,7 @@ test.describe('Testing selections', () => {
     }
   )
 
-  test('Solids should be select and deletable', async ({ page }) => {
+  test('Solids should be select and deletable', async ({ page, homePage }) => {
     test.setTimeout(90_000)
     const u = await getUtils(page)
     await page.addInitScript(async () => {
@@ -356,9 +348,9 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
 `
       )
     }, KCL_DEFAULT_LENGTH)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await page.goto('/')
+
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -471,6 +463,7 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
   })
   test("Deleting solid that the AST mod can't handle results in a toast message", async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
@@ -482,20 +475,20 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
     |> line([170.36, -121.61], %, $seg01)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-extrude001 = extrude(50, sketch001)
+  extrude001 = extrude(50, sketch001)
-launderExtrudeThroughVar = extrude001
+  launderExtrudeThroughVar = extrude001
-sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
+  sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
     |> startProfileAt([-100.54, 16.99], %)
     |> line([0, 20.03], %)
     |> line([62.61, 0], %, $seg03)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-`
+  `
       )
     }, KCL_DEFAULT_LENGTH)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await page.goto('/')
+
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
@@ -535,7 +528,10 @@ sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
   })
   test('Hovering over 3d features highlights code, clicking puts the cursor in the right place and sends selection id to engine', async ({
     page,
+    homePage,
   }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const u = await getUtils(page)
     await page.addInitScript(async (KCL_DEFAULT_LENGTH) => {
       localStorage.setItem(
@@ -563,9 +559,9 @@ sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
     `
       )
     }, KCL_DEFAULT_LENGTH)
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -777,7 +773,7 @@ sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
    ], %, $yo)
     |> lineTo([profileStartX(%), profileStartY(%)], %, $seg02)
     |> close(%)
-extrude001 = extrude(100, sketch001)
+  extrude001 = extrude(100, sketch001)
     |> chamfer({
      length = 30,
      tags = [
@@ -787,7 +783,7 @@ extrude001 = extrude(100, sketch001)
        getOppositeEdge(seg01)
      ]
    }, %)
-`)
+  `)
     await expect(
       page.getByTestId('model-state-indicator-execution-done')
     ).toBeVisible()
@@ -875,8 +871,11 @@ extrude001 = extrude(100, sketch001)
   })
   test("Extrude button should be disabled if there's no extrudable geometry when nothing is selected", async ({
     page,
+    editor,
+    homePage,
   }) => {
     const u = await getUtils(page)
+
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -893,46 +892,49 @@ extrude001 = extrude(100, sketch001)
     |> line([-3.86, -2.73], %)
     |> line([-17.67, 0.85], %)
     |> close(%)
-extrude001 = extrude(10, sketch001)
+  extrude001 = extrude(10, sketch001)
     `
       )
     })
-    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     // wait for execution done
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
-    const selectUnExtrudable = () =>
+    const selectUnExtrudable = async () => {
-      page.getByText(`line([4.99, -0.46], %, $seg01)`).click()
+      await editor.scrollToText(`line([4.99, -0.46], %, $seg01)`)
+      await page.getByText(`line([4.99, -0.46], %, $seg01)`).click()
+    }
     const clickEmpty = () => page.mouse.click(700, 460)
     await selectUnExtrudable()
-    // expect extrude button to be disabled
+    // expect extrude button to be enabled, since we don't guard
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+    // until the extrude button is clicked
+    await expect(page.getByRole('button', { name: 'Extrude' })).toBeEnabled()
 
     await clickEmpty()
 
     // expect active line to contain nothing
     await expect(page.locator('.cm-activeLine')).toHaveText('')
-    // and extrude to still be disabled
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
 
     const codeToAdd = `${await u.codeLocator.allInnerTexts()}
-sketch002 = startSketchOn(extrude001, $seg01)
+  sketch002 = startSketchOn(extrude001, $seg01)
     |> startProfileAt([-12.94, 6.6], %)
     |> line([2.45, -0.2], %)
     |> line([-2, -1.25], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-`
+  `
     await u.codeLocator.fill(codeToAdd)
 
     await selectUnExtrudable()
-    // expect extrude button to be disabled
+    // expect extrude button to be enabled, since we don't guard
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+    // until the extrude button is clicked
+    await expect(page.getByRole('button', { name: 'Extrude' })).toBeEnabled()
 
     await clickEmpty()
     await expect(page.locator('.cm-activeLine')).toHaveText('')
@@ -942,7 +944,7 @@ sketch002 = startSketchOn(extrude001, $seg01)
     ).not.toBeDisabled()
   })
 
-  test('Fillet button states test', async ({ page }) => {
+  test('Fillet button states test', async ({ page, homePage }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -957,8 +959,8 @@ sketch002 = startSketchOn(extrude001, $seg01)
       )
     })
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
@@ -967,21 +969,24 @@ sketch002 = startSketchOn(extrude001, $seg01)
     const selectClose = () => page.getByText(`close(%)`).click()
     const clickEmpty = () => page.mouse.click(950, 100)
 
-    // expect fillet button without any bodies in the scene
+    // Now that we don't disable toolbar buttons based on selection,
+    // but rather based on a "selection" step in the command palette,
+    // the fillet button should always be enabled with a good network connection.
+    // I'm not sure if this test is actually useful anymore.
     await selectSegment()
-    await expect(page.getByRole('button', { name: 'Fillet' })).toBeDisabled()
+    await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()
     await clickEmpty()
-    await expect(page.getByRole('button', { name: 'Fillet' })).toBeDisabled()
+    await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()
 
     // test fillet button with the body in the scene
     const codeToAdd = `${await u.codeLocator.allInnerTexts()}
-extrude001 = extrude(10, sketch001)`
+  extrude001 = extrude(10, sketch001)`
     await u.codeLocator.clear()
     await u.codeLocator.fill(codeToAdd)
     await selectSegment()
     await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()
     await selectClose()
-    await expect(page.getByRole('button', { name: 'Fillet' })).toBeDisabled()
+    await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()
     await clickEmpty()
     await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()
   })
@@ -996,6 +1001,7 @@ extrude001 = extrude(10, sketch001)`
 
   test('Testing selections (and hovers) work on sketches when NOT in sketch mode', async ({
     page,
+    homePage,
   }) => {
     const cases = [
       {
@@ -1016,7 +1022,7 @@ extrude001 = extrude(10, sketch001)`
         localStorage.setItem(
           'persistCode',
           `yo = 79
-part001 = startSketchOn('XZ')
+  part001 = startSketchOn('XZ')
     |> startProfileAt([-7.54, -26.74], %)
     |> ${cases[0].expectedCode}
     |> line([-3.19, -138.43], %)
@@ -1028,9 +1034,9 @@ part001 = startSketchOn('XZ')
       { cases }
     )
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openAndClearDebugPanel()
 
     await u.sendCustomCmd({
@@ -1063,6 +1069,7 @@ part001 = startSketchOn('XZ')
   })
   test("Hovering and selection of extruded faces works, and is not overridden shortly after user's click", async ({
     page,
+    homePage,
   }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -1073,14 +1080,14 @@ part001 = startSketchOn('XZ')
     |> line([170.36, -121.61], %, $seg01)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-extrude001 = extrude(50, sketch001)
+  extrude001 = extrude(50, sketch001)
       `
       )
     })
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openAndClearDebugPanel()
 
     await u.sendCustomCmd({
@@ -1163,6 +1170,7 @@ extrude001 = extrude(50, sketch001)
   })
   test("Various pipe expressions should and shouldn't allow edit and or extrude", async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
     const selectionsSnippets = {
@@ -1218,9 +1226,9 @@ extrude001 = extrude(50, sketch001)
       },
       selectionsSnippets
     )
-    await page.setViewportSize({ width: 1200, height: 1000 })
+    await page.setBodyDimensions({ width: 1200, height: 1000 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -1233,7 +1241,9 @@ extrude001 = extrude(50, sketch001)
     ).not.toBeDisabled()
 
     await page.getByText(selectionsSnippets.extrudeAndEditBlocked).click()
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+    // expect extrude button to be enabled, since we don't guard
+    // until the extrude button is clicked
+    await expect(page.getByRole('button', { name: 'Extrude' })).toBeEnabled()
 
     await page.getByText(selectionsSnippets.extrudeAndEditAllowed).click()
     await expect(
@@ -1244,7 +1254,9 @@ extrude001 = extrude(50, sketch001)
     ).not.toBeDisabled()
 
     await page.getByText(selectionsSnippets.editOnly).click()
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+    // expect extrude button to be enabled, since we don't guard
+    // until the extrude button is clicked
+    await expect(page.getByRole('button', { name: 'Extrude' })).toBeEnabled()
     await expect(
       page.getByRole('button', { name: 'Edit Sketch' })
     ).not.toBeDisabled()
@@ -1252,7 +1264,9 @@ extrude001 = extrude(50, sketch001)
     await page
       .getByText(selectionsSnippets.extrudeAndEditBlockedInFunction)
       .click()
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+    // expect extrude button to be enabled, since we don't guard
+    // until the extrude button is clicked
+    await expect(page.getByRole('button', { name: 'Extrude' })).toBeEnabled()
     await expect(
       page.getByRole('button', { name: 'Edit Sketch' })
     ).not.toBeVisible()
@@ -1260,6 +1274,7 @@ extrude001 = extrude(50, sketch001)
 
   test('Deselecting line tool should mean nothing happens on click', async ({
     page,
+    homePage,
   }) => {
     /**
      * If the line tool is clicked when the state is 'No Points' it will exit Sketch mode.
@@ -1268,9 +1283,9 @@ extrude001 = extrude(50, sketch001)
      * To continue to test this workflow, we now enter sketch mode and place a single point before exiting the line tool.
      */
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
     await u.openDebugPanel()
 
     await expect(

e2e/playwright/testing-settings.spec.ts

@@ -1,14 +1,7 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
-import {
+import { getUtils, executorInputPath, createProject } from './test-utils'
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-  createProject,
-} from './test-utils'
 import { SaveSettingsPayload, SettingsLevel } from 'lib/settings/settingsTypes'
 import { SETTINGS_FILE_NAME, PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
 import {
@@ -19,35 +12,16 @@ import {
 } from './storageStates'
 import * as TOML from '@iarna/toml'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Testing settings', () => {
-  test('Stored settings are validated and fall back to defaults', async ({
+  test(
-    page,
+    'Stored settings are validated and fall back to defaults',
-  }) => {
-    const u = await getUtils(page)
-
     // Override beforeEach test setup
     // with corrupted settings
-    await page.addInitScript(
-      async ({ settingsKey, settings }) => {
-        localStorage.setItem(settingsKey, settings)
-      },
     {
-        settingsKey: TEST_SETTINGS_KEY,
+      appSettings: TEST_SETTINGS_CORRUPTED,
-        settings: TOML.stringify({ settings: TEST_SETTINGS_CORRUPTED }),
+    },
-      }
+    async ({ page, homePage }) => {
-    )
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
 
       // Check the settings were reset
       const storedSettings = TOML.parse(
@@ -57,24 +31,26 @@ test.describe('Testing settings', () => {
         )
       ) as { settings: SaveSettingsPayload }
 
-    expect(storedSettings.settings?.app?.theme).toBe(undefined)
+      expect(storedSettings.settings?.app?.theme).toBe('dark')
 
-    // Check that the invalid settings were removed
+      // Check that the invalid settings were changed to good defaults
-    expect(storedSettings.settings?.modeling?.defaultUnit).toBe(undefined)
+      expect(storedSettings.settings?.modeling?.defaultUnit).toBe('in')
-    expect(storedSettings.settings?.modeling?.mouseControls).toBe(undefined)
+      expect(storedSettings.settings?.modeling?.mouseControls).toBe('Zoo')
-    expect(storedSettings.settings?.app?.projectDirectory).toBe(undefined)
+      expect(storedSettings.settings?.app?.projectDirectory).toBe('')
       expect(storedSettings.settings?.projects?.defaultProjectName).toBe(
-      undefined
+        'project-$nnn'
+      )
+    }
   )
-  })
 
-  test('Project settings can be set and override user settings', async ({
+  // The behavior is actually broken. Parent always takes precedence
-    page,
+  test.fixme(
-  }) => {
+    'Project settings can be set and override user settings',
+    async ({ page, homePage }) => {
       const u = await getUtils(page)
       await test.step(`Setup`, async () => {
-      await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
         await page
           .getByRole('button', { name: 'Start Sketch' })
           .waitFor({ state: 'visible' })
@@ -89,17 +65,20 @@ test.describe('Testing settings', () => {
       const inputLocator = page.locator('input[name="modeling-showDebugPanel"]')
 
       await test.step('Open settings dialog and set "Show debug panel" to on', async () => {
-      await page.keyboard.press('ControlOrMeta+Shift+,')
+        await page.keyboard.press('ControlOrMeta+,')
         await expect(headingLocator).toBeVisible()
 
         /** Test to close https://github.com/KittyCAD/modeling-app/issues/2713 */
         await test.step(`Confirm that this dialog has a solid background`, async () => {
           await expect
-          .poll(() => u.getGreatestPixDiff({ x: 600, y: 250 }, [28, 28, 28]), {
+            .poll(
+              () => u.getGreatestPixDiff({ x: 600, y: 250 }, [28, 28, 28]),
+              {
                 timeout: 1000,
                 message:
                   'Checking for solid background, should not see default plane colors',
-          })
+              }
+            )
             .toBeLessThan(15)
         })
 
@@ -111,7 +90,7 @@ test.describe('Testing settings', () => {
       await test.step('Open settings with keyboard shortcut', async () => {
         await page.getByTestId('settings-close-button').click()
         await page.locator('.cm-content').click()
-      await page.keyboard.press('ControlOrMeta+Shift+,')
+        await page.keyboard.press('ControlOrMeta+,')
         await expect(headingLocator).toBeVisible()
       })
 
@@ -119,7 +98,11 @@ test.describe('Testing settings', () => {
       await expect(
         page.getByText(`Set show debug panel to "false" for this project`)
       ).toBeVisible()
-    // Check that the theme changed
+      await expect(
+        page.getByText(`Set show debug panel to "false" for this project`)
+      ).not.toBeVisible()
+
+      // Check that the debug panel button is gone
       await expect(paneButtonLocator).not.toBeVisible()
 
       // Check that the user setting was not changed
@@ -128,7 +111,9 @@ test.describe('Testing settings', () => {
 
       // Roll back to default of "off"
       await await page
-      .getByText('show debug panelRoll back show debug panelRoll back to match')
+        .getByText(
+          'show debug panelRoll back show debug panelRoll back to match'
+        )
         .hover()
       await page
         .getByRole('button', {
@@ -142,18 +127,23 @@ test.describe('Testing settings', () => {
       await expect(
         page.locator('input[name="modeling-showDebugPanel"]')
       ).not.toBeChecked()
-  })
+    }
+  )
 
   test('Keybindings display the correct hotkey for Command Palette', async ({
     page,
+    homePage,
   }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await test.step('Open keybindings settings', async () => {
-      // Open the settings modal with the browser keyboard shortcut
+      // Open the settings modal with the keyboard shortcut
-      await page.keyboard.press('ControlOrMeta+Shift+,')
+      await page.keyboard.press('ControlOrMeta+,')
 
       // Go to Keybindings tab.
       const keybindingsTab = page.getByRole('radio', { name: 'Keybindings' })
@@ -174,11 +164,15 @@ test.describe('Testing settings', () => {
     await expect(hotkey).toHaveText(text)
   })
 
-  test('Project and user settings can be reset', async ({ page }) => {
+  test.fixme(
+    'Project and user settings can be reset',
+    async ({ page, homePage }) => {
       const u = await getUtils(page)
       await test.step(`Setup`, async () => {
-      await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
+        await page.waitForTimeout(1000)
       })
 
       // Selectors and constants
@@ -256,34 +250,30 @@ test.describe('Testing settings', () => {
           await expect(themeColorSetting).toHaveValue(settingValues.project)
         })
       })
-  })
+    }
+  )
 
   test.fixme(
     `Project settings override user settings on desktop`,
     { tag: ['@electron', '@skipWin'] },
-    async ({ browser: _ }, testInfo) => {
+    async ({ context, page }, testInfo) => {
       test.skip(
         process.platform === 'win32',
         'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
       )
       const projectName = 'bracket'
-      const {
+      const { dir: projectDirName } = await context.folderSetupFn(
-        electronApp,
+        async (dir) => {
-        page,
-        dir: projectDirName,
-      } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
           const bracketDir = join(dir, projectName)
           await fsp.mkdir(bracketDir, { recursive: true })
           await fsp.copyFile(
             executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
             join(bracketDir, 'main.kcl')
           )
-        },
+        }
-      })
+      )
 
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
       // Selectors and constants
       const tempProjectSettingsFilePath = join(
@@ -353,22 +343,18 @@ test.describe('Testing settings', () => {
         await logoLink.click()
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
       })
-
-      await electronApp.close()
     }
   )
 
   test(
     `Load desktop app with no settings file`,
-    { tag: '@electron' },
+    {
-    async ({ browser: _ }, testInfo) => {
+      tag: '@electron',
-      const { electronApp, page } = await setupElectron({
       // This is what makes no settings file get created
       cleanProjectDir: false,
-        testInfo,
+    },
-      })
+    async ({ page }, testInfo) => {
-
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await page.setViewportSize({ width: 1200, height: 500 })
 
       // Selectors and constants
       const errorHeading = page.getByRole('heading', {
@@ -379,25 +365,21 @@ test.describe('Testing settings', () => {
       // If the app loads without exploding we're in the clear
       await expect(errorHeading).not.toBeVisible()
       await expect(projectDirLink).toBeVisible()
-
-      await electronApp.close()
     }
   )
 
   test(
     `Load desktop app with a settings file, but no project directory setting`,
-    { tag: '@electron' },
+    {
-    async ({ browser: _ }, testInfo) => {
+      tag: '@electron',
-      const { electronApp, page } = await setupElectron({
-        testInfo,
       appSettings: {
         app: {
           themeColor: '259',
         },
       },
-      })
+    },
-
+    async ({ context, page }, testInfo) => {
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
       // Selectors and constants
       const errorHeading = page.getByRole('heading', {
@@ -408,22 +390,14 @@ test.describe('Testing settings', () => {
       // If the app loads without exploding we're in the clear
       await expect(errorHeading).not.toBeVisible()
       await expect(projectDirLink).toBeVisible()
-
-      await electronApp.close()
     }
   )
 
   // It was much easier to test the logo color than the background stream color.
   test.fixme(
     'user settings reload on external change, on project and modeling view',
-    { tag: '@electron' },
+    {
-    async ({ browserName }, testInfo) => {
+      tag: '@electron',
-      const {
-        electronApp,
-        page,
-        dir: projectDirName,
-      } = await setupElectron({
-        testInfo,
       appSettings: {
         app: {
           // Doesn't matter what you set it to. It will
@@ -431,9 +405,13 @@ test.describe('Testing settings', () => {
           themeColor: '0',
         },
       },
-      })
+    },
+    async ({ context, page }, testInfo) => {
+      const { dir: projectDirName } = await context.folderSetupFn(
+        async () => {}
+      )
 
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
       const logoLink = page.getByTestId('app-logo')
       const projectDirLink = page.getByText('Loaded from')
@@ -467,23 +445,18 @@ test.describe('Testing settings', () => {
         await changeColor('21')
         await expect(logoLink).toHaveCSS('--primary-hue', '21')
       })
-      await electronApp.close()
     }
   )
 
-  test(
+  test.fixme(
     'project settings reload on external change',
     { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
+    async ({ context, page }, testInfo) => {
-      const {
+      const { dir: projectDirName } = await context.folderSetupFn(
-        electronApp,
+        async () => {}
-        page,
+      )
-        dir: projectDirName,
-      } = await setupElectron({
-        testInfo,
-      })
 
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
 
       const logoLink = page.getByTestId('app-logo')
       const projectDirLink = page.getByText('Loaded from')
@@ -514,18 +487,16 @@ test.describe('Testing settings', () => {
         await changeColorFs('99')
         await expect(logoLink).toHaveCSS('--primary-hue', '99')
       })
-
-      await electronApp.close()
     }
   )
 
   test(
     `Closing settings modal should go back to the original file being viewed`,
     { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
+    async ({ context, page }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
+      // TODO: fix this test on windows after the electron migration
-        testInfo,
+      test.skip(process.platform === 'win32', 'Skip on windows')
-        folderSetupFn: async (dir) => {
+      await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'project-000')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.copyFile(
@@ -536,7 +507,6 @@ test.describe('Testing settings', () => {
           executorInputPath('cylinder.kcl'),
           join(bracketDir, '2.kcl')
         )
-        },
       })
       const kclCube = await fsp.readFile(executorInputPath('cube.kcl'), 'utf-8')
       const kclCylinder = await fsp.readFile(
@@ -552,7 +522,7 @@ test.describe('Testing settings', () => {
         editorTextMatches,
       } = await getUtils(page, test)
 
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
       page.on('console', console.log)
 
       await test.step('Precondition: Open to second project file', async () => {
@@ -583,16 +553,17 @@ test.describe('Testing settings', () => {
       await test.step('Postcondition: Same file content is in editor as before settings opened', async () => {
         await editorTextMatches(kclCylinder)
       })
-
-      await electronApp.close()
     }
   )
 
-  test('Changing modeling default unit', async ({ page }) => {
+  test('Changing modeling default unit', async ({ page, homePage }) => {
-    const u = await getUtils(page)
     await test.step(`Test setup`, async () => {
-      await page.setViewportSize({ width: 1200, height: 500 })
+      // TODO: fix this test on windows after the electron migration
-      await u.waitForAuthSkipAppStart()
+      test.skip(process.platform === 'win32', 'Skip on windows')
+      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await homePage.goToModelingScene()
+      const toastMessage = page.getByText(`Successfully created "testDefault"`)
+      await expect(toastMessage).not.toBeVisible()
       await page
         .getByRole('button', { name: 'Start Sketch' })
         .waitFor({ state: 'visible' })
@@ -619,7 +590,9 @@ test.describe('Testing settings', () => {
       await userSettingsTab.click()
       await defaultUnitSection.hover()
       await defaultUnitRollbackButton.click()
+      await projectSettingsTab.hover()
       await projectSettingsTab.click()
+      await page.waitForTimeout(1000)
     })
 
     await test.step('Change modeling default unit within project tab', async () => {
@@ -631,7 +604,10 @@ test.describe('Testing settings', () => {
           const toastMessage = page.getByText(
             `Set default unit to "${unitOfMeasure}" for this project`
           )
+
+          // Assert visibility and disapperance
           await expect(toastMessage).toBeVisible()
+          await expect(toastMessage).not.toBeVisible()
         })
       }
       await changeUnitOfMeasureInProjectTab('in')
@@ -643,7 +619,10 @@ test.describe('Testing settings', () => {
     })
 
     // Go to the user tab
+    await userSettingsTab.hover()
     await userSettingsTab.click()
+    await page.waitForTimeout(1000)
+
     await test.step('Change modeling default unit within user tab', async () => {
       const changeUnitOfMeasureInUserTab = async (unitOfMeasure: string) => {
         await test.step(`Set modeling default unit to ${unitOfMeasure}`, async () => {
@@ -726,9 +705,11 @@ test.describe('Testing settings', () => {
     })
   })
 
-  test('Changing theme in sketch mode', async ({ page }) => {
+  test('Changing theme in sketch mode', async ({ context, page, homePage }) => {
+    // TODO: fix this test on windows after the electron migration
+    test.skip(process.platform === 'win32', 'Skip on windows')
     const u = await getUtils(page)
-    await page.addInitScript(() => {
+    await context.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
@@ -738,11 +719,14 @@ test.describe('Testing settings', () => {
     |> line([-5, 0], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)
-extrude001 = extrude(5, sketch001)
+  extrude001 = extrude(5, sketch001)
-`
+  `
       )
     })
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
+    await page.waitForTimeout(1000)
 
     // Selectors and constants
     const editSketchButton = page.getByRole('button', { name: 'Edit Sketch' })
@@ -753,7 +737,6 @@ extrude001 = extrude(5, sketch001)
     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)
       await expect(editSketchButton).toBeVisible()
       await editSketchButton.click()
@@ -792,21 +775,13 @@ extrude001 = extrude(5, sketch001)
     })
   })
 
-  test(`Changing system theme preferences (via media query) should update UI and stream`, async ({
+  test(
-    page,
+    `Changing system theme preferences (via media query) should update UI and stream`,
-  }) => {
-    // Override the settings so that the theme is set to `system`
-    await page.addInitScript(
-      ({ settingsKey, settings }) => {
-        localStorage.setItem(settingsKey, settings)
-      },
     {
-        settingsKey: TEST_SETTINGS_KEY,
+      // Override the settings so that the theme is set to `system`
-        settings: TOML.stringify({
+      appSettings: TEST_SETTINGS_DEFAULT_THEME,
-          settings: TEST_SETTINGS_DEFAULT_THEME,
+    },
-        }),
+    async ({ page, homePage }) => {
-      }
-    )
       const u = await getUtils(page)
 
       // Selectors and constants
@@ -822,8 +797,10 @@ extrude001 = extrude(5, sketch001)
       const toolbar = page.locator('menu').filter({ hasText: 'Start Sketch' })
 
       await test.step(`Test setup`, async () => {
-      await page.setViewportSize({ width: 1200, height: 500 })
+        await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+        await homePage.goToModelingScene()
+        await u.waitForPageLoad()
+        await page.waitForTimeout(1000)
         await expect(toolbar).toBeVisible()
       })
 
@@ -844,35 +821,31 @@ extrude001 = extrude(5, sketch001)
           .poll(() => streamBackgroundPixelIsColor(darkBackgroundColor))
           .toBeLessThan(15)
       })
-  })
+    }
-
+  )
-  test(`Turning off "Show debug panel" with debug panel open leaves no phantom panel`, async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
 
+  test(
+    `Turning off "Show debug panel" with debug panel open leaves no phantom panel`,
+    {
       // Override beforeEach test setup
       // with debug panel open
       // but "show debug panel" set to false
-    await page.addInitScript(
+      appSettings: {
-      async ({ settingsKey, settings }) => {
+        ...TEST_SETTINGS,
-        localStorage.setItem(settingsKey, settings)
+        modeling: { ...TEST_SETTINGS.modeling, showDebugPanel: false },
+      },
+    },
+    async ({ context, page, homePage }) => {
+      const u = await getUtils(page)
+
+      await context.addInitScript(async () => {
         localStorage.setItem(
           'persistModelingContext',
           '{"openPanes":["debug"]}'
         )
-      },
+      })
-      {
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-        settingsKey: TEST_SETTINGS_KEY,
+      await homePage.goToModelingScene()
-        settings: TOML.stringify({
-          settings: {
-            ...TEST_SETTINGS,
-            modeling: { ...TEST_SETTINGS.modeling, showDebugPanel: false },
-          },
-        }),
-      }
-    )
-    await page.setViewportSize({ width: 1200, height: 500 })
 
       // Constants and locators
       const resizeHandle = page.locator('.sidebar-resize-handles > div.block')
@@ -894,7 +867,6 @@ extrude001 = extrude(5, sketch001)
       }
 
       await test.step(`Initial load with corrupted settings`, async () => {
-      await u.waitForAuthSkipAppStart()
         // Check that the debug panel is not visible
         await expect(debugPaneButton).not.toBeVisible()
         // Check the pane resize handle wrapper is not visible
@@ -922,5 +894,6 @@ extrude001 = extrude(5, sketch001)
         await expect(debugPaneButton).not.toBeVisible()
         await expect(resizeHandle).not.toBeVisible()
       })
-  })
+    }
+  )
 })

e2e/playwright/text-to-cad-tests.spec.ts

@@ -1,29 +1,16 @@
-import { test, expect, Page } from '@playwright/test'
+import { test, expect, Page } from './zoo-test'
-import {
+import { getUtils, createProject } from './test-utils'
-  getUtils,
-  setup,
-  tearDown,
-  setupElectron,
-  createProject,
-} from './test-utils'
 import { join } from 'path'
 import fs from 'fs'
 
-test.beforeEach(async ({ context, page }) => {
-  await setup(context, page)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
 test.describe('Text-to-CAD tests', () => {
-  test('basic lego happy case', async ({ page }) => {
+  test('basic lego happy case', async ({ page, homePage }) => {
     const u = await getUtils(page)
 
     await test.step('Set up', async () => {
-      await page.setViewportSize({ width: 1000, height: 500 })
+      await page.setBodyDimensions({ width: 1000, height: 500 })
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
     })
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
@@ -43,25 +30,17 @@ test.describe('Text-to-CAD tests', () => {
     const successToastMessage = page.getByText(`Text-to-CAD successful`)
     await expect(successToastMessage).toBeVisible({ timeout: 15000 })
 
-    await expect(page.getByText('Copied')).not.toBeVisible()
+    // Hit accept.
-
-    // Hit copy to clipboard.
     const copyToClipboardButton = page.getByRole('button', {
-      name: 'Copy to clipboard',
+      name: 'Accept',
     })
     await expect(copyToClipboardButton).toBeVisible()
 
     await copyToClipboardButton.click()
 
-    // Expect the code to be copied.
-    await expect(page.getByText('Copied')).toBeVisible()
-
     // Click in the code editor.
     await page.locator('.cm-content').click()
 
-    // Paste the code.
-    await page.keyboard.press('ControlOrMeta+KeyV')
-
     // Expect the code to be pasted.
     await expect(page.locator('.cm-content')).toContainText(`const`)
 
@@ -70,29 +49,18 @@ test.describe('Text-to-CAD tests', () => {
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
-
-    // Find the toast close button.
-    const closeButton = page
-      .getByRole('status')
-      .locator('div')
-      .filter({ hasText: 'Text-to-CAD successfulPrompt' })
-      .first()
-      .getByRole('button', { name: 'Close' })
-    await expect(closeButton).toBeVisible()
-    await closeButton.click()
-
-    // The toast should disappear.
-    await expect(successToastMessage).not.toBeVisible()
   })
 
   test('success model, then ignore success toast, user can create new prompt from command bar', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await sendPromptFromCommandBar(page, 'a 2x6 lego')
 
@@ -111,10 +79,6 @@ test.describe('Text-to-CAD tests', () => {
     const successToastMessage = page.getByText(`Text-to-CAD successful`)
     await expect(successToastMessage).toBeVisible({ timeout: 15000 })
 
-    await expect(page.getByText('Copied')).not.toBeVisible()
-
-    await expect(successToastMessage).toBeVisible()
-
     // Can send a new prompt from the command bar.
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -133,12 +97,14 @@ test.describe('Text-to-CAD tests', () => {
 
   test('you can reject text-to-cad output and it does nothing', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -170,12 +136,16 @@ test.describe('Text-to-CAD tests', () => {
     await expect(page.locator('.cm-content')).toContainText(``)
   })
 
-  test('sending a bad prompt fails, can dismiss', async ({ page }) => {
+  test('sending a bad prompt fails, can dismiss', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -236,12 +206,14 @@ test.describe('Text-to-CAD tests', () => {
 
   test('sending a bad prompt fails, can start over from toast', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -324,12 +296,14 @@ test.describe('Text-to-CAD tests', () => {
 
   test('sending a bad prompt fails, can ignore toast, can start over from command bar', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -391,19 +365,21 @@ test.describe('Text-to-CAD tests', () => {
 
     await expect(successToastMessage).toBeVisible({ timeout: 15000 })
 
-    await expect(page.getByText('Copied')).not.toBeVisible()
-
     // old failure toast should stick around.
     await expect(failureToastMessage).toBeVisible()
     await expect(page.getByText(`Text-to-CAD failed`)).toBeVisible()
   })
 
-  test('ensure you can shift+enter in the prompt box', async ({ page }) => {
+  test('ensure you can shift+enter in the prompt box', async ({
+    page,
+    homePage,
+  }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     const promptWithNewline = `a 2x4\nlego`
 
@@ -456,7 +432,7 @@ test.describe('Text-to-CAD tests', () => {
   test(
     'can do many at once and get many prompts back, and interact with many',
     { tag: ['@skipWin'] },
-    async ({ page }) => {
+    async ({ page, homePage }) => {
       // Let this test run longer since we've seen it timeout.
       test.setTimeout(180_000)
       // skip on windows
@@ -467,9 +443,10 @@ test.describe('Text-to-CAD tests', () => {
 
       const u = await getUtils(page)
 
-      await page.setViewportSize({ width: 1000, height: 500 })
+      await page.setBodyDimensions({ width: 1000, height: 500 })
 
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()
 
       await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -495,8 +472,6 @@ test.describe('Text-to-CAD tests', () => {
       // We should have three success toasts.
       await expect(successToastMessage).toHaveCount(3, { timeout: 25_000 })
 
-      await expect(page.getByText('Copied')).not.toBeVisible()
-
       await expect(page.getByText(`a 2x4 lego`)).toBeVisible()
       await expect(page.getByText(`a 2x8 lego`)).toBeVisible()
       await expect(page.getByText(`a 2x10 lego`)).toBeVisible()
@@ -514,31 +489,15 @@ test.describe('Text-to-CAD tests', () => {
 
       // Ensure you can copy the code for one of the models remaining.
       const copyToClipboardButton = page.getByRole('button', {
-        name: 'Copy to clipboard',
+        name: 'Accept',
       })
       await expect(copyToClipboardButton.first()).toBeVisible()
       // Click the button.
       await copyToClipboardButton.first().click()
 
-      // Expect the code to be copied.
-      await expect(page.getByText('Copied')).toBeVisible()
-
-      // Click in the code editor.
-      await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
-
-      // Paste the code.
-      await page.keyboard.down('ControlOrMeta')
-      await page.keyboard.press('KeyV')
-      await page.keyboard.up('ControlOrMeta')
-
       // Expect the code to be pasted.
       await expect(page.locator('.cm-content')).toContainText(`2x8`)
 
-      // Find the toast close button.
-      const closeButton = page.locator('[data-negative-button="close"]').first()
-      await expect(closeButton).toBeVisible()
-      await closeButton.click()
-
       // Ensure the final toast remains.
       await expect(page.getByText(`a 2x10 lego`)).not.toBeVisible()
       await expect(page.getByText(`Prompt: "a 2x8 lego`)).not.toBeVisible()
@@ -549,40 +508,21 @@ test.describe('Text-to-CAD tests', () => {
       // Click the button.
       await copyToClipboardButton.click()
 
-      // Expect the code to be copied.
-      await expect(page.getByText('Copied')).toBeVisible()
-
-      // Click in the code editor.
-      await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
-
-      // Paste the code.
-      await page.keyboard.down('ControlOrMeta')
-      await page.keyboard.press('KeyA')
-      await page.keyboard.up('ControlOrMeta')
-      await page.keyboard.press('Backspace')
-      await page.keyboard.down('ControlOrMeta')
-      await page.keyboard.press('KeyV')
-      await page.keyboard.up('ControlOrMeta')
-
       // Expect the code to be pasted.
       await expect(page.locator('.cm-content')).toContainText(`2x4`)
-
-      // Expect the toast to disappear.
-      // Find the toast close button.
-      await expect(closeButton).toBeVisible()
-      await closeButton.click()
-      await expect(successToastMessage).not.toBeVisible()
     }
   )
 
   test('can do many at once with errors, clicking dismiss error does not dismiss all', async ({
     page,
+    homePage,
   }) => {
     const u = await getUtils(page)
 
-    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await homePage.goToModelingScene()
+    await u.waitForPageLoad()
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -631,57 +571,37 @@ test.describe('Text-to-CAD tests', () => {
 
     // Ensure you can copy the code for one of the models remaining.
     const copyToClipboardButton = page.getByRole('button', {
-      name: 'Copy to clipboard',
+      name: 'Accept',
     })
     await expect(copyToClipboardButton.first()).toBeVisible()
     // Click the button.
     await copyToClipboardButton.first().click()
 
-    // Expect the code to be copied.
-    await expect(page.getByText('Copied')).toBeVisible()
-
-    // Click in the code editor.
-    await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
-
-    // Paste the code.
-    await page.keyboard.down('ControlOrMeta')
-    await page.keyboard.press('KeyV')
-    await page.keyboard.up('ControlOrMeta')
-
     // Expect the code to be pasted.
     await expect(page.locator('.cm-content')).toContainText(`2x4`)
-
-    // Find the toast close button.
-    const closeButton = page
-      .getByRole('status')
-      .locator('div')
-      .filter({ hasText: 'Text-to-CAD successfulPrompt' })
-      .first()
-      .getByRole('button', { name: 'Close' })
-    await expect(closeButton).toBeVisible()
-    await closeButton.click()
-
-    // Expect the toast to disappear.
-    await expect(page.getByText('Copied')).not.toBeVisible()
-    await expect(successToastMessage).not.toBeVisible()
   })
 })
 
 async function sendPromptFromCommandBar(page: Page, promptStr: string) {
+  await page.waitForTimeout(1000)
   await test.step(`Send prompt from command bar: ${promptStr}`, async () => {
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
     // Click the command bar button
+    await commandBarButton.hover()
     await commandBarButton.click()
+    await page.waitForTimeout(1000)
 
     // Wait for the command bar to appear
     const cmdSearchBar = page.getByPlaceholder('Search commands')
     await expect(cmdSearchBar).toBeVisible()
 
-    const textToCadCommand = page.getByText('Use the Zoo Text-to-CAD API ')
+    const textToCadCommand = page.getByText('Use the Zoo Text-to-CAD API')
     await expect(textToCadCommand.first()).toBeVisible()
     // Click the Text-to-CAD command
+    await textToCadCommand.first().scrollIntoViewIfNeeded()
     await textToCadCommand.first().click()
+    await page.waitForTimeout(1000)
 
     // Enter the prompt.
     const prompt = page.getByText('Prompt')
@@ -697,12 +617,13 @@ async function sendPromptFromCommandBar(page: Page, promptStr: string) {
 test(
   'Text-to-CAD functionality',
   { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
+  async ({ context, page }, testInfo) => {
     const projectName = 'project-000'
     const prompt = 'lego 2x4'
     const textToCadFileName = 'lego-2x4.kcl'
 
-    const { electronApp, page, dir } = await setupElectron({ testInfo })
+    const { dir } = await context.folderSetupFn(async () => {})
+
     const fileExists = () =>
       fs.existsSync(join(dir, projectName, textToCadFileName))
 
@@ -711,7 +632,7 @@ test(
       test
     )
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
 
     // Locators
     const projectMenuButton = page
@@ -761,7 +682,5 @@ test(
       // Confirm we've navigated back to the main.kcl file after deletion
       await expect(projectMenuButton).toContainText('main.kcl')
     })
-
-    await electronApp.close()
   }
 )

e2e/playwright/various.spec.ts

@@ -1,19 +1,10 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import { doExport, getUtils, makeTemplate, setup, tearDown } from './test-utils'
+import { doExport, getUtils, makeTemplate } from './test-utils'
 
-test.beforeEach(async ({ context, page }, testInfo) => {
+test.fixme('Units menu', async ({ page, homePage }) => {
-  await setup(context, page, testInfo)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
-})
+  await homePage.goToModelingScene()
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-test('Units menu', async ({ page }) => {
-  const u = await getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await u.waitForAuthSkipAppStart()
 
   const unitsMenuButton = page.getByRole('button', {
     name: 'Current Units',
@@ -41,7 +32,7 @@ test('Units menu', async ({ page }) => {
   await expect(unitsMenuButton).toContainText('mm')
 })
 
-test('Successful export shows a success toast', async ({ page }) => {
+test('Successful export shows a success toast', async ({ page, homePage }) => {
   // FYI this test doesn't work with only engine running locally
   // And you will need to have the KittyCAD CLI installed
   const u = await getUtils(page)
@@ -57,41 +48,41 @@ totalHeightHalf = 2
 armThick = 0.5
 totalLen = 9.5
 part001 = startSketchOn('-XZ')
-  |> startProfileAt([0, 0], %)
+|> startProfileAt([0, 0], %)
-  |> yLine(baseHeight, %)
+|> yLine(baseHeight, %)
-  |> xLine(baseLen, %)
+|> xLine(baseLen, %)
-  |> angledLineToY({
+|> angledLineToY({
-        angle: topAng,
+      angle = topAng,
-        to: totalHeightHalf,
+      to = totalHeightHalf,
     }, %, $seg04)
-  |> xLineTo(totalLen, %, $seg03)
+|> xLineTo(totalLen, %, $seg03)
-  |> yLine(-armThick, %, $seg01)
+|> yLine(-armThick, %, $seg01)
-  |> angledLineThatIntersects({
+|> angledLineThatIntersects({
-        angle: HALF_TURN,
+      angle = HALF_TURN,
-        offset: -armThick,
+      offset = -armThick,
-        intersectTag: seg04
+      intersectTag = seg04
     }, %)
-  |> angledLineToY([segAng(seg04) + 180, ZERO], %)
+|> angledLineToY([segAng(seg04) + 180, ZERO], %)
-  |> angledLineToY({
+|> angledLineToY({
-        angle: -bottomAng,
+      angle = -bottomAng,
-        to: -totalHeightHalf - armThick,
+      to = -totalHeightHalf - armThick,
     }, %, $seg02)
-  |> xLineTo(segEndX(seg03) + 0, %)
+|> xLineTo(segEndX(seg03) + 0, %)
-  |> yLine(-segLen(seg01), %)
+|> yLine(-segLen(seg01), %)
-  |> angledLineThatIntersects({
+|> angledLineThatIntersects({
-        angle: HALF_TURN,
+      angle = HALF_TURN,
-        offset: -armThick,
+      offset = -armThick,
-        intersectTag: seg02
+      intersectTag = seg02
     }, %)
-  |> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
+|> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
-  |> xLineTo(ZERO, %)
+|> xLineTo(ZERO, %)
-  |> close(%)
+|> close(%)
-  |> extrude(4, %)`
+|> extrude(4, %)`
     )
   })
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.setBodyDimensions({ width: 1200, height: 500 })
 
-  await u.waitForAuthSkipAppStart()
+  await homePage.goToModelingScene()
   await u.openDebugPanel()
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.waitForCmdReceive('extrude')
@@ -106,25 +97,14 @@ part001 = startSketchOn('-XZ')
     },
     page
   )
-
-  // This is the main thing we're testing,
-  // We test the export functionality across all
-  // file types in snapshot-tests.spec.ts
-  await expect(page.getByText('Exported successfully')).toBeVisible()
 })
 
 test('Paste should not work unless an input is focused', async ({
   page,
-  browserName,
+  homePage,
 }) => {
-  // To run this test locally, uncomment Firefox in playwright.config.ts
+  await page.setBodyDimensions({ width: 1200, height: 500 })
-  test.skip(
+  await homePage.goToModelingScene()
-    browserName !== 'firefox',
-    "This bug is really Firefox-only, which we don't run in CI."
-  )
-  const u = await getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await u.waitForAuthSkipAppStart()
   await page
     .getByRole('button', { name: 'Start Sketch' })
     .waitFor({ state: 'visible' })
@@ -164,12 +144,12 @@ test('Paste should not work unless an input is focused', async ({
 
 test('Keyboard shortcuts can be viewed through the help menu', async ({
   page,
+  homePage,
 }) => {
-  const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await homePage.goToModelingScene()
-  await u.waitForAuthSkipAppStart()
 
-  await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
+  await page.waitForURL('file:///**', { waitUntil: 'domcontentloaded' })
   await page
     .getByRole('button', { name: 'Start Sketch' })
     .waitFor({ state: 'visible' })
@@ -181,7 +161,7 @@ test('Keyboard shortcuts can be viewed through the help menu', async ({
   await page.getByRole('button', { name: 'Keyboard Shortcuts' }).click()
 
   // Verify the URL and that you can see a list of shortcuts
-  await expect(page.url()).toContain('?tab=keybindings')
+  await expect.poll(() => page.url()).toContain('?tab=keybindings')
   await expect(
     page.getByRole('heading', { name: 'Enter Sketch Mode' })
   ).toBeAttached()
@@ -189,12 +169,13 @@ test('Keyboard shortcuts can be viewed through the help menu', async ({
 
 test('First escape in tool pops you out of tool, second exits sketch mode', async ({
   page,
+  homePage,
 }) => {
   // Wait for the app to be ready for use
   const u = await getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.setBodyDimensions({ width: 1200, height: 500 })
 
-  await u.waitForAuthSkipAppStart()
+  await homePage.goToModelingScene()
   await u.openDebugPanel()
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.closeDebugPanel()
@@ -271,7 +252,7 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
 
 test.fixme(
   'Basic default modeling and sketch hotkeys work',
-  async ({ page }) => {
+  async ({ page, homePage }) => {
     const u = await getUtils(page)
 
     // This test can run long if it takes a little too long to load
@@ -298,8 +279,8 @@ test.fixme(
           })
         )
       })
-      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
+      await homePage.goToModelingScene()
       await u.openDebugPanel()
       await u.expectCmdLog('[data-message-type="execution-done"]')
       await u.closeDebugPanel()
@@ -450,10 +431,11 @@ test.fixme(
   }
 )
 
-test('Delete key does not navigate back', async ({ page }) => {
+test('Delete key does not navigate back', async ({ page, homePage }) => {
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await page.goto('/')
+  await homePage.goToModelingScene()
-  await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
+
+  await page.waitForURL('file:///**', { waitUntil: 'domcontentloaded' })
 
   const settingsButton = page.getByRole('link', {
     name: 'Settings',
@@ -462,45 +444,45 @@ test('Delete key does not navigate back', async ({ page }) => {
   const settingsCloseButton = page.getByTestId('settings-close-button')
 
   await settingsButton.click()
-  await expect(page.url()).toContain('/settings')
+  await expect.poll(() => page.url()).toContain('/settings')
 
   // Make sure that delete doesn't go back from settings
   await page.keyboard.press('Delete')
-  await expect(page.url()).toContain('/settings')
+  await expect.poll(() => page.url()).toContain('/settings')
 
   // Now close the settings and try delete again,
   // make sure it doesn't go back to settings
   await settingsCloseButton.click()
   await page.keyboard.press('Delete')
-  await expect(page.url()).not.toContain('/settings')
+  await expect.poll(() => page.url()).not.toContain('/settings')
 })
 
-test('Sketch on face', async ({ page }) => {
+test('Sketch on face', async ({ page, homePage }) => {
   test.setTimeout(90_000)
   const u = await getUtils(page)
   await page.addInitScript(async () => {
     localStorage.setItem(
       'persistCode',
       `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
+|> startProfileAt([3.29, 7.86], %)
-  |> line([2.48, 2.44], %)
+|> line([2.48, 2.44], %)
-  |> line([2.66, 1.17], %)
+|> line([2.66, 1.17], %)
-  |> line([3.75, 0.46], %)
+|> line([3.75, 0.46], %)
-  |> line([4.99, -0.46], %)
+|> line([4.99, -0.46], %)
-  |> line([3.3, -2.12], %)
+|> line([3.3, -2.12], %)
-  |> line([2.16, -3.33], %)
+|> line([2.16, -3.33], %)
-  |> line([0.85, -3.08], %)
+|> line([0.85, -3.08], %)
-  |> line([-0.18, -3.36], %)
+|> line([-0.18, -3.36], %)
-  |> line([-3.86, -2.73], %)
+|> line([-3.86, -2.73], %)
-  |> line([-17.67, 0.85], %)
+|> line([-17.67, 0.85], %)
-  |> close(%)
+|> close(%)
-  extrude001 = extrude(5 + 7, sketch001)`
+extrude001 = extrude(5 + 7, sketch001)`
     )
   })
 
-  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.setBodyDimensions({ width: 1200, height: 500 })
 
-  await u.waitForAuthSkipAppStart()
+  await homePage.goToModelingScene()
 
   // wait for execution done
   await u.openDebugPanel()
@@ -554,7 +536,8 @@ profile001 = startProfileAt([-12.88, 6.66], sketch002)
   |> line([2.71, -0.22], %)
   |> line([-2.87, -1.38], %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)`)
+  |> close(%)
+`)
   )
 
   await u.openAndClearDebugPanel()
@@ -586,11 +569,11 @@ profile001 = startProfileAt([-12.88, 6.66], sketch002)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
   const result = makeTemplate`sketch002 = startSketchOn(extrude001, seg01)
-  |> startProfileAt([-12.83, 6.7], %)
+|> startProfileAt([-12.83, 6.7], %)
-  |> line([${[2.28, 2.35]}, -${0.07}], %)
+|> line([${[2.28, 2.35]}, -${0.07}], %)
-  |> line([-3.05, -1.47], %)
+|> line([-3.05, -1.47], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
+|> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)`
+|> close(%)`
 
   await expect(page.locator('.cm-content')).toHaveText(result.regExp)
 
@@ -614,6 +597,6 @@ profile001 = startProfileAt([-12.88, 6.66], sketch002)
   await page.getByRole('button', { name: 'checkmark Submit command' }).click()
 
   const result2 = result.genNext`
-  const sketch002 = extrude(${[5, 5]} + 7, sketch002)`
+const sketch002 = extrude(${[5, 5]} + 7, sketch002)`
   await expect(page.locator('.cm-content')).toHaveText(result2.regExp)
 })

e2e/playwright/zoo-test.ts

@@ -0,0 +1,334 @@
+import {
+  test as playwrightTestFn,
+  TestInfo as TestInfoPlaywright,
+  BrowserContext as BrowserContextPlaywright,
+  Page as PagePlaywright,
+  TestDetails as TestDetailsPlaywright,
+  PlaywrightTestArgs,
+  PlaywrightTestOptions,
+  PlaywrightWorkerArgs,
+  PlaywrightWorkerOptions,
+  ElectronApplication,
+} from '@playwright/test'
+
+import {
+  fixtures,
+  Fixtures,
+  AuthenticatedTronApp,
+  AuthenticatedApp,
+} from './fixtures/fixtureSetup'
+
+import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
+export { expect } from '@playwright/test'
+
+declare module '@playwright/test' {
+  interface TestInfo {
+    tronApp?: AuthenticatedTronApp
+  }
+  interface BrowserContext {
+    folderSetupFn: (
+      cb: (dir: string) => Promise<void>
+    ) => Promise<{ dir: string }>
+  }
+  interface Page {
+    dir: string
+    TEST_SETTINGS_FILE_KEY?: string
+    setBodyDimensions: (dims: {
+      width: number
+      height: number
+    }) => Promise<void>
+  }
+}
+
+export type TestInfo = TestInfoPlaywright
+export type BrowserContext = BrowserContextPlaywright
+export type Page = PagePlaywright
+export type TestDetails = TestDetailsPlaywright & {
+  cleanProjectDir?: boolean
+  appSettings?: Partial<SaveSettingsPayload>
+}
+
+// Our custom decorated Zoo test object. Makes it easier to add fixtures, and
+// switch between web and electron if needed.
+const pwTestFnWithFixtures = playwrightTestFn.extend<Fixtures>(fixtures)
+
+// In JavaScript you cannot replace a function's body only (despite functions
+// are themselves objects, which you'd expect a body property or something...)
+// So we must redefine the function and then re-attach properties.
+type PWFunction = (
+  args: PlaywrightTestArgs &
+    Fixtures &
+    PlaywrightWorkerArgs &
+    PlaywrightTestOptions &
+    PlaywrightWorkerOptions & {
+      electronApp?: ElectronApplication
+    },
+  testInfo: TestInfo
+) => void | Promise<void>
+
+let firstUrl = ''
+
+// The below error is due to the extreme type spaghetti going on. playwright/
+// types/test.d.ts does not export 2 functions (below is one of them) but tsc
+// is trying to use a interface name it can't see.
+// e2e/playwright/zoo-test.ts:64:14 - error TS4023: Exported variable 'test' has
+// or is using name 'TestFunction' from external module
+// "/home/lee/Code/Zoo/modeling-app/dirty2/node_modules/playwright/types/test"
+// but cannot be named.
+export const test = (
+  desc: string,
+  objOrFn: PWFunction | TestDetails,
+  fnMaybe?: PWFunction
+) => {
+  const hasTestConf = typeof objOrFn === 'object'
+  const fn = hasTestConf ? fnMaybe : objOrFn
+
+  return pwTestFnWithFixtures(
+    desc,
+    hasTestConf ? objOrFn : {},
+    async (
+      {
+        page,
+        context,
+        cmdBar,
+        editor,
+        toolbar,
+        scene,
+        homePage,
+        request,
+        playwright,
+        browser,
+        acceptDownloads,
+        bypassCSP,
+        colorScheme,
+        clientCertificates,
+        deviceScaleFactor,
+        extraHTTPHeaders,
+        geolocation,
+        hasTouch,
+        httpCredentials,
+        ignoreHTTPSErrors,
+        isMobile,
+        javaScriptEnabled,
+        locale,
+        offline,
+        permissions,
+        proxy,
+        storageState,
+        timezoneId,
+        userAgent,
+        viewport,
+        baseURL,
+        contextOptions,
+        actionTimeout,
+        navigationTimeout,
+        serviceWorkers,
+        testIdAttribute,
+        browserName,
+        defaultBrowserType,
+        headless,
+        channel,
+        launchOptions,
+        connectOptions,
+        screenshot,
+        trace,
+        video,
+      },
+      testInfo
+    ) => {
+      // To switch to web, use PLATFORM=web environment variable.
+      // Only use this for debugging, since the playwright tracer is busted
+      // for electron.
+
+      let tronApp
+
+      if (process.env.PLATFORM === 'web') {
+        tronApp = new AuthenticatedApp(context, page, testInfo)
+      } else {
+        tronApp = new AuthenticatedTronApp(context, page, testInfo)
+      }
+
+      const fixtures: Fixtures = { cmdBar, editor, toolbar, scene, homePage }
+      if (tronApp instanceof AuthenticatedTronApp) {
+        const options = {
+          fixtures,
+        }
+        if (hasTestConf) {
+          Object.assign(options, {
+            appSettings: objOrFn?.appSettings,
+            cleanProjectDir: objOrFn?.cleanProjectDir,
+          })
+        }
+        await tronApp.initialise(options)
+      } else {
+        await tronApp.initialise('')
+      }
+
+      // We need to patch this because addInitScript will bind too late in our
+      // electron tests, never running. We need to call reload() after each call
+      // to guarantee it runs.
+      const oldContextAddInitScript = tronApp.context.addInitScript
+      tronApp.context.addInitScript = async function (a, b) {
+        // @ts-ignore pretty sure way out of tsc's type checking capabilities.
+        // This code works perfectly fine.
+        await oldContextAddInitScript.apply(this, [a, b])
+        await tronApp.page.reload()
+      }
+
+      // No idea why we mix and match page and context's addInitScript but we do
+      const oldPageAddInitScript = tronApp.page.addInitScript
+      tronApp.page.addInitScript = async function (a: any, b: any) {
+        // @ts-ignore pretty sure way out of tsc's type checking capabilities.
+        // This code works perfectly fine.
+        await oldPageAddInitScript.apply(this, [a, b])
+        await tronApp.page.reload()
+      }
+
+      // Create a consistent way to resize the page across electron and web.
+      // (lee) I had to do everything in the book to make electron change its
+      // damn window size. I succeeded in making it consistently and reliably
+      // do it after a whole afternoon.
+      tronApp.page.setBodyDimensions = async function (dims: {
+        width: number
+        height: number
+      }) {
+        await tronApp.page.setViewportSize(dims)
+
+        if (!(tronApp instanceof AuthenticatedTronApp)) {
+          return
+        }
+
+        await tronApp.electronApp?.evaluateHandle(async ({ app }, dims) => {
+          // @ts-ignore sorry jon but see comment in main.ts why this is ignored
+          await app.resizeWindow(dims.width, dims.height)
+        }, dims)
+
+        return tronApp.page.evaluate(
+          async (dims: { width: number; height: number }) => {
+            await window.electron.resizeWindow(dims.width, dims.height)
+            window.document.body.style.width = dims.width + 'px'
+            window.document.body.style.height = dims.height + 'px'
+            window.document.documentElement.style.width = dims.width + 'px'
+            window.document.documentElement.style.height = dims.height + 'px'
+          },
+          dims
+        )
+      }
+
+      await tronApp.page.setBodyDimensions(tronApp.viewPortSize)
+
+      // We need to expose this in order for some tests that require folder
+      // creation. Before they used to do this by their own electronSetup({...})
+      // calls.
+      if (tronApp instanceof AuthenticatedTronApp) {
+        tronApp.context.folderSetupFn = async function (fn) {
+          return fn(tronApp.dir)
+            .then(() => tronApp.page.reload())
+            .then(() => ({
+              dir: tronApp.dir,
+            }))
+        }
+      }
+
+      if (!firstUrl) {
+        await tronApp.page.getByText('Your Projects').count()
+        firstUrl = tronApp.page.url()
+      }
+
+      // Due to the app controlling its own window context we need to inject new
+      // options and context here.
+      // NOTE TO LEE: Seems to destroy page context when calling an electron loadURL.
+      // await tronApp.electronApp.evaluate(({ app }) => {
+      //   return app.reuseWindowForTest();
+      // });
+
+      await tronApp.electronApp?.evaluate(({ app }, projectDirName) => {
+        // @ts-ignore can't declaration merge see main.ts
+        app.testProperty['TEST_SETTINGS_FILE_KEY'] = projectDirName
+      }, tronApp.dir)
+
+      // Always start at the root view
+      await tronApp.page.goto(firstUrl)
+
+      // Force a hard reload, destroying the stream and other state
+      await tronApp.page.reload()
+
+      // tsc aint smart enough to know this'll never be undefined
+      // but I dont blame it, the logic to know is complex
+      if (fn) {
+        await fn(
+          {
+            context: tronApp.context,
+            page: tronApp.page,
+            electronApp:
+              tronApp instanceof AuthenticatedTronApp
+                ? tronApp.electronApp
+                : undefined,
+            ...fixtures,
+            request,
+            playwright,
+            browser,
+            acceptDownloads,
+            bypassCSP,
+            colorScheme,
+            clientCertificates,
+            deviceScaleFactor,
+            extraHTTPHeaders,
+            geolocation,
+            hasTouch,
+            httpCredentials,
+            ignoreHTTPSErrors,
+            isMobile,
+            javaScriptEnabled,
+            locale,
+            offline,
+            permissions,
+            proxy,
+            storageState,
+            timezoneId,
+            userAgent,
+            viewport,
+            baseURL,
+            contextOptions,
+            actionTimeout,
+            navigationTimeout,
+            serviceWorkers,
+            testIdAttribute,
+            browserName,
+            defaultBrowserType,
+            headless,
+            channel,
+            launchOptions,
+            connectOptions,
+            screenshot,
+            trace,
+            video,
+          },
+          testInfo
+        )
+      }
+
+      testInfo.tronApp =
+        tronApp instanceof AuthenticatedTronApp ? tronApp : undefined
+    }
+  )
+}
+
+type ZooTest = typeof test
+
+test.describe = pwTestFnWithFixtures.describe
+test.beforeEach = pwTestFnWithFixtures.beforeEach
+test.afterEach = pwTestFnWithFixtures.afterEach
+test.step = pwTestFnWithFixtures.step
+test.skip = pwTestFnWithFixtures.skip
+test.setTimeout = pwTestFnWithFixtures.setTimeout
+test.fixme = pwTestFnWithFixtures.fixme as unknown as ZooTest
+test.only = pwTestFnWithFixtures.only
+test.fail = pwTestFnWithFixtures.fail
+test.slow = pwTestFnWithFixtures.slow
+test.beforeAll = pwTestFnWithFixtures.beforeAll
+test.afterAll = pwTestFnWithFixtures.afterAll
+test.use = pwTestFnWithFixtures.use
+test.expect = pwTestFnWithFixtures.expect
+test.extend = pwTestFnWithFixtures.extend
+test.info = pwTestFnWithFixtures.info

interface.d.ts

@@ -7,6 +7,7 @@ import { MachinesListing } from 'components/MachineManagerProvider'
 type EnvFn = (value?: string) => string
 
 export interface IElectronAPI {
+  resizeWindow: (width: number, height: number) => Promise<void>
   open: typeof dialog.showOpenDialog
   save: typeof dialog.showSaveDialog
   openExternal: typeof shell.openExternal
@@ -79,6 +80,7 @@ export interface IElectronAPI {
   onUpdateError: (callback: (value: { error: Error }) => void) => Electron
   appRestart: () => void
   getArgvParsed: () => any
+  getAppTestProperty: (propertyName: string) => any
 }
 
 declare global {

package.json

@@ -39,6 +39,7 @@
     "chokidar": "^4.0.1",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
+    "diff": "^7.0.0",
     "electron-updater": "6.3.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
@@ -103,24 +104,22 @@
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
     "tron:start": "electron-forge start",
     "tron:package": "electron-forge package",
-    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "chrome:test": "PLATFORM=web NODE_ENV=development yarn playwright test --config=playwright.config.ts --project='Google Chrome' --grep-invert='@snapshot'",
+    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
     "tronb:vite": "vite build -c vite.main.config.ts && vite build -c vite.preload.config.ts && vite build -c vite.renderer.config.ts",
     "tronb:package": "electron-builder --config electron-builder.yml",
     "test-setup": "yarn install && yarn build:wasm",
     "test": "vitest --mode development",
     "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts",
     "test:unit:kcl-samples": "vitest run --mode development ./src/lang/kclSamples.test.ts",
-    "test:playwright:browser:chrome": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron'",
+    "test:playwright:electron": "playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
-    "test:playwright:browser:chrome:windows": "playwright test --project=\"Google Chrome\" --config=playwright.ci.config.ts --grep-invert=\"@snapshot|@electron|@skipWin\"",
+    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\"",
-    "test:playwright:browser:chrome:ubuntu": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron|@skipLinux'",
+    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
-    "test:playwright:electron": "playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
-    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipWin",
+    "test:playwright:electron:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
-    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipMacos",
+    "test:playwright:electron:windows:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\"",
-    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipLinux",
+    "test:playwright:electron:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
-    "test:playwright:electron:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "test:playwright:electron:ubuntu:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
-    "test:playwright:electron:windows:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipWin",
-    "test:playwright:electron:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipMacos",
-    "test:playwright:electron:ubuntu:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipLinux",
     "test:unit:local": "yarn simpleserver:bg && yarn test:unit; kill-port 3000",
     "test:unit:kcl-samples:local": "yarn simpleserver:bg && yarn test:unit:kcl-samples; kill-port 3000"
   },
@@ -152,10 +151,11 @@
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@nabla/vite-plugin-eslint": "^2.0.5",
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.49.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@types/d3-force": "^3.0.10",
+    "@types/diff": "^6.0.0",
     "@types/electron": "^1.6.10",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/minimist": "^1.2.5",

playwright.ci.config.ts

@@ -1,58 +0,0 @@
-import { defineConfig, devices } from '@playwright/test'
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  timeout: 120_000, // override the default 30s timeout
-  testDir: './e2e/playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: true,
-  /* Do not retry */
-  retries: 0,
-  /* Different amount of parallelism on CI and local. */
-  workers: 1,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: [
-    ['dot'],
-    ['list'],
-    ['json', { outputFile: './test-results/report.json' }],
-    ['html'],
-  ],
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:3000',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'retain-on-failure',
-    actionTimeout: 15_000,
-    screenshot: 'only-on-failure',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'Google Chrome',
-      use: {
-        ...devices['Desktop Chrome'],
-        channel: 'chrome',
-        contextOptions: {
-          /* Chromium is the only one with these permission types */
-          permissions: ['clipboard-write', 'clipboard-read'],
-        },
-      }, // or 'chrome-beta'
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-  ],
-
-  webServer: {
-    command: 'yarn start',
-    reuseExistingServer: false,
-  },
-})

playwright.electron.config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
   /* Do not retry */
   retries: 0,
   /* Different amount of parallelism on CI and local. */
-  workers: 1,
+  workers: 8,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: [
     ['dot'],

public/announce_release.py

@@ -28,6 +28,7 @@ data = {
     "content": 
         f'''
         **{release_version}** is now available! Check out the latest features and improvements here: <https://zoo.dev/modeling-app/download>
+
         {modified_release_body}
         ''',
     "username": "Modeling App Release Updates",

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -78,7 +78,7 @@ function CommandBarSelectionInput({
     return () => {
       toSync(() => {
         const promises = [
-          new Promise(() => kclManager.defaultSelectionFilter()),
+          new Promise(() => kclManager.defaultSelectionFilter(selection)),
         ]
         if (!kclManager._isAstEmpty(kclManager.ast)) {
           promises.push(kclManager.hidePlanes())

src/components/ModelingMachineProvider.tsx

@@ -46,16 +46,9 @@ import {
   applyConstraintLength,
 } from './Toolbar/setAngleLength'
 import {
-  canSweepSelection,
   handleSelectionBatch,
-  isSelectionLastLine,
-  isRangeBetweenCharacters,
-  isSketchPipe,
   Selections,
   updateSelections,
-  canLoftSelection,
-  canRevolveSelection,
-  canShellSelection,
 } from 'lib/selections'
 import { applyConstraintIntersect } from './Toolbar/Intersect'
 import { applyConstraintAbsDistance } from './Toolbar/SetAbsDistance'
@@ -83,8 +76,6 @@ import {
   resultIsOk,
 } from 'lang/wasm'
 import {
-  doesSceneHaveExtrudedSketch,
-  doesSceneHaveSweepableSketch,
   doesSketchPipeNeedSplitting,
   getNodeFromPath,
   isCursorInFunctionDefinition,
@@ -99,7 +90,6 @@ import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { err, reportRejection, trap, reject } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { modelingMachineEvent } from 'editor/manager'
-import { hasValidEdgeTreatmentSelection } from 'lang/modifyAst/addEdgeTreatment'
 import {
   ExportIntent,
   EngineConnectionStateType,
@@ -114,6 +104,7 @@ import {
   getPathsFromArtifact,
   getPlaneFromArtifact,
 } from 'lang/std/artifactGraph'
+import { promptToEditFlow } from 'lib/promptToEdit'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -578,78 +569,6 @@ export const ModelingMachineProvider = ({
         },
       },
       guards: {
-        'has valid sweep selection': ({ context: { selectionRanges } }) => {
-          // A user can begin extruding if they either have 1+ faces selected or nothing selected
-          // TODO: I believe this guard only allows for extruding a single face at a time
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            // they have no selection, we should enable the button
-            // so they can select the face through the cmdbar
-            // BUT only if there's extrudable geometry
-            return doesSceneHaveSweepableSketch(kclManager.ast)
-          }
-          if (!isSketchPipe(selectionRanges)) return false
-
-          const canSweep = canSweepSelection(selectionRanges)
-          if (err(canSweep)) return false
-          return canSweep
-        },
-        'has valid revolve selection': ({ context: { selectionRanges } }) => {
-          // A user can begin extruding if they either have 1+ faces selected or nothing selected
-          // TODO: I believe this guard only allows for extruding a single face at a time
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            // they have no selection, we should enable the button
-            // so they can select the face through the cmdbar
-            // BUT only if there's extrudable geometry
-            return doesSceneHaveSweepableSketch(kclManager.ast)
-          }
-          if (!isSketchPipe(selectionRanges)) return false
-
-          const canSweep = canRevolveSelection(selectionRanges)
-          if (err(canSweep)) return false
-          return canSweep
-        },
-        'has valid loft selection': ({ context: { selectionRanges } }) => {
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            const count = 2
-            return doesSceneHaveSweepableSketch(kclManager.ast, count)
-          }
-
-          const canLoft = canLoftSelection(selectionRanges)
-          if (err(canLoft)) return false
-          return canLoft
-        },
-        'has valid shell selection': ({
-          context: { selectionRanges },
-          event,
-        }) => {
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            return doesSceneHaveExtrudedSketch(kclManager.ast)
-          }
-
-          const canShell = canShellSelection(selectionRanges)
-          if (err(canShell)) return false
-          return canShell
-        },
         'has valid selection for deletion': ({
           context: { selectionRanges },
         }) => {
@@ -657,15 +576,6 @@ export const ModelingMachineProvider = ({
           if (selectionRanges.graphSelections.length <= 0) return false
           return true
         },
-        'has valid edge treatment selection': ({
-          context: { selectionRanges },
-        }) => {
-          return hasValidEdgeTreatmentSelection({
-            selectionRanges,
-            ast: kclManager.ast,
-            code: codeManager.code,
-          })
-        },
         'Selection is on face': ({ context: { selectionRanges }, event }) => {
           if (event.type !== 'Enter sketch') return false
           if (event.data?.forceNewSketch) return false
@@ -1492,6 +1402,15 @@ export const ModelingMachineProvider = ({
             }
           }
         ),
+        'submit-prompt-edit': fromPromise(async ({ input }) => {
+          return await promptToEditFlow({
+            code: codeManager.code,
+            prompt: input.prompt,
+            selections: input.selection,
+            token,
+            artifactGraph: engineCommandManager.artifactGraph,
+          })
+        }),
       },
     }),
     {

src/components/ToastTextToCad.tsx

@@ -4,7 +4,10 @@ import { useFileContext } from 'hooks/useFileContext'
 import { isDesktop } from 'lib/isDesktop'
 import { PATHS } from 'lib/paths'
 import toast from 'react-hot-toast'
-import { TextToCad_type } from '@kittycad/lib/dist/types/src/models'
+import {
+  TextToCad_type,
+  TextToCadIteration_type,
+} from '@kittycad/lib/dist/types/src/models'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import {
   Box3,
@@ -29,6 +32,7 @@ import { commandBarMachine } from 'machines/commandBarMachine'
 import { EventFrom } from 'xstate'
 import { fileMachine } from 'machines/fileMachine'
 import { reportRejection } from 'lib/trap'
+import { codeManager, kclManager } from 'lib/singletons'
 
 const CANVAS_SIZE = 128
 const PROMPT_TRUNCATE_LENGTH = 128
@@ -411,3 +415,67 @@ function traverseSceneToStyleObjects({
     }
   })
 }
+
+export function ToastPromptToEditCadSuccess({
+  toastId,
+  token,
+  data,
+  oldCode,
+}: {
+  toastId: string
+  oldCode: string
+  data: TextToCadIteration_type
+  token?: string
+}) {
+  const modelId = data.id
+
+  return (
+    <div className="flex gap-4 min-w-80">
+      <div className="flex flex-col justify-between gap-6">
+        <section>
+          <h2>Prompt to edit successful</h2>
+          <p className="text-sm text-chalkboard-70 dark:text-chalkboard-30">
+            Prompt: "
+            {data?.prompt && data?.prompt?.length > PROMPT_TRUNCATE_LENGTH
+              ? data.prompt.slice(0, PROMPT_TRUNCATE_LENGTH) + '...'
+              : data.prompt}
+            "
+          </p>
+          <p>Do you want to keep the change?</p>
+        </section>
+        <div className="flex justify-between gap-8">
+          <ActionButton
+            Element="button"
+            iconStart={{
+              icon: 'close',
+            }}
+            data-negative-button={'reject'}
+            name={'Reject'}
+            onClick={() => {
+              sendTelemetry(modelId, 'rejected', token).catch(reportRejection)
+              codeManager.updateCodeEditor(oldCode)
+              kclManager.executeCode().catch(reportRejection)
+              toast.dismiss(toastId)
+            }}
+          >
+            {'Reject'}
+          </ActionButton>
+
+          <ActionButton
+            Element="button"
+            iconStart={{
+              icon: 'checkmark',
+            }}
+            name="Accept"
+            onClick={() => {
+              sendTelemetry(modelId, 'accepted', token).catch(reportRejection)
+              toast.dismiss(toastId)
+            }}
+          >
+            Accept
+          </ActionButton>
+        </div>
+      </div>
+    </div>
+  )
+}

src/editor/manager.ts

@@ -15,6 +15,18 @@ import {
 import { StateFrom } from 'xstate'
 import { markOnce } from 'lib/performance'
 
+declare global {
+  interface Window {
+    EditorSelection: typeof EditorSelection
+    EditorView: typeof EditorView
+  }
+}
+
+// We need to be able to create these during tests dynamically (via
+// page.evaluate) So that's why this exists.
+window.EditorSelection = EditorSelection
+window.EditorView = EditorView
+
 const updateOutsideEditorAnnotation = Annotation.define<boolean>()
 export const updateOutsideEditorEvent = updateOutsideEditorAnnotation.of(true)
 
@@ -25,7 +37,6 @@ const setDiagnosticsAnnotation = Annotation.define<boolean>()
 export const setDiagnosticsEvent = setDiagnosticsAnnotation.of(true)
 
 export default class EditorManager {
-  private _editorView: EditorView | null = null
   private _copilotEnabled: boolean = true
 
   private _isShiftDown: boolean = false
@@ -47,6 +58,8 @@ export default class EditorManager {
 
   private _highlightRange: Array<[number, number]> = [[0, 0]]
 
+  public _editorView: EditorView | null = null
+
   setCopilotEnabled(enabled: boolean) {
     this._copilotEnabled = enabled
   }

src/lang/KclSingleton.ts

@@ -1,5 +1,5 @@
 import { executeAst, lintAst } from 'lang/langHelpers'
-import { Selections } from 'lib/selections'
+import { handleSelectionBatch, Selections } from 'lib/selections'
 import {
   KCLError,
   complilationErrorsToDiagnostics,
@@ -28,7 +28,10 @@ import { codeManager, editorManager, sceneInfra } from 'lib/singletons'
 import { Diagnostic } from '@codemirror/lint'
 import { markOnce } from 'lib/performance'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
-import { EntityType_type } from '@kittycad/lib/dist/types/src/models'
+import {
+  EntityType_type,
+  ModelingCmdReq_type,
+} from '@kittycad/lib/dist/types/src/models'
 
 interface ExecuteArgs {
   ast?: Node<Program>
@@ -311,7 +314,7 @@ export class KclManager {
     // Do not send send scene commands if the program was interrupted, go to clean up
     if (!isInterrupted) {
       this.addDiagnostics(await lintAst({ ast: ast }))
-      setSelectionFilterToDefault(execState.memory, this.engineCommandManager)
+      setSelectionFilterToDefault(this.engineCommandManager)
 
       if (args.zoomToFit) {
         let zoomObjectId: string | undefined = ''
@@ -605,8 +608,8 @@ export class KclManager {
     return Promise.all(thePromises)
   }
   /** TODO: this function is hiding unawaited asynchronous work */
-  defaultSelectionFilter() {
+  defaultSelectionFilter(selectionsToRestore?: Selections) {
-    setSelectionFilterToDefault(this.programMemory, this.engineCommandManager)
+    setSelectionFilterToDefault(this.engineCommandManager, selectionsToRestore)
   }
   /** TODO: this function is hiding unawaited asynchronous work */
   setSelectionFilter(filter: EntityType_type[]) {
@@ -642,18 +645,29 @@ const defaultSelectionFilter: EntityType_type[] = [
 
 /** TODO: This function is not synchronous but is currently treated as such */
 function setSelectionFilterToDefault(
-  programMemory: ProgramMemory,
+  engineCommandManager: EngineCommandManager,
-  engineCommandManager: EngineCommandManager
+  selectionsToRestore?: Selections
 ) {
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  setSelectionFilter(defaultSelectionFilter, engineCommandManager)
+  setSelectionFilter(
+    defaultSelectionFilter,
+    engineCommandManager,
+    selectionsToRestore
+  )
 }
 
 /** TODO: This function is not synchronous but is currently treated as such */
 function setSelectionFilter(
   filter: EntityType_type[],
-  engineCommandManager: EngineCommandManager
+  engineCommandManager: EngineCommandManager,
+  selectionsToRestore?: Selections
 ) {
+  const { engineEvents } = selectionsToRestore
+    ? handleSelectionBatch({
+        selections: selectionsToRestore,
+      })
+    : { engineEvents: undefined }
+  if (!selectionsToRestore || !engineEvents) {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     engineCommandManager.sendSceneCommand({
       type: 'modeling_cmd_req',
@@ -663,4 +677,33 @@ function setSelectionFilter(
         filter,
       },
     })
+    return
+  }
+  const modelingCmd: ModelingCmdReq_type[] = []
+  engineEvents.forEach((event) => {
+    if (event.type === 'modeling_cmd_req') {
+      modelingCmd.push({
+        cmd_id: uuidv4(),
+        cmd: event.cmd,
+      })
+    }
+  })
+  // batch is needed other wise the selection flickers.
+  engineCommandManager
+    .sendSceneCommand({
+      type: 'modeling_cmd_batch_req',
+      batch_id: uuidv4(),
+      requests: [
+        {
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'set_selection_filter',
+            filter,
+          },
+        },
+        ...modelingCmd,
+      ],
+      responses: false,
+    })
+    .catch(reportError)
 }

src/lang/codeManager.ts

@@ -45,7 +45,7 @@ export default class CodeManager {
     } else if (storedCode === null) {
       this.code = bracket
     } else {
-      this.code = storedCode
+      this.code = storedCode || ''
     }
   }
 
@@ -57,6 +57,10 @@ export default class CodeManager {
     return this._code
   }
 
+  localStoragePersistCode(): string {
+    return safeLSGetItem(PERSIST_CODE_KEY) || ''
+  }
+
   registerCallBacks({ setCode }: { setCode: (arg: string) => void }) {
     this.#updateState = setCode
   }
@@ -165,7 +169,7 @@ export default class CodeManager {
 }
 
 function safeLSGetItem(key: string) {
-  if (typeof window === 'undefined') return null
+  if (typeof window === 'undefined') return
   return localStorage?.getItem(key)
 }
 

src/lang/queryAst.test.ts

@@ -10,7 +10,6 @@ import {
   isNodeSafeToReplace,
   isTypeInValue,
   getNodePathFromSourceRange,
-  doesPipeHaveCallExp,
   hasExtrudeSketch,
   findUsesOfTagInPipe,
   hasSketchPipeBeenExtruded,
@@ -362,82 +361,6 @@ describe('testing getNodePathFromSourceRange', () => {
   })
 })
 
-describe('testing doesPipeHave', () => {
-  it('finds close', () => {
-    const exampleCode = `length001 = 2
-part001 = startSketchAt([-1.41, 3.46])
-  |> line([19.49, 1.16], %, $seg01)
-  |> angledLine([-35, length001], %)
-  |> line([-3.22, -7.36], %)
-  |> angledLine([-175, segLen(seg01)], %)
-  |> close(%)
-`
-    const ast = assertParse(exampleCode)
-
-    const result = doesPipeHaveCallExp({
-      calleeName: 'close',
-      ast,
-      selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
-      },
-    })
-    expect(result).toEqual(true)
-  })
-  it('finds extrude', () => {
-    const exampleCode = `length001 = 2
-part001 = startSketchAt([-1.41, 3.46])
-  |> line([19.49, 1.16], %, $seg01)
-  |> angledLine([-35, length001], %)
-  |> line([-3.22, -7.36], %)
-  |> angledLine([-175, segLen(seg01)], %)
-  |> close(%)
-  |> extrude(1, %)
-`
-    const ast = assertParse(exampleCode)
-
-    const result = doesPipeHaveCallExp({
-      calleeName: 'extrude',
-      ast,
-      selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
-      },
-    })
-    expect(result).toEqual(true)
-  })
-  it('does NOT find close', () => {
-    const exampleCode = `length001 = 2
-part001 = startSketchAt([-1.41, 3.46])
-  |> line([19.49, 1.16], %, $seg01)
-  |> angledLine([-35, length001], %)
-  |> line([-3.22, -7.36], %)
-  |> angledLine([-175, segLen(seg01)], %)
-`
-    const ast = assertParse(exampleCode)
-
-    const result = doesPipeHaveCallExp({
-      calleeName: 'close',
-      ast,
-      selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
-      },
-    })
-    expect(result).toEqual(false)
-  })
-  it('returns false if not a pipe', () => {
-    const exampleCode = `length001 = 2`
-    const ast = assertParse(exampleCode)
-
-    const result = doesPipeHaveCallExp({
-      calleeName: 'close',
-      ast,
-      selection: {
-        codeRef: codeRefFromRange([9, 10, true], ast),
-      },
-    })
-    expect(result).toEqual(false)
-  })
-})
-
 describe('testing hasExtrudeSketch', () => {
   it('find sketch', async () => {
     const exampleCode = `length001 = 2

src/lang/queryAst.ts

@@ -845,33 +845,6 @@ export function isLinesParallelAndConstrained(
   }
 }
 
-export function doesPipeHaveCallExp({
-  ast,
-  selection,
-  calleeName,
-}: {
-  calleeName: string
-  ast: Program
-  selection: Selection
-}): boolean {
-  const pipeExpressionMeta = getNodeFromPath<PipeExpression>(
-    ast,
-    selection?.codeRef?.pathToNode,
-    'PipeExpression'
-  )
-  if (err(pipeExpressionMeta)) {
-    console.error(pipeExpressionMeta)
-    return false
-  }
-  const pipeExpression = pipeExpressionMeta.node
-  if (pipeExpression.type !== 'PipeExpression') return false
-  return pipeExpression.body.some(
-    (expression) =>
-      expression.type === 'CallExpression' &&
-      expression.callee.name === calleeName
-  )
-}
-
 export function hasExtrudeSketch({
   ast,
   selection,

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -76,6 +76,10 @@ export type ModelingCommandSchema = {
   'Text-to-CAD': {
     prompt: string
   }
+  'Prompt-to-edit': {
+    prompt: string
+    selection: Selections
+  }
 }
 
 export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
@@ -479,4 +483,29 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
       },
     },
   },
+  'Prompt-to-edit': {
+    description: 'Use Zoo AI to edit your kcl',
+    icon: 'chat',
+    args: {
+      selection: {
+        inputType: 'selection',
+        selectionTypes: [
+          'solid2D',
+          'segment',
+          'sweepEdge',
+          'cap',
+          'wall',
+          'edgeCut',
+          'edgeCutEdge',
+        ],
+        multiple: true,
+        required: true,
+        skip: true,
+      },
+      prompt: {
+        inputType: 'text',
+        required: true,
+      },
+    },
+  },
 }

src/lib/desktop.ts

@@ -391,7 +391,9 @@ const getAppFolderName = () => {
 
 export const getAppSettingsFilePath = async () => {
   const isTestEnv = window.electron.process.env.IS_PLAYWRIGHT === 'true'
-  const testSettingsPath = window.electron.process.env.TEST_SETTINGS_FILE_KEY
+  const testSettingsPath = await window.electron.getAppTestProperty(
+    'TEST_SETTINGS_FILE_KEY'
+  )
   const appConfig = await window.electron.getPath('appData')
   const fullPath = isTestEnv
     ? testSettingsPath
@@ -408,7 +410,9 @@ export const getAppSettingsFilePath = async () => {
 }
 const getTokenFilePath = async () => {
   const isTestEnv = window.electron.process.env.IS_PLAYWRIGHT === 'true'
-  const testSettingsPath = window.electron.process.env.TEST_SETTINGS_FILE_KEY
+  const testSettingsPath = await window.electron.getAppTestProperty(
+    'TEST_SETTINGS_FILE_KEY'
+  )
   const appConfig = await window.electron.getPath('appData')
   const fullPath = isTestEnv
     ? testSettingsPath

src/lib/exportSave.ts

@@ -17,9 +17,17 @@ const save_ = async (file: ModelingAppFile, toastId: string) => {
       }
 
       if (window.electron.process.env.IS_PLAYWRIGHT) {
-        // skip file picker, save to default location
+        // Skip file picker, save to the test dir downloads directory
+        const testSettingsPath = await window.electron.getAppTestProperty(
+          'TEST_SETTINGS_FILE_KEY'
+        )
+        const downloadDir = window.electron.join(
+          testSettingsPath,
+          'downloads-during-playwright'
+        )
+        await window.electron.mkdir(downloadDir, { recursive: true })
         await window.electron.writeFile(
-          file.name,
+          window.electron.join(downloadDir, file.name),
           new Uint8Array(file.contents)
         )
         toast.success(EXPORT_TOAST_MESSAGES.SUCCESS, { id: toastId })

src/lib/promptToEdit.ts

@@ -0,0 +1,345 @@
+import { Models } from '@kittycad/lib'
+import { VITE_KC_API_BASE_URL } from 'env'
+import crossPlatformFetch from './crossPlatformFetch'
+import { err, reportRejection } from './trap'
+import { Selections } from './selections'
+import { ArtifactGraph, getArtifactOfTypes } from 'lang/std/artifactGraph'
+import { SourceRange } from 'lang/wasm'
+import toast from 'react-hot-toast'
+import { codeManager, editorManager, kclManager } from './singletons'
+import { ToastPromptToEditCadSuccess } from 'components/ToastTextToCad'
+import { uuidv4 } from './utils'
+import { diffLines } from 'diff'
+import { Transaction, EditorSelection, SelectionRange } from '@codemirror/state'
+import { modelingMachineEvent } from 'editor/manager'
+
+function sourceIndexToLineColumn(
+  code: string,
+  index: number
+): { line: number; column: number } {
+  const codeStart = code.slice(0, index)
+  const lines = codeStart.split('\n')
+  const line = lines.length
+  const column = lines[lines.length - 1].length
+  return { line, column }
+}
+
+function convertAppRangeToApiRange(
+  range: SourceRange,
+  code: string
+): Models['SourceRange_type'] {
+  return {
+    start: sourceIndexToLineColumn(code, range[0]),
+    end: sourceIndexToLineColumn(code, range[1]),
+  }
+}
+
+export async function submitPromptToEditToQueue({
+  prompt,
+  selections,
+  code,
+  token,
+  artifactGraph,
+}: {
+  prompt: string
+  selections: Selections
+  code: string
+  token?: string
+  artifactGraph: ArtifactGraph
+}): Promise<Models['TextToCadIteration_type'] | Error> {
+  const ranges: Models['TextToCadIterationBody_type']['source_ranges'] =
+    selections.graphSelections.flatMap((selection) => {
+      const artifact = selection.artifact
+      const prompts: Models['TextToCadIterationBody_type']['source_ranges'] = []
+
+      if (artifact?.type === 'cap') {
+        prompts.push({
+          prompt: `The users main selection is the end cap of a general-sweep (that is an extrusion, revolve, sweep or loft).
+The source range most likely refers to "startProfileAt" simply because this is the start of the profile that was swept.
+If you need to operate on this cap, for example for sketching on the face, you can use the special string ${
+            artifact.subType === 'end' ? 'END' : 'START'
+          } i.e. \`startSketchOn(someSweepVariable, ${
+            artifact.subType === 'end' ? 'END' : 'START'
+          })\`
+When they made this selection they main have intended this surface directly or meant something more general like the sweep body.
+See later source ranges for more context.`,
+          range: convertAppRangeToApiRange(selection.codeRef.range, code),
+        })
+        let sweep = getArtifactOfTypes(
+          { key: artifact.sweepId, types: ['sweep'] },
+          artifactGraph
+        )
+        if (!err(sweep)) {
+          prompts.push({
+            prompt: `This is the sweep's source range from the user's main selection of the end cap.`,
+            range: convertAppRangeToApiRange(sweep.codeRef.range, code),
+          })
+        }
+      }
+      if (artifact?.type === 'wall') {
+        prompts.push({
+          prompt: `The users main selection is the wall of a general-sweep (that is an extrusion, revolve, sweep or loft).
+The source range though is for the original segment before it was extruded, you can add a tag to that segment in order to refer to this wall, for example "startSketchOn(someSweepVariable, segmentTag)"
+But it's also worth bearing in mind that the user may have intended to select the sweep itself, not this individual wall, see later source ranges for more context. about the sweep`,
+          range: convertAppRangeToApiRange(selection.codeRef.range, code),
+        })
+        let sweep = getArtifactOfTypes(
+          { key: artifact.sweepId, types: ['sweep'] },
+          artifactGraph
+        )
+        if (!err(sweep)) {
+          prompts.push({
+            prompt: `This is the sweep's source range from the user's main selection of the end cap.`,
+            range: convertAppRangeToApiRange(sweep.codeRef.range, code),
+          })
+        }
+      }
+      if (artifact?.type === 'sweepEdge') {
+        prompts.push({
+          prompt: `The users main selection is the edge of a general-sweep (that is an extrusion, revolve, sweep or loft).
+it is an ${
+            artifact.subType
+          } edge, in order to refer to this edge you should add a tag to the segment function in this source range,
+and then use the function ${
+            artifact.subType === 'adjacent'
+              ? 'getAdjacentEdge'
+              : 'getOppositeEdge'
+          }
+See later source ranges for more context. about the sweep`,
+          range: convertAppRangeToApiRange(selection.codeRef.range, code),
+        })
+        let sweep = getArtifactOfTypes(
+          { key: artifact.sweepId, types: ['sweep'] },
+          artifactGraph
+        )
+        if (!err(sweep)) {
+          prompts.push({
+            prompt: `This is the sweep's source range from the user's main selection of the end cap.`,
+            range: convertAppRangeToApiRange(sweep.codeRef.range, code),
+          })
+        }
+      }
+      if (artifact?.type === 'segment') {
+        if (!artifact.surfaceId) {
+          prompts.push({
+            prompt: `This selection is of a segment, likely an individual part of a profile. Segments are often "constrained" by the use of variables and relationships with other segments. Adding tags to segments helps refer to their length, angle or other properties`,
+            range: convertAppRangeToApiRange(selection.codeRef.range, code),
+          })
+        } else {
+          prompts.push({
+            prompt: `This selection is for a segment (line, xLine, angledLine etc) that has been swept (a general-sweep, either an extrusion, revolve, sweep or loft).
+Because it now refers to an edge the way to refer to this edge is to add a tag to the segment, and then use that tag directly.
+i.e. \`fillet({ radius = someInteger, tags = [newTag] }, %)\` will work in the case of filleting this edge
+See later source ranges for more context. about the sweep`,
+            range: convertAppRangeToApiRange(selection.codeRef.range, code),
+          })
+          let path = getArtifactOfTypes(
+            { key: artifact.pathId, types: ['path'] },
+            artifactGraph
+          )
+          if (!err(path)) {
+            const sweep = getArtifactOfTypes(
+              { key: path.sweepId, types: ['sweep'] },
+              artifactGraph
+            )
+            if (!err(sweep)) {
+              prompts.push({
+                prompt: `This is the sweep's source range from the user's main selection of the edge.`,
+                range: convertAppRangeToApiRange(sweep.codeRef.range, code),
+              })
+            }
+          }
+        }
+      }
+      return prompts
+    })
+  const body: Models['TextToCadIterationBody_type'] = {
+    original_source_code: code,
+    prompt,
+    source_ranges: ranges,
+  }
+  const url = VITE_KC_API_BASE_URL + '/ml/text-to-cad/iteration'
+  const data: Models['TextToCadIteration_type'] | Error =
+    await crossPlatformFetch(
+      url,
+      {
+        method: 'POST',
+        body: JSON.stringify(body),
+      },
+      token
+    )
+
+  // Make sure we have an id.
+  if (data instanceof Error) {
+    return data
+  }
+
+  if (!data.id) {
+    return new Error('No id returned from Text-to-CAD API')
+  }
+  return data
+}
+
+export async function getPromptToEditResult(
+  id: string,
+  token?: string
+): Promise<Models['TextToCadIteration_type'] | Error> {
+  const url = VITE_KC_API_BASE_URL + '/async/operations/' + id
+  const data: Models['TextToCadIteration_type'] | Error =
+    await crossPlatformFetch(
+      url,
+      {
+        method: 'GET',
+      },
+      token
+    )
+
+  return data
+}
+
+export async function doPromptEdit({
+  prompt,
+  selections,
+  code,
+  token,
+  artifactGraph,
+}: {
+  prompt: string
+  selections: Selections
+  code: string
+  token?: string
+  artifactGraph: ArtifactGraph
+}): Promise<Models['TextToCadIteration_type'] | Error> {
+  const toastId = toast.loading('Submitting to Text-to-CAD API...')
+  const submitResult = await submitPromptToEditToQueue({
+    prompt,
+    selections,
+    code,
+    token,
+    artifactGraph,
+  })
+  if (err(submitResult)) return submitResult
+
+  const textToCadComplete = new Promise<Models['TextToCadIteration_type']>(
+    (resolve, reject) => {
+      ;(async () => {
+        const MAX_CHECK_TIMEOUT = 3 * 60_000
+        const CHECK_DELAY = 200
+
+        let timeElapsed = 0
+
+        while (timeElapsed < MAX_CHECK_TIMEOUT) {
+          const check = await getPromptToEditResult(submitResult.id, token)
+          if (check instanceof Error || check.status === 'failed') {
+            reject(check)
+            return
+          } else if (check.status === 'completed') {
+            resolve(check)
+            return
+          }
+
+          await new Promise((r) => setTimeout(r, CHECK_DELAY))
+          timeElapsed += CHECK_DELAY
+        }
+
+        reject(new Error('Text-to-CAD API timed out'))
+      })().catch(reportRejection)
+    }
+  )
+
+  try {
+    const result = await textToCadComplete
+    toast.dismiss(toastId)
+    return result
+  } catch (e) {
+    toast.dismiss(toastId)
+    toast.error(
+      'Failed to edit your KCL code, please try again with a different prompt or selection'
+    )
+    console.error('textToCadComplete', e)
+  }
+
+  return textToCadComplete
+}
+
+/** takes care of the whole submit prompt to endpoint flow including the accept-reject toast once the result is back */
+export async function promptToEditFlow({
+  prompt,
+  selections,
+  code,
+  token,
+  artifactGraph,
+}: {
+  prompt: string
+  selections: Selections
+  code: string
+  token?: string
+  artifactGraph: ArtifactGraph
+}) {
+  const result = await doPromptEdit({
+    prompt,
+    selections,
+    code,
+    token,
+    artifactGraph,
+  })
+  if (err(result)) return Promise.reject(result)
+  const oldCode = codeManager.code
+  const { code: newCode } = result
+  codeManager.updateCodeEditor(newCode)
+  const diff = reBuildNewCodeWithRanges(oldCode, newCode)
+  const ranges: SelectionRange[] = diff.insertRanges.map((range) =>
+    EditorSelection.range(range[0], range[1])
+  )
+  editorManager?.editorView?.dispatch({
+    selection: EditorSelection.create(
+      ranges,
+      selections.graphSelections.length - 1
+    ),
+    annotations: [modelingMachineEvent, Transaction.addToHistory.of(false)],
+  })
+  await kclManager.executeCode()
+  const toastId = uuidv4()
+
+  toast.success(
+    () =>
+      ToastPromptToEditCadSuccess({
+        toastId,
+        data: result,
+        token,
+        oldCode,
+      }),
+    {
+      id: toastId,
+      duration: Infinity,
+      icon: null,
+    }
+  )
+}
+
+const reBuildNewCodeWithRanges = (
+  oldCode: string,
+  newCode: string
+): {
+  newCode: string
+  insertRanges: SourceRange[]
+} => {
+  let insertRanges: SourceRange[] = []
+  const changes = diffLines(oldCode, newCode)
+  let newCodeWithRanges = ''
+  for (const change of changes) {
+    if (!change.added && !change.removed) {
+      // no change add it to newCodeWithRanges
+      newCodeWithRanges += change.value
+    } else if (change.added && !change.removed) {
+      const start = newCodeWithRanges.length
+      const end = start + change.value.length
+      insertRanges.push([start, end, true])
+      newCodeWithRanges += change.value
+    }
+  }
+  return {
+    newCode: newCodeWithRanges,
+    insertRanges,
+  }
+}

src/lib/routeLoaders.ts

@@ -87,12 +87,13 @@ export const fileLoader: LoaderFunction = async (
   )
   const isBrowserProject = params.id === decodeURIComponent(BROWSER_PATH)
 
+  let code = ''
+
   if (!isBrowserProject && projectPathData) {
     const { projectName, projectPath, currentFileName, currentFilePath } =
       projectPathData
 
     const urlObj = new URL(routerData.request.url)
-    let code = ''
 
     if (!urlObj.pathname.endsWith('/settings')) {
       const fallbackFile = isDesktop()
@@ -122,6 +123,12 @@ export const fileLoader: LoaderFunction = async (
       })
       code = normalizeLineEndings(code)
 
+      // If persistCode in localStorage is present, it'll persist that code
+      // through *anything*. INTENDED FOR TESTS.
+      if (window.electron.process.env.IS_PLAYWRIGHT) {
+        code = codeManager.localStoragePersistCode() || code
+      }
+
       // Update both the state and the editor's code.
       // We explicitly do not write to the file here since we are loading from
       // the file system and not the editor.
@@ -149,12 +156,6 @@ export const fileLoader: LoaderFunction = async (
       ? await getProjectInfo(projectPath)
       : null
 
-    console.log('maybeProjectInfo', {
-      maybeProjectInfo,
-      defaultProjectData,
-      projectPathData,
-    })
-
     const projectData: IndexLoaderData = {
       code,
       project: maybeProjectInfo ?? defaultProjectData,
@@ -171,7 +172,7 @@ export const fileLoader: LoaderFunction = async (
   }
 
   return {
-    code: '',
+    code,
     project: {
       name: BROWSER_PROJECT_NAME,
       path: '/' + BROWSER_PROJECT_NAME,

src/lib/selections.ts

@@ -18,10 +18,8 @@ import { getNormalisedCoordinates, isOverlap } from 'lib/utils'
 import { isCursorInSketchCommandRange } from 'lang/util'
 import { Program } from 'lang/wasm'
 import {
-  doesPipeHaveCallExp,
   getNodeFromPath,
   getNodePathFromSourceRange,
-  hasSketchPipeBeenExtruded,
   isSingleCursorInPipe,
 } from 'lang/queryAst'
 import { CommandArgument } from './commandTypes'
@@ -491,6 +489,9 @@ function resetAndSetEngineEntitySelectionCmds(
   ]
 }
 
+/**
+ * Is the selection a single cursor in a sketch pipe expression chain?
+ */
 export function isSketchPipe(selectionRanges: Selections) {
   if (!isSingleCursorInPipe(selectionRanges, kclManager.ast)) return false
   return isCursorInSketchCommandRange(
@@ -499,115 +500,6 @@ export function isSketchPipe(selectionRanges: Selections) {
   )
 }
 
-export function isSelectionLastLine(
-  selectionRanges: Selections,
-  code: string,
-  i = 0
-) {
-  return selectionRanges.graphSelections[i]?.codeRef?.range[1] === code.length
-}
-
-export function isRangeBetweenCharacters(selectionRanges: Selections) {
-  return (
-    selectionRanges.graphSelections.length === 1 &&
-    selectionRanges.graphSelections[0]?.codeRef?.range[0] === 0 &&
-    selectionRanges.graphSelections[0]?.codeRef?.range[1] === 0
-  )
-}
-
-export type CommonASTNode = {
-  selection: Selection
-  ast: Program
-}
-
-function buildCommonNodeFromSelection(selectionRanges: Selections, i: number) {
-  return {
-    selection: selectionRanges.graphSelections[i],
-    ast: kclManager.ast,
-  }
-}
-
-function nodeHasExtrude(node: CommonASTNode) {
-  return (
-    doesPipeHaveCallExp({
-      calleeName: 'extrude',
-      ...node,
-    }) ||
-    doesPipeHaveCallExp({
-      calleeName: 'revolve',
-      ...node,
-    }) ||
-    doesPipeHaveCallExp({
-      calleeName: 'loft',
-      ...node,
-    })
-  )
-}
-
-function nodeHasClose(node: CommonASTNode) {
-  return doesPipeHaveCallExp({
-    calleeName: 'close',
-    ...node,
-  })
-}
-function nodeHasCircle(node: CommonASTNode) {
-  return doesPipeHaveCallExp({
-    calleeName: 'circle',
-    ...node,
-  })
-}
-
-export function canSweepSelection(selection: Selections) {
-  const commonNodes = selection.graphSelections.map((_, i) =>
-    buildCommonNodeFromSelection(selection, i)
-  )
-  return (
-    !!isSketchPipe(selection) &&
-    commonNodes.every((n) => !hasSketchPipeBeenExtruded(n.selection, n.ast)) &&
-    (commonNodes.every((n) => nodeHasClose(n)) ||
-      commonNodes.every((n) => nodeHasCircle(n))) &&
-    commonNodes.every((n) => !nodeHasExtrude(n))
-  )
-}
-
-export function canRevolveSelection(selection: Selections) {
-  const commonNodes = selection.graphSelections.map((_, i) =>
-    buildCommonNodeFromSelection(selection, i)
-  )
-  return (
-    !!isSketchPipe(selection) &&
-    (commonNodes.every((n) => nodeHasClose(n)) ||
-      commonNodes.every((n) => nodeHasCircle(n)))
-  )
-}
-
-export function canLoftSelection(selection: Selections) {
-  const commonNodes = selection.graphSelections.map((_, i) =>
-    buildCommonNodeFromSelection(selection, i)
-  )
-  return (
-    !!isCursorInSketchCommandRange(
-      engineCommandManager.artifactGraph,
-      selection
-    ) &&
-    commonNodes.length > 1 &&
-    commonNodes.every((n) => !hasSketchPipeBeenExtruded(n.selection, n.ast)) &&
-    commonNodes.every((n) => nodeHasClose(n) || nodeHasCircle(n)) &&
-    commonNodes.every((n) => !nodeHasExtrude(n))
-  )
-}
-
-export function canShellSelection(selection: Selections) {
-  const commonNodes = selection.graphSelections.map((_, i) =>
-    buildCommonNodeFromSelection(selection, i)
-  )
-  return commonNodes.every(
-    (n) =>
-      n.selection.artifact?.type === 'cap' ||
-      n.selection.artifact?.type === 'wall'
-  )
-}
-
 // This accounts for non-geometry selections under "other"
 export type ResolvedSelectionType = Artifact['type'] | 'other'
 export type SelectionCountsByType = Map<ResolvedSelectionType, number>

src/lib/singletons.ts

@@ -23,6 +23,12 @@ engineCommandManager.camControlsCameraChange = sceneInfra.onCameraChange
 
 export const sceneEntitiesManager = new SceneEntities(engineCommandManager)
 
+declare global {
+  interface Window {
+    editorManager: EditorManager
+  }
+}
+
 // This needs to be after sceneInfra and engineCommandManager are is created.
 export const editorManager = new EditorManager()
 

src/lib/textToCad.ts

@@ -17,7 +17,7 @@ import { getNextFileName } from './desktopFS'
 import { reportRejection } from './trap'
 import { toSync } from './utils'
 
-export async function submitTextToCadPrompt(
+async function submitTextToCadPrompt(
   prompt: string,
   token?: string
 ): Promise<Models['TextToCad_type'] | Error> {
@@ -45,7 +45,7 @@ export async function submitTextToCadPrompt(
   return data
 }
 
-export async function getTextToCadResult(
+async function getTextToCadResult(
   id: string,
   token?: string
 ): Promise<Models['TextToCad_type'] | Error> {

src/lib/toolbar.ts

@@ -69,7 +69,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
             : modelingSend({ type: 'Enter sketch' }),
         icon: 'sketch',
         status: 'available',
-        disabled: (state) => !state.matches('idle'),
         title: ({ sketchPathId }) =>
           sketchPathId ? 'Edit Sketch' : 'Start Sketch',
         showTitle: true,
@@ -87,7 +86,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
             type: 'Find and select command',
             data: { name: 'Extrude', groupId: 'modeling' },
           }),
-        disabled: (state) => !state.can({ type: 'Extrude' }),
         icon: 'extrude',
         status: 'available',
         title: 'Extrude',
@@ -102,9 +100,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
             type: 'Find and select command',
             data: { name: 'Revolve', groupId: 'modeling' },
           }),
-        // TODO: disabled
-        // Who's state is this?
-        disabled: (state) => !state.can({ type: 'Revolve' }),
         icon: 'revolve',
         status: DEV ? 'available' : 'kcl-only',
         title: 'Revolve',
@@ -142,7 +137,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
             type: 'Find and select command',
             data: { name: 'Loft', groupId: 'modeling' },
           }),
-        disabled: (state) => !state.can({ type: 'Loft' }),
         icon: 'loft',
         status: 'available',
         title: 'Loft',
@@ -170,7 +164,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
           }),
         icon: 'fillet3d',
         status: DEV ? 'available' : 'kcl-only',
-        disabled: (state) => !state.can({ type: 'Fillet' }),
         title: 'Fillet',
         hotkey: 'F',
         description: 'Round the edges of a 3D solid.',
@@ -194,7 +187,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
             data: { name: 'Shell', groupId: 'modeling' },
           })
         },
-        disabled: (state) => !state.can({ type: 'Shell' }),
         icon: 'shell',
         status: 'available',
         title: 'Shell',

src/machines/modelingMachine.ts

@@ -287,6 +287,7 @@ export type ModelingMachineEvent =
   | { type: 'Fillet'; data?: ModelingCommandSchema['Fillet'] }
   | { type: 'Offset plane'; data: ModelingCommandSchema['Offset plane'] }
   | { type: 'Text-to-CAD'; data: ModelingCommandSchema['Text-to-CAD'] }
+  | { type: 'Prompt-to-edit'; data: ModelingCommandSchema['Prompt-to-edit'] }
   | {
       type: 'Add rectangle origin'
       data: [x: number, y: number]
@@ -420,11 +421,6 @@ export const modelingMachine = setup({
   },
   guards: {
     'Selection is on face': () => false,
-    'has valid sweep selection': () => false,
-    'has valid revolve selection': () => false,
-    'has valid loft selection': () => false,
-    'has valid shell selection': () => false,
-    'has valid edge treatment selection': () => false,
     'Has exportable geometry': () => false,
     'has valid selection for deletion': () => false,
     'is editing existing sketch': ({ context: { sketchDetails } }) =>
@@ -1752,6 +1748,11 @@ export const modelingMachine = setup({
         return {} as SketchDetailsUpdate
       }
     ),
+    'submit-prompt-edit': fromPromise(
+      async ({ input }: { input: ModelingCommandSchema['Prompt-to-edit'] }) => {
+        console.log('doing thing', input)
+      }
+    ),
   },
   // end services
 }).createMachine({
@@ -1776,33 +1777,28 @@ export const modelingMachine = setup({
 
         Extrude: {
           target: 'idle',
-          guard: 'has valid sweep selection',
           actions: ['AST extrude'],
           reenter: false,
         },
 
         Revolve: {
           target: 'idle',
-          guard: 'has valid revolve selection',
           actions: ['AST revolve'],
           reenter: false,
         },
 
         Loft: {
           target: 'Applying loft',
-          guard: 'has valid loft selection',
           reenter: true,
         },
 
         Shell: {
           target: 'Applying shell',
-          guard: 'has valid shell selection',
           reenter: true,
         },
 
         Fillet: {
           target: 'idle',
-          guard: 'has valid edge treatment selection',
           actions: ['AST fillet'],
           reenter: false,
         },
@@ -1838,6 +1834,8 @@ export const modelingMachine = setup({
           target: 'Applying offset plane',
           reenter: true,
         },
+
+        'Prompt-to-edit': 'Applying Prompt-to-edit',
       },
 
       entry: 'reset client scene mouse handlers',
@@ -2731,6 +2729,26 @@ export const modelingMachine = setup({
         onError: ['idle'],
       },
     },
+
+    'Applying Prompt-to-edit': {
+      invoke: {
+        src: 'submit-prompt-edit',
+        id: 'submit-prompt-edit',
+
+        input: ({ event }) => {
+          if (event.type !== 'Prompt-to-edit' || !event.data) {
+            return {
+              prompt: '',
+              selection: { graphSelections: [], otherSelections: [] },
+            }
+          }
+          return event.data
+        },
+
+        onDone: 'idle',
+        onError: 'idle',
+      },
+    },
   },
 
   initial: 'idle',

src/main.ts

@@ -61,8 +61,14 @@ if (process.defaultApp) {
 // Must be done before ready event.
 registerStartupListeners()
 
-const createWindow = (filePath?: string): BrowserWindow => {
+const createWindow = (filePath?: string, reuse?: boolean): BrowserWindow => {
-  const newWindow = new BrowserWindow({
+  let newWindow
+
+  if (reuse) {
+    newWindow = mainWindow
+  }
+  if (!newWindow) {
+    newWindow = new BrowserWindow({
       autoHideMenuBar: true,
       show: false,
       width: 1800,
@@ -78,6 +84,7 @@ const createWindow = (filePath?: string): BrowserWindow => {
       titleBarStyle: 'hiddenInset',
       backgroundColor: nativeTheme.shouldUseDarkColors ? '#1C1C1C' : '#FCFCFC',
     })
+  }
 
   // and load the index.html of the app.
   if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
@@ -110,7 +117,9 @@ const createWindow = (filePath?: string): BrowserWindow => {
   // Open the DevTools.
   // mainWindow.webContents.openDevTools()
 
-  newWindow.show()
+  if (!reuse) {
+    if (!process.env.HEADLESS) newWindow.show()
+  }
 
   return newWindow
 }
@@ -134,6 +143,25 @@ app.on('ready', (event, data) => {
 // There is just not enough code to warrant it and further abstracts everything
 // which is already quite abstracted
 
+// @ts-ignore
+// electron/electron.d.ts has done type = App, making declaration merging not
+// possible :(
+app.resizeWindow = async (width: number, height: number) => {
+  return mainWindow?.setSize(width, height)
+}
+
+// @ts-ignore can't declaration merge with App
+app.testProperty = {}
+
+ipcMain.handle('app.testProperty', (event, propertyName) => {
+  // @ts-ignore can't declaration merge with App
+  return app.testProperty[propertyName]
+})
+
+ipcMain.handle('app.resizeWindow', (event, data) => {
+  return mainWindow?.setSize(data[0], data[1])
+})
+
 ipcMain.handle('app.getPath', (event, data) => {
   return app.getPath(data)
 })

src/preload.ts

@@ -7,6 +7,8 @@ import packageJson from '../package.json'
 import { MachinesListing } from 'components/MachineManagerProvider'
 import chokidar from 'chokidar'
 
+const resizeWindow = (width: number, height: number) =>
+  ipcRenderer.invoke('app.resizeWindow', [width, height])
 const open = (args: any) => ipcRenderer.invoke('dialog.showOpenDialog', args)
 const save = (args: any) => ipcRenderer.invoke('dialog.showSaveDialog', args)
 const openExternal = (url: any) => ipcRenderer.invoke('shell.openExternal', url)
@@ -18,13 +20,19 @@ const loginWithDeviceFlow = (): Promise<string> =>
   ipcRenderer.invoke('loginWithDeviceFlow')
 const onUpdateDownloaded = (
   callback: (value: { version: string; releaseNotes: string }) => void
-) => ipcRenderer.on('update-downloaded', (_event, value) => callback(value))
+) =>
+  ipcRenderer.on('update-downloaded', (_event: any, value) => callback(value))
 const onUpdateDownloadStart = (
   callback: (value: { version: string }) => void
-) => ipcRenderer.on('update-download-start', (_event, value) => callback(value))
+) =>
+  ipcRenderer.on('update-download-start', (_event: any, value) =>
+    callback(value)
+  )
 const onUpdateError = (callback: (value: Error) => void) =>
-  ipcRenderer.on('update-error', (_event, value) => callback(value))
+  ipcRenderer.on('update-error', (_event: any, value) => callback(value))
 const appRestart = () => ipcRenderer.invoke('app.restart')
+const getAppTestProperty = (propertyName: string) =>
+  ipcRenderer.invoke('app.testProperty', propertyName)
 
 const isMac = os.platform() === 'darwin'
 const isWindows = os.platform() === 'win32'
@@ -157,14 +165,15 @@ contextBridge.exposeInMainWorld('electron', {
     isWindows,
     isLinux,
   },
+  // Use this to access dynamic properties from the node side.
+  // INTENDED ONLY TO BE USED FOR TESTS.
+  getAppTestProperty,
   process: {
-    // Setter/getter has to be created because
+    // These are read-only over the boundary.
-    // these are read-only over the boundary.
     env: Object.assign(
       {},
       exposeProcessEnvs([
         'NODE_ENV',
-        'TEST_SETTINGS_FILE_KEY',
         'VITE_KC_API_WS_MODELING_URL',
         'VITE_KC_API_BASE_URL',
         'VITE_KC_SITE_BASE_URL',
@@ -189,4 +198,5 @@ contextBridge.exposeInMainWorld('electron', {
   onUpdateError,
   appRestart,
   getArgvParsed,
+  resizeWindow,
 })

src/wasm-lib/derive-docs/src/lib.rs

@@ -805,7 +805,7 @@ fn generate_code_block_test(fn_name: &str, code_block: &str, index: usize) -> pr
 
     quote! {
         #[tokio::test(flavor = "multi_thread")]
-        async fn #test_name_mock() {
+        async fn #test_name_mock() -> miette::Result<()> {
             let program = crate::Program::parse_no_errs(#code_block).unwrap();
             let ctx = crate::ExecutorContext {
                 engine: std::sync::Arc::new(Box::new(crate::engine::conn_mock::EngineConnection::new().await.unwrap())),
@@ -815,15 +815,33 @@ fn generate_code_block_test(fn_name: &str, code_block: &str, index: usize) -> pr
                 context_type: crate::execution::ContextType::Mock,
             };
 
-            ctx.run(program.into(), &mut crate::ExecState::new()).await.unwrap();
+            if let Err(e) = ctx.run(program.into(), &mut crate::ExecState::new()).await {
+                    return Err(miette::Report::new(crate::errors::Report {
+                        error: e,
+                        filename: format!("{}{}", #fn_name, #index),
+                        kcl_source: #code_block.to_string(),
+                    }));
+            }
+            Ok(())
         }
 
         #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
-        async fn #test_name() {
+        async fn #test_name() -> miette::Result<()> {
             let code = #code_block;
             // Note, `crate` must be kcl_lib
-            let result = crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm, None).await.unwrap();
+            let result = match crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm, None).await {
+                Err(crate::errors::ExecError::Kcl(e)) => {
+                    return Err(miette::Report::new(crate::errors::Report {
+                        error: e,
+                        filename: format!("{}{}", #fn_name, #index),
+                        kcl_source: #code_block.to_string(),
+                    }));
+                }
+                Err(other_err)=> panic!("{}", other_err),
+                Ok(img) => img,
+            };
             twenty_twenty::assert_image(&format!("tests/outputs/{}.png", #output_test_name_str), &result, 0.99);
+            Ok(())
         }
     }
 }

src/wasm-lib/derive-docs/tests/args_with_lifetime.gen

@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread")]
-    async fn test_mock_example_someFn0() {
+    async fn test_mock_example_someFn0() -> miette::Result<()> {
         let program = crate::Program::parse_no_errs("someFn()").unwrap();
         let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
@@ -14,26 +14,43 @@ mod test_examples_someFn {
             settings: Default::default(),
             context_type: crate::execution::ContextType::Mock,
         };
-        ctx.run(program.into(), &mut crate::ExecState::new())
+        if let Err(e) = ctx.run(program.into(), &mut crate::ExecState::new()).await {
-            .await
+            return Err(miette::Report::new(crate::errors::Report {
-            .unwrap();
+                error: e,
+                filename: format!("{}{}", "someFn", 0usize),
+                kcl_source: "someFn()".to_string(),
+            }));
+        }
+
+        Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
-    async fn kcl_test_example_someFn0() {
+    async fn kcl_test_example_someFn0() -> miette::Result<()> {
         let code = "someFn()";
-        let result = crate::test_server::execute_and_snapshot(
+        let result = match crate::test_server::execute_and_snapshot(
             code,
             crate::settings::types::UnitLength::Mm,
             None,
         )
         .await
-        .unwrap();
+        {
+            Err(crate::errors::ExecError::Kcl(e)) => {
+                return Err(miette::Report::new(crate::errors::Report {
+                    error: e,
+                    filename: format!("{}{}", "someFn", 0usize),
+                    kcl_source: "someFn()".to_string(),
+                }));
+            }
+            Err(other_err) => panic!("{}", other_err),
+            Ok(img) => img,
+        };
         twenty_twenty::assert_image(
             &format!("tests/outputs/{}.png", "serial_test_example_someFn0"),
             &result,
             0.99,
         );
+        Ok(())
     }
 }