Update test snaps

Both the Lego brick base, the first bump, and the second bump are all ExtrudeGroups. They all share the same ID -- the ID of the original path that formed the base of the brick.

When running a pattern on the lego *bump* (not the lego *base*), the pattern target ID is the extrude group ID. But like I said, that's the same ID as the rest of the entire extrude! So whether you pattern the base or the brick, the result will be the same -- the entire extrude gets patterned.

Solution: send the ID of the original sketch group (either base or bump)

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

@@ -0,0 +1,59 @@
+# 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,17 +1,15 @@
-#!/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 [[ "$3" == ubuntu-latest* ]]; then
-            xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --shard=$1/$2 || true
-        elif [[ "$3" == windows-latest* ]]; then
-            yarn test:playwright:electron:windows -- --shard=$1/$2 || true
-        elif [[ "$3" == macos-14* ]]; then
-            yarn test:playwright:electron:macos  -- --shard=$1/$2 || true
+        if [[ "$1" == ubuntu-latest* ]]; then
+            xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
+        elif [[ "$1" == windows-latest* ]]; then
+            yarn test:playwright:electron:windows || true
+        elif [[ "$1" == macos-14* ]]; then
+            yarn test:playwright:electron:macos || true
         else
             echo "Do not run playwright. Unable to detect os runtime."
             exit 1
@@ -30,11 +28,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 [[ "$3" == ubuntu-latest* ]]; then
+            if [[ "$1" == ubuntu-latest* ]]; then
                 xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$3" == windows-latest* ]]; then
+            elif [[ "$1" == windows-latest* ]]; then
                 yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$3" == macos-14* ]]; then
+            elif [[ "$1" == macos-14* ]]; then
                 yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/workflows/cargo-test.yml

@@ -2,28 +2,8 @@ on:
   push:
     branches:
       - main
-    paths:
-      - 'src/wasm-lib/**.rs'
-      - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
-      - .github/workflows/cargo-test.yml
 
   pull_request:
-    paths:
-      - 'src/wasm-lib/**.rs'
-      - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
-      - .github/workflows/cargo-test.yml
   workflow_dispatch:
 permissions: read-all
 concurrency:
@@ -71,7 +51,7 @@ jobs:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           fail_ci_if_error: true

.github/workflows/e2e-tests.yml

@@ -33,13 +33,13 @@ jobs:
             rust:
               - 'src/wasm-lib/**'
 
-  electron:
+  browser:
     timeout-minutes: ${{ matrix.os == 'macos-14' && 60 || 50 }}
-    name: playwright:electron:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
+    name: playwright:browser:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
+        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
@@ -123,13 +123,13 @@ jobs:
       if: steps.download-wasm.outcome == 'failure'
       shell: bash
       run: yarn build:wasm
-    - name: build electron
+    - name: build web
+      run: yarn build:local
       shell: bash
-      run: yarn tron:package
     - name: Run ubuntu/chrome snapshots
       shell: bash
       run: |
-        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       env:
         CI: true
         NODE_ENV: development
@@ -186,12 +186,12 @@ jobs:
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
-    - name: Run playwright/electron flow (with retries)
+    - name: Run playwright/chrome flow (with retries)
       id: retry
       if: ${{ !cancelled() && (success() || failure()) }}
       shell: bash
       run: |
-        .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
+        .github/ci-cd-scripts/playwright-browser-chrome.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
       env:
         CI: true
         FAIL_ON_CONSOLE_ERRORS: true
@@ -199,6 +199,11 @@ 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:
@@ -216,3 +221,136 @@ 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,6 +388,23 @@ 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.

docs/kcl/index.md

@@ -30,6 +30,7 @@ layout: manual
 * [`assertLessThan`](kcl/assertLessThan)
 * [`assertLessThanOrEq`](kcl/assertLessThanOrEq)
 * [`atan`](kcl/atan)
+* [`atan2`](kcl/atan2)
 * [`bezierCurve`](kcl/bezierCurve)
 * [`ceil`](kcl/ceil)
 * [`chamfer`](kcl/chamfer)
@@ -102,6 +103,7 @@ layout: manual
 * [`startProfileAt`](kcl/startProfileAt)
 * [`startSketchAt`](kcl/startSketchAt)
 * [`startSketchOn`](kcl/startSketchOn)
+* [`sweep`](kcl/sweep)
 * [`tan`](kcl/tan)
 * [`tangentToEnd`](kcl/tangentToEnd)
 * [`tangentialArc`](kcl/tangentialArc)

docs/kcl/reduce.md

@@ -43,7 +43,7 @@ fn sum(arr) {
 
 /* The above is basically like this pseudo-code:
 fn sum(arr):
-    let sumSoFar = 0
+    sumSoFar = 0
     for i in arr:
         sumSoFar = add(sumSoFar, i)
     return sumSoFar */
@@ -96,14 +96,14 @@ fn decagon(radius) {
 
 /* The `decagon` above is basically like this pseudo-code:
 fn decagon(radius):
-    let stepAngle = (1/10) * tau()
-    let startOfDecagonSketch = startSketchAt([(cos(0)*radius), (sin(0) * radius)])
+    stepAngle = (1/10) * tau()
+    startOfDecagonSketch = startSketchAt([(cos(0)*radius), (sin(0) * radius)])
 
     // Here's the reduce part.
-    let partialDecagon = startOfDecagonSketch
+    partialDecagon = startOfDecagonSketch
     for i in [1..10]:
-        let x = cos(stepAngle * i) * radius
-        let y = sin(stepAngle * i) * radius
+        x = cos(stepAngle * i) * radius
+        y = sin(stepAngle * i) * radius
         partialDecagon = lineTo([x, y], partialDecagon)
     fullDecagon = partialDecagon // it's now full
     return fullDecagon */

docs/kcl/types/KclNone.md

@@ -12,5 +12,10 @@ KCL value for an optional parameter which was not given an argument. (remember,
 
 
 
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
 
 

docs/kcl/types/Sketch.md

@@ -21,6 +21,7 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
+| `originalId` |`string`| The original id of the sketch. This stays the same even if the sketch is sketched on face etc. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/SketchSet.md

@@ -30,6 +30,7 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
+| `originalId` |`string`| The original id of the sketch. This stays the same even if the sketch is sketched on face etc. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/SweepData.md

@@ -0,0 +1,23 @@
+---
+title: "SweepData"
+excerpt: "Data for a sweep."
+layout: manual
+---
+
+Data for a sweep.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `path` |[`Sketch`](/docs/kcl/types/Sketch)| The path to sweep along. | No |
+| `sectional` |`boolean`| If true, the sweep will be broken up into sub-sweeps (extrusions, revolves, sweeps) based on the trajectory path components. | No |
+| `tolerance` |`number`| Tolerance for the sweep operation. | No |
+
+

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

@@ -1,11 +1,22 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/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 ({ page }, testInfo) => {
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+    async ({ browserName }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      await page.setViewportSize({ width: 1200, height: 500 })
 
       // No space before the shortcut since it checks textContent.
       let text
@@ -23,14 +34,21 @@ 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 ({ page }, testInfo) => {
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+    async ({ browserName }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      await page.setViewportSize({ width: 1200, height: 500 })
 
       // Open the user sidebar menu.
       await page.getByTestId('user-sidebar-toggle').click()
@@ -41,6 +59,8 @@ 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,26 +1,29 @@
-import { test, expect, Page } from './zoo-test'
+import { test, expect, Page } from '@playwright/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,
-  homePage: HomePageFixture,
-  openPanes: string[]
-) {
+async function doBasicSketch(page: Page, openPanes: string[]) {
   const u = await getUtils(page)
-  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await page.setViewportSize({ width: 1200, height: 500 })
   const PUR = 400 / 37.5 //pixeltoUnitRatio
 
-  await homePage.goToModelingScene()
-  await u.waitForPageLoad()
-  await page.waitForTimeout()
+  await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
 
   // If we have the code pane open, we should see the code.
@@ -54,23 +57,26 @@ async function doBasicSketch(
   const startXPx = 600
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)`)
+    await expect(u.codeLocator).toContainText(
+      `sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
+    )
   }
   await page.waitForTimeout(500)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(500)
 
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
+    await expect(u.codeLocator)
+      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
   |> xLine(${commonPoints.num1}, %)`)
   }
   await page.waitForTimeout(500)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
+    await expect(u.codeLocator)
+      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
+      commonPoints.startAt
+    }, sketch001)
   |> xLine(${commonPoints.num1}, %)
   |> yLine(${commonPoints.num1 + 0.01}, %)`)
   } else {
@@ -79,8 +85,10 @@ async function doBasicSketch(
   await page.waitForTimeout(200)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
+    await expect(u.codeLocator)
+      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
+      commonPoints.startAt
+    }, sketch001)
   |> xLine(${commonPoints.num1}, %)
   |> yLine(${commonPoints.num1 + 0.01}, %)
   |> xLine(${commonPoints.num2 * -1}, %)`)
@@ -137,19 +145,23 @@ async function doBasicSketch(
 
   // Open the code pane.
   await u.openKclCodePanel()
-  await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
+  await expect(u.codeLocator)
+    .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
+    commonPoints.startAt
+  }, sketch001)
   |> xLine(${commonPoints.num1}, %, $seg01)
   |> yLine(${commonPoints.num1 + 0.01}, %)
   |> xLine(-segLen(seg01), %)`)
 }
 
 test.describe('Basic sketch', () => {
-  test.fixme('code pane open at start', async ({ page, homePage }) => {
-    await doBasicSketch(page, homePage, ['code'])
+  test('code pane open at start', { tag: ['@skipWin'] }, async ({ page }) => {
+    // Skip on windows it is being weird.
+    test.skip(process.platform === 'win32', 'Skip on windows')
+    await doBasicSketch(page, ['code'])
   })
 
-  test.fixme('code pane closed at start', async ({ page, homePage }) => {
+  test('code pane closed at start', async ({ page }) => {
     // Load the app with the code panes
     await page.addInitScript(async (persistModelingContext) => {
       localStorage.setItem(
@@ -157,6 +169,6 @@ test.describe('Basic sketch', () => {
         JSON.stringify({ openPanes: [] })
       )
     }, PERSIST_MODELING_CONTEXT)
-    await doBasicSketch(page, homePage, [])
+    await doBasicSketch(page, [])
   })
 })

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

@@ -1,21 +1,27 @@
-import { test, expect, Page } from './zoo-test'
-import { HomePageFixture } from './fixtures/homePageFixture'
-import { getUtils } from './test-utils'
+import { test, expect } from '@playwright/test'
+import { getUtils, setup, tearDown } 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: Page,
-    homePage: HomePageFixture,
+    page: any,
     plane: string,
     clickCoords: { x: number; y: number }
   ) => {
     const u = await getUtils(page)
     const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
     await u.openDebugPanel()
 
     const coord =
@@ -38,8 +44,7 @@ test.describe('Can create sketches on all planes and their back sides', () => {
       },
     }
 
-    const code = `sketch001 = startSketchOn('${plane}')
-    |> startProfileAt([0.9, -1.22], %)`
+    const code = `sketch001 = startSketchOn('${plane}')profile001 = startProfileAt([0.9, -1.22], sketch001)`
 
     await u.openDebugPanel()
 
@@ -77,39 +82,32 @@ test.describe('Can create sketches on all planes and their back sides', () => {
     await u.clearCommandLogs()
     await u.removeCurrentCode()
   }
-  test('XY', async ({ page, homePage }) => {
+  test('XY', async ({ page }) => {
     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, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, homePage, 'YZ', { x: 700, y: 250 }) // green plane
+  test('YZ', async ({ page }) => {
+    await sketchOnPlaneAndBackSideTest(page, 'YZ', { x: 700, y: 250 }) // green plane
   })
 
-  test('XZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, homePage, '-XZ', { x: 700, y: 80 }) // blue plane
+  test('XZ', async ({ page }) => {
+    await sketchOnPlaneAndBackSideTest(page, '-XZ', { x: 700, y: 80 }) // blue plane
   })
 
-  test('-XY', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, homePage, '-XY', {
-      x: 600,
-      y: 118,
-    }) // back of red plane
+  test('-XY', async ({ page }) => {
+    await sketchOnPlaneAndBackSideTest(page, '-XY', { x: 600, y: 118 }) // back of red plane
   })
 
-  test('-YZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, homePage, '-YZ', {
-      x: 700,
-      y: 219,
-    }) // back of green plan
+  test('-YZ', async ({ page }) => {
+    await sketchOnPlaneAndBackSideTest(page, '-YZ', { x: 700, y: 219 }) // back of green plane
   })
 
-  test('-XZ', async ({ page, homePage }) => {
-    await sketchOnPlaneAndBackSideTest(page, homePage, 'XZ', { x: 700, y: 427 }) // back of blue plane
+  test('-XZ', async ({ page }) => {
+    await sketchOnPlaneAndBackSideTest(page, 'XZ', { x: 700, y: 427 }) // back of blue plane
   })
 })

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

@@ -1,15 +1,28 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import { getUtils, executorInputPath } from './test-utils'
+import {
+  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)
 
@@ -18,18 +31,18 @@ test.describe('Code pane and errors', () => {
       localStorage.setItem(
         'persistCode',
         `// Extruded Triangle
-  sketch001 = startSketchOn('XZ')
-    |> startProfileAt([0, 0], %)
-    |> line([10, 0], %)
-    |> line([-5, 10], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude001 = extrude(5, sketch001)`
+sketch001 = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line([10, 0], %)
+  |> line([-5, 10], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(5, sketch001)`
       )
     })
 
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -49,11 +62,11 @@ test.describe('Code pane and errors', () => {
     await expect(codePaneButtonHolder).toContainText('notification')
   })
 
-  test.skip('Opening and closing the code pane will consistently show error diagnostics', async ({
+  test('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
@@ -61,8 +74,8 @@ test.describe('Code pane and errors', () => {
       localStorage.setItem('persistCode', code)
     }, bracket)
 
-    await page.setBodyDimensions({ width: 1200, height: 900 })
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1200, height: 900 })
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -78,9 +91,8 @@ test.describe('Code pane and errors', () => {
     await expect(codePaneButtonHolder).not.toContainText('notification')
 
     // Delete a character to break the KCL
-    await editor.openPane()
-    await editor.scrollToText('thickness, bracketLeg1Sketch)')
-    await page.getByText('extrude(thickness, bracketLeg1Sketch)').click()
+    await u.openKclCodePanel()
+    await page.getByText('thickness, bracketLeg1Sketch)').click()
     await page.keyboard.press('Backspace')
 
     // Ensure that a badge appears on the button
@@ -104,10 +116,7 @@ test.describe('Code pane and errors', () => {
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
     // Open the code pane
-    await editor.openPane()
-
-    // Go to our problematic code again (missing closing paren!)
-    await editor.scrollToText('extrude(thickness, bracketLeg1Sketch')
+    await u.openKclCodePanel()
 
     // Ensure that a badge appears on the button
     await expect(codePaneButtonHolder).toContainText('notification')
@@ -120,58 +129,59 @@ test.describe('Code pane and errors', () => {
     await expect(page.locator('.cm-tooltip').first()).toBeVisible()
   })
 
-  test.fixme(
-    'When error is not in view you can click the badge to scroll to it',
-    async ({ page, homePage, context }) => {
-      // Load the app with the working starter code
-      await context.addInitScript((code) => {
-        localStorage.setItem('persistCode', code)
-      }, TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW)
-
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-
-      await page.waitForTimeout(1000)
-
-      // Ensure badge is present
-      const codePaneButtonHolder = page.locator('#code-button-holder')
-      await expect(codePaneButtonHolder).toContainText('notification')
-
-      // Ensure we have no errors in the gutter, since error out of view.
-      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-      // Click the badge.
-      const badge = page.locator('#code-badge')
-      await expect(badge).toBeVisible()
-      await badge.click()
-
-      // Ensure we have an error diagnostic.
-      await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
-
-      // Hover over the error to see the error message
-      await page.hover('.cm-lint-marker-error')
-      await expect(
-        page
-          .getByText(
-            '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,
+  test('When error is not in view you can click the badge to scroll to it', async ({
     page,
-    homePage,
   }) => {
+    const u = await getUtils(page)
+
     // Load the app with the working starter code
-    await context.addInitScript((code) => {
+    await page.addInitScript((code) => {
       localStorage.setItem('persistCode', code)
     }, TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW)
 
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
+
+    await page.waitForTimeout(1000)
+
+    // Ensure badge is present
+    const codePaneButtonHolder = page.locator('#code-button-holder')
+    await expect(codePaneButtonHolder).toContainText('notification')
+
+    // Ensure we have no errors in the gutter, since error out of view.
+    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
+
+    // Click the badge.
+    const badge = page.locator('#code-badge')
+    await expect(badge).toBeVisible()
+    await badge.click()
+
+    // Ensure we have an error diagnostic.
+    await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
+
+    // Hover over the error to see the error message
+    await page.hover('.cm-lint-marker-error')
+    await expect(
+      page
+        .getByText(
+          '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 ({
+    page,
+  }) => {
+    const u = await getUtils(page)
+
+    // Load the app with the working starter code
+    await page.addInitScript((code) => {
+      localStorage.setItem('persistCode', code)
+    }, TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW)
+
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     await page.waitForTimeout(1000)
 
@@ -231,29 +241,32 @@ test.describe('Code pane and errors', () => {
 test(
   'Opening multiple panes persists when switching projects',
   { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ browserName }, testInfo) => {
     // Setup multiple projects.
-    await context.folderSetupFn(async (dir) => {
-      const routerTemplateDir = join(dir, 'router-template-slate')
-      const bracketDir = join(dir, 'bracket')
-      await Promise.all([
-        fsp.mkdir(routerTemplateDir, { recursive: true }),
-        fsp.mkdir(bracketDir, { recursive: true }),
-      ])
-      await Promise.all([
-        fsp.copyFile(
-          executorInputPath('router-template-slate.kcl'),
-          join(routerTemplateDir, 'main.kcl')
-        ),
-        fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
-        ),
-      ])
+    const { electronApp, page } = await setupElectron({
+      testInfo,
+      folderSetupFn: async (dir) => {
+        const routerTemplateDir = join(dir, 'router-template-slate')
+        const bracketDir = join(dir, 'bracket')
+        await Promise.all([
+          fsp.mkdir(routerTemplateDir, { recursive: true }),
+          fsp.mkdir(bracketDir, { recursive: true }),
+        ])
+        await Promise.all([
+          fsp.copyFile(
+            executorInputPath('router-template-slate.kcl'),
+            join(routerTemplateDir, 'main.kcl')
+          ),
+          fsp.copyFile(
+            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
+            join(bracketDir, 'main.kcl')
+          ),
+        ])
+      },
     })
 
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     await test.step('Opening the bracket project should load', async () => {
       await expect(page.getByText('bracket')).toBeVisible()
@@ -296,21 +309,30 @@ 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 ({ context, page }, testInfo) => {
+  async ({ browserName }, testInfo) => {
     const PROJECT_DIR_NAME = 'lee-was-here'
-    const { dir: projectsDir } = await context.folderSetupFn(async (dir) => {
-      const aProjectDir = join(dir, PROJECT_DIR_NAME)
-      await fsp.mkdir(aProjectDir, { recursive: true })
+    const {
+      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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     await test.step('Open the project', async () => {
       await expect(page.getByText(PROJECT_DIR_NAME)).toBeVisible()
@@ -329,5 +351,7 @@ test(
       )
       await u.editorTextMatches(content)
     })
+
+    await electronApp.close()
   }
 )

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

@@ -1,30 +1,37 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import { getUtils } from './test-utils'
+import { getUtils, setup, tearDown } 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(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> xLine(-20, %)
-  |> close(%)
-    `
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> xLine(-20, %)
+    |> close(%)
+      `
       )
     })
 
     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 u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -45,24 +52,24 @@ test.describe('Command bar tests', () => {
     )
   })
 
-  test('Fillet from command bar', async ({ page, homePage }) => {
+  test('Fillet from command bar', async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-5, -5], %)
-    |> line([0, 10], %)
-    |> line([10, 0], %)
-    |> line([0, -10], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude001 = extrude(-10, sketch001)`
+  |> startProfileAt([-5, -5], %)
+  |> line([0, 10], %)
+  |> line([10, 0], %)
+  |> line([0, -10], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(-10, sketch001)`
       )
     })
 
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1000, height: 500 })
+    await u.waitForAuthSkipAppStart()
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
@@ -80,16 +87,16 @@ test.describe('Command bar tests', () => {
     await page.keyboard.press('Enter') // submit
     await page.waitForTimeout(100)
     await expect(page.locator('.cm-activeLine')).toContainText(
-      `fillet({ radius: ${KCL_DEFAULT_LENGTH}, tags: [seg01] }, %)`
+      `fillet({ radius = ${KCL_DEFAULT_LENGTH}, tags = [seg01] }, %)`
     )
   })
 
   test('Command bar can change a setting, and switch back and forth between arguments', async ({
     page,
-    homePage,
   }) => {
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     const cmdSearchBar = page.getByPlaceholder('Search commands')
@@ -146,7 +153,7 @@ test.describe('Command bar tests', () => {
     // Check that the visibility changed
     await expect(paneSelector).not.toBeVisible()
 
-    commandOptionInput = page.locator('[id="option-input"]')
+    commandOptionInput = page.getByPlaceholder('off')
 
     // Test case for https://github.com/KittyCAD/modeling-app/issues/2882
     await commandBarButton.click()
@@ -167,10 +174,10 @@ test.describe('Command bar tests', () => {
 
   test('Command bar keybinding works from code editor and can change a setting', async ({
     page,
-    homePage,
   }) => {
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
@@ -214,25 +221,25 @@ test.describe('Command bar tests', () => {
     await expect(page.locator('body')).not.toHaveClass(`body-bg dark`)
   })
 
-  test('Can extrude from the command bar', async ({ page, homePage }) => {
+  test('Can extrude from the command bar', async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `distance = sqrt(20)
-    sketch001 = startSketchOn('XZ')
-    |> startProfileAt([-6.95, 10.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -20.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)
-        `
+      sketch001 = startSketchOn('XZ')
+      |> startProfileAt([-6.95, 10.98], %)
+      |> line([25.1, 0.41], %)
+      |> line([0.73, -20.93], %)
+      |> line([-23.44, 0.52], %)
+      |> close(%)
+          `
       )
     })
 
     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()
 
     // Make sure the stream is up
     await u.openDebugPanel()
@@ -286,19 +293,26 @@ test.describe('Command bar tests', () => {
     await continueButton.click()
     await submitButton.click()
 
+    // Check that the code was updated
     await u.waitForCmdReceive('extrude')
-
-    await expect(page.locator('.cm-content')).toContainText(
-      'extrude001 = extrude(distance001, sketch001)'
+    // Unfortunately this indentation seems to matter for the test
+    await expect(page.locator('.cm-content')).toHaveText(
+      `distance = sqrt(20)
+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,
-    homePage,
-  }) => {
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
+  test('Can switch between sketch tools via command bar', async ({ page }) => {
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
     const cmdBarButton = page.getByRole('button', { name: 'Commands' })

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

@@ -1,16 +1,23 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
+import { test, expect } from '@playwright/test'
+import { getUtils, setup, tearDown } 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, homePage }) => {
+  test('completes code in empty file', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -45,13 +52,12 @@ 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -95,13 +101,12 @@ 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -179,12 +184,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-ghostText')).not.toBeVisible()
   })
 
-  test('ArrowUp in code rejects the suggestion', async ({ page, homePage }) => {
+  test('ArrowUp in code rejects the suggestion', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -207,15 +212,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowDown in code rejects the suggestion', async ({
-    page,
-    homePage,
-  }) => {
+  test('ArrowDown in code rejects the suggestion', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -238,15 +240,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowLeft in code rejects the suggestion', async ({
-    page,
-    homePage,
-  }) => {
+  test('ArrowLeft in code rejects the suggestion', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -269,15 +268,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('ArrowRight in code rejects the suggestion', async ({
-    page,
-    homePage,
-  }) => {
+  test('ArrowRight in code rejects the suggestion', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -300,12 +296,12 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
-  test('Enter in code scoots it down', async ({ page, homePage }) => {
+  test('Enter in code scoots it down', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -330,15 +326,12 @@ test.describe('Copilot ghost text', () => {
     )
   })
 
-  test('Ctrl+shift+z in code rejects the suggestion', async ({
-    page,
-    homePage,
-  }) => {
+  test('Ctrl+shift+z in code rejects the suggestion', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -367,13 +360,12 @@ 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await page.waitForTimeout(800)
     await u.codeLocator.click()
@@ -428,107 +420,98 @@ 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,
-      homePage,
-    }) => {
-      const u = await getUtils(page)
-      // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+  test('delete in code rejects the suggestion', async ({ page }) => {
+    const u = await getUtils(page)
+    // const PUR = 400 / 37.5 //pixeltoUnitRatio
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
-      await u.codeLocator.click()
-      await expect(page.locator('.cm-content')).toHaveText(``)
+    await u.codeLocator.click()
+    await expect(page.locator('.cm-content')).toHaveText(``)
 
-      await expect(page.locator('.cm-ghostText')).not.toBeVisible()
-      await page.waitForTimeout(500)
-      await page.keyboard.press('Enter')
-      await page.keyboard.press('Enter')
-      await page.keyboard.press('Enter')
-      await expect(page.locator('.cm-ghostText').first()).toBeVisible()
-      await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
-      )
-      await expect(page.locator('.cm-ghostText').first()).toHaveText(
-        `fn cube = (pos, scale) => {`
-      )
+    await expect(page.locator('.cm-ghostText')).not.toBeVisible()
+    await page.waitForTimeout(500)
+    await page.keyboard.press('Enter')
+    await page.keyboard.press('Enter')
+    await page.keyboard.press('Enter')
+    await expect(page.locator('.cm-ghostText').first()).toBeVisible()
+    await expect(page.locator('.cm-content')).toHaveText(
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
+    )
+    await expect(page.locator('.cm-ghostText').first()).toHaveText(
+      `fn cube = (pos, scale) => {`
+    )
 
-      // Going elsewhere in the code should hide the ghost text.
-      await page.keyboard.press('Delete')
-      await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
+    // Going elsewhere in the code should hide the ghost text.
+    await page.keyboard.press('Delete')
+    await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
-      await expect(page.locator('.cm-content')).toHaveText(``)
-    })
+    await expect(page.locator('.cm-content')).toHaveText(``)
+  })
 
-    test('backspace in code rejects the suggestion', async ({
-      page,
-      homePage,
-    }) => {
-      const u = await getUtils(page)
-      // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+  test('backspace in code rejects the suggestion', async ({ page }) => {
+    const u = await getUtils(page)
+    // const PUR = 400 / 37.5 //pixeltoUnitRatio
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
-      await u.codeLocator.click()
-      await expect(page.locator('.cm-content')).toHaveText(``)
+    await u.codeLocator.click()
+    await expect(page.locator('.cm-content')).toHaveText(``)
 
-      await expect(page.locator('.cm-ghostText')).not.toBeVisible()
-      await page.waitForTimeout(500)
-      await page.keyboard.press('Enter')
-      await page.keyboard.press('Enter')
-      await page.keyboard.press('Enter')
-      await expect(page.locator('.cm-ghostText').first()).toBeVisible()
-      await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
-      )
-      await expect(page.locator('.cm-ghostText').first()).toHaveText(
-        `fn cube = (pos, scale) => {`
-      )
+    await expect(page.locator('.cm-ghostText')).not.toBeVisible()
+    await page.waitForTimeout(500)
+    await page.keyboard.press('Enter')
+    await page.keyboard.press('Enter')
+    await page.keyboard.press('Enter')
+    await expect(page.locator('.cm-ghostText').first()).toBeVisible()
+    await expect(page.locator('.cm-content')).toHaveText(
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
+    )
+    await expect(page.locator('.cm-ghostText').first()).toHaveText(
+      `fn cube = (pos, scale) => {`
+    )
 
-      // Going elsewhere in the code should hide the ghost text.
-      await page.keyboard.press('Backspace')
-      await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
+    // Going elsewhere in the code should hide the ghost text.
+    await page.keyboard.press('Backspace')
+    await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
-      await expect(page.locator('.cm-content')).toHaveText(``)
-    })
+    await expect(page.locator('.cm-content')).toHaveText(``)
+  })
 
-    test('focus outside code pane rejects the suggestion', async ({
-      page,
-      homePage,
-    }) => {
-      const u = await getUtils(page)
-      // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+  test('focus outside code pane rejects the suggestion', async ({ page }) => {
+    const u = await getUtils(page)
+    // const PUR = 400 / 37.5 //pixeltoUnitRatio
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
-      await u.codeLocator.click()
-      await expect(page.locator('.cm-content')).toHaveText(``)
+    await u.codeLocator.click()
+    await expect(page.locator('.cm-content')).toHaveText(``)
 
-      await expect(page.locator('.cm-ghostText')).not.toBeVisible()
-      await page.waitForTimeout(500)
-      await page.keyboard.press('Enter')
-      await expect(page.locator('.cm-ghostText').first()).toBeVisible()
-      await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
-      )
-      await expect(page.locator('.cm-ghostText').first()).toHaveText(
-        `fn cube = (pos, scale) => {`
-      )
+    await expect(page.locator('.cm-ghostText')).not.toBeVisible()
+    await page.waitForTimeout(500)
+    await page.keyboard.press('Enter')
+    await expect(page.locator('.cm-ghostText').first()).toBeVisible()
+    await expect(page.locator('.cm-content')).toHaveText(
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
+    )
+    await expect(page.locator('.cm-ghostText').first()).toHaveText(
+      `fn cube = (pos, scale) => {`
+    )
 
-      // Going outside the editor should hide the ghost text.
-      await page.mouse.move(0, 0)
-      await page
-        .getByRole('button', { name: 'Start Sketch' })
-        .waitFor({ state: 'visible' })
-      await page.getByRole('button', { name: 'Start Sketch' }).click()
-      await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
+    // Going outside the editor should hide the ghost text.
+    await page.mouse.move(0, 0)
+    await page
+      .getByRole('button', { name: 'Start Sketch' })
+      .waitFor({ state: 'visible' })
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+    await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
-      await expect(page.locator('.cm-content')).toHaveText(``)
-    })
+    await expect(page.locator('.cm-content')).toHaveText(``)
   })
 })

e2e/playwright/debug-pane.spec.ts

@@ -1,6 +1,14 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import { getUtils } from './test-utils'
+import { getUtils, setup, tearDown } 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
@@ -16,14 +24,13 @@ 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], %)
-  `
+  |> startProfileAt([0, 0], %)
+|> line([1, 1], %)
+`
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     const tree = page.getByTestId('debug-feature-tree')
     const segment = tree.locator('li', {
@@ -32,7 +39,7 @@ test.describe('Debug pane', () => {
     })
 
     await test.step('Test setup', async () => {
-      await homePage.goToModelingScene()
+      await u.waitForAuthSkipAppStart()
       await u.openKclCodePanel()
       await u.openDebugPanel()
       // Set the code in the code editor.

e2e/playwright/desktop-export.spec.ts

@@ -1,31 +1,39 @@
-import { test, expect } from './zoo-test'
-import path from 'path'
+import { test, expect } from '@playwright/test'
+import { join } 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 ({ page, context }, testInfo) => {
-    await context.folderSetupFn(async (dir) => {
-      const bracketDir = path.join(dir, 'bracket')
-      await Promise.all([fsp.mkdir(bracketDir, { recursive: true })])
-      await Promise.all([
-        fsp.copyFile(
-          executorInputPath('router-template-slate.kcl'),
-          path.join(bracketDir, 'other.kcl')
-        ),
-        fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          path.join(bracketDir, 'main.kcl')
-        ),
-      ])
+  async ({ browserName }, testInfo) => {
+    const { electronApp, page } = await setupElectron({
+      testInfo,
+      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')
+          ),
+          fsp.copyFile(
+            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
+            join(bracketDir, 'main.kcl')
+          ),
+        ])
+      },
     })
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     page.on('console', console.log)
 
@@ -85,16 +93,12 @@ 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(firstFileFullPath)
+                const outputGltf = await fsp.readFile(exportFileName)
                 return outputGltf.byteLength
               } catch (e) {
                 return 0
@@ -103,6 +107,9 @@ test(
             { timeout: 15_000 }
           )
           .toBeGreaterThan(300_000)
+
+        // clean up exported file
+        await fsp.rm(exportFileName)
       })
     })
 
@@ -163,16 +170,12 @@ 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(secondFileFullPath)
+                const outputGltf = await fsp.readFile(exportFileName)
                 return outputGltf.byteLength
               } catch (e) {
                 return 0
@@ -181,7 +184,13 @@ 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 './zoo-test'
+import { test, expect } from '@playwright/test'
 import fsp from 'fs/promises'
 import { uuidv4 } from 'lib/utils'
 import {
@@ -6,27 +6,37 @@ import {
   darkModePlaneColorXZ,
   executorInputPath,
   getUtils,
+  setup,
+  setupElectron,
+  tearDown,
 } from './test-utils'
-
 import { join } from 'path'
 
-test.describe('Editor tests', () => {
-  test('can comment out code with ctrl+/', async ({ page, homePage }) => {
-    const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+test.beforeEach(async ({ context, page }, testInfo) => {
+  await setup(context, page, testInfo)
+})
 
-    await homePage.goToModelingScene()
+test.afterEach(async ({ page }, testInfo) => {
+  await tearDown(page, testInfo)
+})
+
+test.describe('Editor tests', () => {
+  test('can comment out code with ctrl+/', async ({ page }) => {
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1000, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
 
     // 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(%)`)
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     await page.keyboard.down('ControlOrMeta')
     await page.keyboard.press('/')
@@ -34,11 +44,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  // |> close(%)`)
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    // |> close(%)`)
 
     // uncomment the code
     await page.keyboard.down('ControlOrMeta')
@@ -47,63 +57,106 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
   })
 
   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 page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // 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(%)`)
+    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')
+  |> 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(2)
+    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('ArrowUp')
+    await page.keyboard.press('ArrowUp')
+    await page.keyboard.press('ArrowUp')
+    await page.keyboard.press('ArrowUp')
+    await page.keyboard.press('Home')
+    await page.keyboard.type('    ')
+    await page.keyboard.press('Enter')
+    await page.keyboard.type('    ')
+
+    // Ensure we don't execute the second time.
+    await u.openDebugPanel()
+    // Make sure we didn't clear the scene.
+    await expect(
+      page.locator('[data-message-type="execution-done"]')
+    ).toHaveCount(3)
+    await expect(
+      page.locator('[data-receive-command-type="scene_clear_all"]')
+    ).toHaveCount(2)
   })
 
   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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
     await u.codeLocator.click()
     await page.keyboard.type(`sketch_001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`)
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -127,11 +180,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch_001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -143,27 +196,29 @@ test.describe('Editor tests', () => {
     ).toBeVisible()
   })
 
-  test('fold gutters work', async ({ page, homePage }) => {
+  test('fold gutters work', async ({ page }) => {
+    const u = await getUtils(page)
+
     const fullCode = `sketch001 = startSketchOn('XY')
-   |> startProfileAt([-10, -10], %)
-   |> line([20, 0], %)
-   |> line([0, 20], %)
-   |> line([-20, 0], %)
-   |> close(%)`
+     |> startProfileAt([-10, -10], %)
+     |> line([20, 0], %)
+     |> line([0, 20], %)
+     |> line([-20, 0], %)
+     |> close(%)`
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-   |> startProfileAt([-10, -10], %)
-   |> line([20, 0], %)
-   |> line([0, 20], %)
-   |> line([-20, 0], %)
-   |> close(%)`
+     |> startProfileAt([-10, -10], %)
+     |> line([20, 0], %)
+     |> line([0, 20], %)
+     |> line([-20, 0], %)
+     |> close(%)`
       )
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // TODO: Jess needs to fix this but you have to mod the code to get them to show
     // up, its an annoying codemirror thing.
@@ -214,25 +269,22 @@ test.describe('Editor tests', () => {
     await expect(foldGutterFoldLine).not.toBeVisible()
   })
 
-  test('hover over functions shows function description', async ({
-    page,
-    homePage,
-  }) => {
+  test('hover over functions shows function description', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`
       )
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -261,24 +313,23 @@ 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 () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`
       )
       localStorage.setItem('disableAxis', 'true')
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -295,33 +346,32 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
   })
 
   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 () => {
       localStorage.setItem(
         'persistCode',
         `sketch_001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`
       )
       localStorage.setItem('disableAxis', 'true')
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -348,11 +398,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch_001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -364,14 +414,11 @@ test.describe('Editor tests', () => {
     ).toBeVisible()
   })
 
-  test('if you write kcl with lint errors you get lints', async ({
-    page,
-    homePage,
-  }) => {
+  test('if you write kcl with lint errors you get lints', async ({ page }) => {
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-info')).not.toBeVisible()
@@ -407,26 +454,23 @@ 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,
-    homePage,
-  }) => {
+  test('if you fixup kcl errors you clear lints', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-    |> startProfileAt([3.29, 7.86], %)
-    |> line([2.48, 2.44], %)
-    |> line([2.66, 1.17], %)
-    |> close(%)
-    `
+  |> startProfileAt([3.29, 7.86], %)
+  |> line([2.48, 2.44], %)
+  |> line([2.66, 1.17], %)
+  |> close(%)
+  `
       )
     })
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -448,23 +492,20 @@ test.describe('Editor tests', () => {
     ).not.toBeVisible()
   })
 
-  test('if you write invalid kcl you get inlined errors', async ({
-    page,
-    homePage,
-  }) => {
+  test('if you write invalid kcl you get inlined errors', async ({ page }) => {
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // 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)
-    $ error
-    const topAng = 30
-    const bottomAng = 25
-   */
+      $ error
+      topAng = 30
+      bottomAng = 25
+     */
     await u.codeLocator.click()
     await page.keyboard.type('$ error')
 
@@ -478,12 +519,14 @@ test.describe('Editor tests', () => {
     await page.keyboard.type('bottomAng = 25')
     await page.keyboard.press('Enter')
 
-    // error in guter
+    // error in gutter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(page.getByText('Unexpected token: $').first()).toBeVisible()
+    await expect(
+      page.getByText('Tag names must not be empty').first()
+    ).toBeVisible()
 
     // select the line that's causing the error and delete it
     await page.getByText('$ error').click()
@@ -522,108 +565,106 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
   })
 
-  test.fixme(
-    'error with 2 source ranges gets 2 diagnostics',
-    async ({ page, homePage }) => {
-      const u = await getUtils(page)
-      await page.addInitScript(async () => {
-        localStorage.setItem(
-          'persistCode',
-          `length = .750
-    width = 0.500
-    height = 0.500
-    dia = 4
-  
-    fn squareHole = (l, w) => {
-  squareHoleSketch = startSketchOn('XY')
-  |> startProfileAt([-width / 2, -length / 2], %)
-  |> lineTo([width / 2, -length / 2], %)
-  |> lineTo([width / 2, length / 2], %)
-  |> lineTo([-width / 2, length / 2], %)
-  |> close(%)
-  return squareHoleSketch
-    }
-    `
-        )
-      })
-      await page.setBodyDimensions({ width: 1000, height: 500 })
-
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
-      await page.waitForTimeout(1000)
-
-      await u.openDebugPanel()
-      await u.expectCmdLog('[data-message-type="execution-done"]')
-      await u.closeDebugPanel()
-
-      // check no error to begin with
-      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-      // Click on the bottom of the code editor to add a new line
-      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('ArrowDown')
-      await page.keyboard.press('ArrowDown')
-      await page.keyboard.press('ArrowDown')
-      await page.keyboard.press('ArrowDown')
-      await page.keyboard.press('Enter')
-      await page.keyboard.type(`extrusion = startSketchOn('XY')
-  |> circle({ center: [0, 0], radius: dia/2 }, %)
-    |> hole(squareHole(length, width, height), %)
-    |> extrude(height, %)`)
-
-      // error in gutter
-      await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
-      await page.hover('.cm-lint-marker-error:first-child')
-      await expect(
-        page.getByText('Expected 2 arguments, got 3').first()
-      ).toBeVisible()
-
-      // 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,
+  // TODO currently multiple source ranges are not supported
+  test.skip('error with 2 source ranges gets 2 diagnostics', async ({
     page,
-    homePage,
   }) => {
-    await context.addInitScript(async () => {
+    const u = await getUtils(page)
+    await page.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `length = .750
+  width = 0.500
+  height = 0.500
+  dia = 4
+
+  fn squareHole = (l, w) => {
+    squareHoleSketch = startSketchOn('XY')
+    |> startProfileAt([-width / 2, -length / 2], %)
+    |> lineTo([width / 2, -length / 2], %)
+    |> lineTo([width / 2, length / 2], %)
+    |> lineTo([-width / 2, length / 2], %)
+    |> close(%)
+    return squareHoleSketch
+  }
+  `
+      )
+    })
+    await page.setViewportSize({ width: 1000, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    // check no error to begin with
+    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
+
+    // Click on the bottom of the code editor to add a new line
+    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('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('Enter')
+    await page.keyboard.type(`extrusion = startSketchOn('XY')
+    |> circle({ center = [0, 0], radius = dia/2 }, %)
+  |> hole(squareHole(length, width, height), %)
+  |> extrude(height, %)`)
+
+    // error in gutter
+    await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
+    await page.hover('.cm-lint-marker-error:first-child')
+    await expect(
+      page.getByText('Expected 2 arguments, got 3').first()
+    ).toBeVisible()
+
+    // 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 ({
+    page,
+  }) => {
+    const u = await getUtils(page)
+    await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `box = startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
-    |> line([0, 10], %)
-    |> line([10, 0], %)
-    |> line([0, -10], %, $revolveAxis)
-    |> close(%)
-    |> extrude(10, %)
-  
-    sketch001 = startSketchOn(box, revolveAxis)
-    |> startProfileAt([5, 10], %)
-    |> line([0, -10], %)
-    |> line([2, 0], %)
-    |> line([0, -10], %)
-    |> close(%)
-    |> revolve({
-    axis: revolveAxis,
-    angle: 90
-    }, %)
-    `
+  |> startProfileAt([0, 0], %)
+  |> line([0, 10], %)
+  |> line([10, 0], %)
+  |> line([0, -10], %, $revolveAxis)
+  |> close(%)
+  |> extrude(10, %)
+
+  sketch001 = startSketchOn(box, revolveAxis)
+  |> startProfileAt([5, 10], %)
+  |> line([0, -10], %)
+  |> line([2, 0], %)
+  |> line([0, -10], %)
+  |> close(%)
+  |> revolve({
+  axis = revolveAxis,
+  angle = 90
+  }, %)
+      `
       )
     })
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await page.goto('/')
+    await u.waitForPageLoad()
 
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
@@ -634,15 +675,12 @@ test.describe('Editor tests', () => {
     await expect(page.getByText(searchText)).toBeVisible()
   })
   test.describe('Autocomplete works', () => {
-    test('with enter/click to accept the completion', async ({
-      page,
-      homePage,
-    }) => {
+    test('with enter/click to accept the completion', async ({ page }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+      await u.waitForAuthSkipAppStart()
 
       // tests clicking on an option, selection the first option
       // and arrowing down to an option
@@ -704,19 +742,19 @@ test.describe('Editor tests', () => {
 
       await expect(page.locator('.cm-content'))
         .toHaveText(`sketch001 = startSketchOn('XZ')
-        |> startProfileAt([3.14, 12], %)
-        |> xLine(5, %) // lin`)
+    |> startProfileAt([3.14, 12], %)
+    |> xLine(5, %) // lin`)
 
       // expect there to be no KCL errors
       await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
     })
 
-    test('with tab to accept the completion', async ({ page, homePage }) => {
+    test('with tab to accept the completion', async ({ page }) => {
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+      await u.waitForAuthSkipAppStart()
 
       // this test might be brittle as we add and remove functions
       // but should also be easy to update.
@@ -778,30 +816,26 @@ test.describe('Editor tests', () => {
 
       await expect(page.locator('.cm-content'))
         .toHaveText(`sketch001 = startSketchOn('XZ')
-        |> startProfileAt([3.14, 12], %)
-        |> xLine(5, %) // lin`)
+    |> startProfileAt([3.14, 12], %)
+    |> xLine(5, %) // lin`)
     })
   })
-  test('Can undo a click and point extrude with ctrl+z', async ({
-    page,
-    context,
-    homePage,
-  }) => {
+  test('Can undo a click and point extrude with ctrl+z', async ({ page }) => {
     const u = await getUtils(page)
-    await context.addInitScript(async () => {
+    await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.61, -14.01], %)
-  |> line([12.73, -0.09], %)
-  |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)`
+    |> startProfileAt([4.61, -14.01], %)
+    |> line([12.73, -0.09], %)
+    |> tangentialArcTo([24.95, -5.38], %)
+    |> close(%)`
       )
     })
 
-    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' })
     ).not.toBeDisabled()
@@ -854,32 +888,29 @@ test.describe('Editor tests', () => {
     await page.waitForTimeout(100)
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.61, -14.01], %)
-  |> line([12.73, -0.09], %)
-  |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)`)
+    |> startProfileAt([4.61, -14.01], %)
+    |> line([12.73, -0.09], %)
+    |> tangentialArcTo([24.95, -5.38], %)
+    |> close(%)`)
   })
 
-  test('Can undo a sketch modification with ctrl+z', async ({
-    page,
-    homePage,
-  }) => {
+  test('Can undo a sketch modification with ctrl+z', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.61, -10.01], %)
-  |> line([12.73, -0.09], %)
-  |> tangentialArcTo([24.95, -0.38], %)
-  |> close(%)
-  |> extrude(5, %)`
+    |> startProfileAt([4.61, -10.01], %)
+    |> line([12.73, -0.09], %)
+    |> tangentialArcTo([24.95, -0.38], %)
+    |> close(%)
+    |> extrude(5, %)`
       )
     })
 
-    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' })
     ).not.toBeDisabled()
@@ -906,7 +937,7 @@ test.describe('Editor tests', () => {
     })
     await page.waitForTimeout(100)
 
-    const startPX = [1200 / 2, 500 / 2]
+    const startPX = [665, 397]
 
     const dragPX = 40
 
@@ -920,9 +951,9 @@ test.describe('Editor tests', () => {
 
     await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
 
-    // drag startProfileAt handle
+    // drag startProfieAt handle
     await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: startPX[0] + 68, y: startPX[1] + 147 },
+      sourcePosition: { x: startPX[0], y: startPX[1] },
       targetPosition: { x: startPX[0] + dragPX, y: startPX[1] + dragPX },
     })
     await page.waitForTimeout(100)
@@ -960,12 +991,12 @@ test.describe('Editor tests', () => {
     // expect the code to have changed
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-    |> startProfileAt([2.71, -2.71], %)
-    |> line([15.4, -2.78], %)
-    |> tangentialArcTo([27.6, -3.05], %)
-    |> close(%)
-    |> extrude(5, %)
-  `)
+  |> startProfileAt([7.12, -12.68], %)
+  |> line([15.39, -2.78], %)
+  |> tangentialArcTo([27.6, -3.05], %)
+  |> close(%)
+  |> extrude(5, %)
+`)
 
     // Hit undo
     await page.keyboard.down('Control')
@@ -974,11 +1005,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-    |> startProfileAt([2.71, -2.71], %)
-    |> line([15.4, -2.78], %)
-    |> tangentialArcTo([24.95, -0.38], %)
-    |> close(%)
-    |> extrude(5, %)`)
+  |> startProfileAt([7.12, -12.68], %)
+  |> line([15.39, -2.78], %)
+  |> tangentialArcTo([24.95, -0.38], %)
+  |> close(%)
+  |> extrude(5, %)`)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -987,12 +1018,12 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-    |> startProfileAt([2.71, -2.71], %)
-    |> line([12.73, -0.09], %)
-    |> tangentialArcTo([24.95, -0.38], %)
-    |> close(%)
-    |> extrude(5, %)
-  `)
+  |> startProfileAt([7.12, -12.68], %)
+  |> line([12.73, -0.09], %)
+  |> tangentialArcTo([24.95, -0.38], %)
+  |> close(%)
+  |> extrude(5, %)
+`)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -1002,29 +1033,31 @@ test.describe('Editor tests', () => {
     await page.waitForTimeout(100)
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.61, -10.01], %)
-  |> line([12.73, -0.09], %)
-  |> tangentialArcTo([24.95, -0.38], %)
-  |> close(%)
-  |> extrude(5, %)`)
+    |> startProfileAt([4.61, -10.01], %)
+    |> line([12.73, -0.09], %)
+    |> tangentialArcTo([24.95, -0.38], %)
+    |> close(%)
+    |> extrude(5, %)`)
   })
 
   test.fixme(
     `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
-    async ({ page, context }, testInfo) => {
-      await context.folderSetupFn(async (dir) => {
-        const bracketDir = join(dir, 'cube')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('cube.obj'),
-          join(bracketDir, 'cube.obj')
-        )
-        await fsp.writeFile(join(bracketDir, 'main.kcl'), '')
+    async ({ browserName }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async (dir) => {
+          const bracketDir = join(dir, 'cube')
+          await fsp.mkdir(bracketDir, { recursive: true })
+          await fsp.copyFile(
+            executorInputPath('cube.obj'),
+            join(bracketDir, 'cube.obj')
+          )
+          await fsp.writeFile(join(bracketDir, 'main.kcl'), '')
+        },
       })
-
       const viewportSize = { width: 1200, height: 500 }
-      await page.setBodyDimensions(viewportSize)
+      await page.setViewportSize(viewportSize)
 
       // Locators and constants
       const u = await getUtils(page)
@@ -1082,6 +1115,8 @@ test.describe('Editor tests', () => {
           })
           .toBeGreaterThan(15)
       })
+
+      await electronApp.close()
     }
   )
 })

e2e/playwright/fixtures/editorFixture.ts

@@ -29,7 +29,7 @@ export class EditorFixture {
   reConstruct = (page: Page) => {
     this.page = page
 
-    this.codeContent = page.locator('.cm-content[data-language="kcl"]')
+    this.codeContent = page.locator('.cm-content')
     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.poll(() => this.codeContent.textContent())
+        const expectStart = expect(this.codeContent)
         if (not) {
-          const result = await expectStart.not.toContain(code)
+          const result = await expectStart.not.toContainText(code, { timeout })
           await resetPane()
           return result
         }
-        const result = await expectStart.toContain(code)
+        const result = await expectStart.toContainText(code, { timeout })
         await resetPane()
         return result
       }
@@ -147,20 +147,4 @@ export class EditorFixture {
   openPane() {
     return openPane(this.page, this.paneButtonTestId)
   }
-  scrollToText(text: string) {
-    return this.page.evaluate((scrollToText: string) => {
-      // editorManager is available on the window object.
-      // @ts-ignore
-      let index = editorManager._editorView.docView.view.state.doc
-        .toString()
-        .indexOf(scrollToText)
-      // @ts-ignore
-      editorManager._editorView.dispatch({
-        selection: {
-          anchor: index,
-        },
-        scrollIntoView: true,
-      })
-    }, text)
-  }
 }

e2e/playwright/fixtures/fixtureSetup.ts

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

@@ -11,6 +11,7 @@ import {
 
 type mouseParams = {
   pixelDiff?: number
+  shouldDbClick?: boolean
 }
 type mouseDragToParams = mouseParams & {
   fromPoint: { x: number; y: number }
@@ -53,9 +54,8 @@ export class SceneFixture {
 
   expectState = async (expected: SceneSerialised) => {
     return expect
-      .poll(async () => await this._serialiseScene(), {
-        intervals: [1_000, 2_000, 10_000],
-        timeout: 60000,
+      .poll(() => this._serialiseScene(), {
+        message: `Expected scene state to match`,
       })
       .toEqual(expected)
   }
@@ -76,11 +76,16 @@ export class SceneFixture {
         if (clickParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
-            () => this.page.mouse.click(x, y),
+            () =>
+              clickParams?.shouldDbClick
+                ? this.page.mouse.dblclick(x, y)
+                : this.page.mouse.click(x, y),
             clickParams.pixelDiff
           )
         }
-        return this.page.mouse.click(x, y)
+        return clickParams?.shouldDbClick
+          ? this.page.mouse.dblclick(x, y)
+          : this.page.mouse.click(x, y)
       },
       (moveParams?: mouseParams) => {
         if (moveParams?.pixelDiff) {
@@ -188,10 +193,7 @@ export class SceneFixture {
         type: 'default_camera_get_settings',
       },
     })
-    await this.page
-      .locator(`[data-receive-command-type="default_camera_get_settings"]`)
-      .first()
-      .waitFor()
+    await this.waitForExecutionDone()
     const position = await Promise.all([
       this.page.getByTestId('cam-x-position').inputValue().then(Number),
       this.page.getByTestId('cam-y-position').inputValue().then(Number),
@@ -214,27 +216,11 @@ export class SceneFixture {
   }
 
   expectPixelColor = async (
-    colour: [number, number, number],
+    colour: [number, number, number] | [number, number, number][],
     coords: { x: number; y: number },
     diff: number
   ) => {
-    let finalValue = colour
-    await expect
-      .poll(async () => {
-        const pixel = (await getPixelRGBs(this.page)(coords, 1))[0]
-        if (!pixel) return null
-        finalValue = pixel
-        return pixel.every(
-          (channel, index) => Math.abs(channel - colour[index]) < diff
-        )
-      })
-      .toBeTruthy()
-      .catch((cause) => {
-        throw new Error(
-          `ExpectPixelColor: expecting ${colour} got ${finalValue}`,
-          { cause }
-        )
-      })
+    await expectPixelColor(this.page, colour, coords, diff)
   }
 
   get gizmo() {
@@ -242,7 +228,6 @@ 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,
@@ -251,3 +236,42 @@ export class SceneFixture {
     await buttonToTest.click()
   }
 }
+
+function isColourArray(
+  colour: [number, number, number] | [number, number, number][]
+): colour is [number, number, number][] {
+  return Array.isArray(colour[0])
+}
+
+export async function expectPixelColor(
+  page: Page,
+  colour: [number, number, number] | [number, number, number][],
+  coords: { x: number; y: number },
+  diff: number
+) {
+  let finalValue = colour
+  await expect
+    .poll(
+      async () => {
+        const pixel = (await getPixelRGBs(page)(coords, 1))[0]
+        if (!pixel) return null
+        finalValue = pixel
+        if (!isColourArray(colour)) {
+          return pixel.every(
+            (channel, index) => Math.abs(channel - colour[index]) < diff
+          )
+        }
+        return colour.some((c) =>
+          c.every((channel, index) => Math.abs(pixel[index] - channel) < diff)
+        )
+      },
+      { timeout: 10_000 }
+    )
+    .toBeTruthy()
+    .catch((cause) => {
+      throw new Error(
+        `ExpectPixelColor: expecting ${colour} got ${finalValue}`,
+        { cause }
+      )
+    })
+}

e2e/playwright/fixtures/toolbarFixture.ts

@@ -1,5 +1,5 @@
 import type { Page, Locator } from '@playwright/test'
-import { expect } from '../zoo-test'
+import { expect } from './fixtureSetup'
 import { doAndWaitForImageDiff } from '../test-utils'
 
 export class ToolbarFixture {
@@ -11,7 +11,10 @@ export class ToolbarFixture {
   offsetPlaneButton!: Locator
   startSketchBtn!: Locator
   lineBtn!: Locator
+  tangentialArcBtn!: Locator
+  circleBtn!: Locator
   rectangleBtn!: Locator
+  lengthConstraintBtn!: Locator
   exitSketchBtn!: Locator
   editSketchBtn!: Locator
   fileTreeBtn!: Locator
@@ -33,7 +36,10 @@ export class ToolbarFixture {
     this.offsetPlaneButton = page.getByTestId('plane-offset')
     this.startSketchBtn = page.getByTestId('sketch')
     this.lineBtn = page.getByTestId('line')
+    this.tangentialArcBtn = page.getByTestId('tangential-arc')
+    this.circleBtn = page.getByTestId('circle-center')
     this.rectangleBtn = page.getByTestId('corner-rectangle')
+    this.lengthConstraintBtn = page.getByTestId('constraint-length')
     this.exitSketchBtn = page.getByTestId('sketch-exit')
     this.editSketchBtn = page.getByText('Edit Sketch')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
@@ -91,4 +97,13 @@ export class ToolbarFixture {
       await expect(this.exeIndicator).toBeVisible({ timeout: 15_000 })
     }
   }
+  selectCenterRectangle = async () => {
+    await this.page
+      .getByRole('button', { name: 'caret down Corner rectangle:' })
+      .click()
+    await expect(
+      this.page.getByTestId('dropdown-center-rectangle')
+    ).toBeVisible()
+    await this.page.getByTestId('dropdown-center-rectangle').click()
+  }
 }

e2e/playwright/machines.spec.ts

@@ -1,22 +1,29 @@
-import { test, expect } from './zoo-test'
-import { executorInputPath } from './test-utils'
+import { test, expect } from '@playwright/test'
+import { setupElectron, tearDown, 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 ({ context, page }, testInfo) => {
-    await context.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')
-      )
+  async ({ browserName }, testInfo) => {
+    const { electronApp, page } = await setupElectron({
+      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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     await expect(page.getByText('bracket')).toBeVisible()
 
@@ -40,23 +47,28 @@ 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 ({ context, page }, testInfo) => {
-    await context.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')
-      )
+  async ({ browserName }, testInfo) => {
+    const { electronApp, page } = await setupElectron({
+      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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     const notFoundText = 'Machine API server was not discovered'
 
@@ -79,5 +91,7 @@ test(
 
     await networkMachineToggle.hover()
     await expect(page.getByText(notFoundText).nth(1)).toBeVisible()
+
+    await electronApp.close()
   }
 )

e2e/playwright/null.spec.ts

@@ -1,12 +0,0 @@
-// 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,63 +1,86 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 import { join } from 'path'
 import fsp from 'fs/promises'
-import { getUtils, executorInputPath, createProject } from './test-utils'
+import {
+  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'
 
-// Because onboarding relies on an app setting we need to set it as incompletel
-// for all these tests.
+test.beforeEach(async ({ context, page }, testInfo) => {
+  if (testInfo.tags.includes('@electron')) {
+    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',
-    {
-      appSettings: {
-        app: {
-          onboardingStatus: 'incomplete',
-        },
+  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)
       },
-      cleanProjectDir: true,
-    },
-    async ({ context, page, homePage }) => {
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
+      { settingsKey: TEST_SETTINGS_KEY }
+    )
 
-      // Test that the onboarding pane loaded
-      await expect(
-        page.getByText('Welcome to Modeling App! This')
-      ).toBeVisible()
+    await page.setViewportSize({ width: 1200, height: 1000 })
 
-      // *and* that the code is shown in the editor
-      await expect(page.locator('.cm-content')).toContainText(
-        '// Shelf Bracket'
-      )
-    }
-  )
+    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',
-    {
-      tag: '@electron',
-      appSettings: {
-        app: {
-          onboardingStatus: 'incomplete',
+    { tag: '@electron' },
+    async ({ browserName: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        appSettings: {
+          app: {
+            onboardingStatus: 'incomplete',
+          },
         },
-      },
-      cleanProjectDir: true,
-    },
-    async ({ page, homePage }, testInfo) => {
+        cleanProjectDir: true,
+      })
+
       const u = await getUtils(page)
 
-      const viewportSize = { width: 1200, height: 500 }
-      await page.setBodyDimensions(viewportSize)
+      const viewportSize = { width: 1200, height: 1000 }
+      await page.setViewportSize(viewportSize)
 
       await test.step(`Create a project and open to the onboarding`, async () => {
         await createProject({ name: 'project-link', page })
@@ -76,362 +99,346 @@ test.describe('Onboarding tests', () => {
         await expect(page.locator('.cm-content')).toContainText(
           '// Shelf Bracket'
         )
+
+        // TODO: jess make less shit
+        // 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)
       })
+
+      await electronApp.close()
     }
   )
 
-  test(
-    'Code resets after confirmation',
-    {
-      appSettings: {
-        app: {
-          onboardingStatus: 'incomplete',
-        },
-      },
-      cleanProjectDir: true,
-    },
-    async ({ context, page, homePage }) => {
-      const initialCode = `sketch001 = startSketchOn('XZ')`
+  test('Code resets after confirmation', async ({ page }) => {
+    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 context.addInitScript((code) => {
-        localStorage.setItem('persistCode', code)
-      }, initialCode)
+    // Load the page up with some code so we see the confirmation warning
+    // when we go to replay onboarding
+    await page.addInitScript((code) => {
+      localStorage.setItem('persistCode', code)
+    }, initialCode)
 
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 1000 })
+    await u.waitForAuthSkipAppStart()
 
-      // Replay the onboarding
-      await page.getByRole('link', { name: 'Settings' }).last().click()
-      const replayButton = page.getByRole('button', {
-        name: 'Replay onboarding',
+    // Replay the onboarding
+    await page.getByRole('link', { name: 'Settings' }).last().click()
+    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(
+      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.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')
+
+    // Ensure we persisted the code to local storage.
+    // Playwright's addInitScript method unfortunately will reset
+    // this code if we try reloading the page as a test,
+    // so this is our best way to test persistence afaik.
+    expect(
+      await page.evaluate(() => {
+        return localStorage.getItem('persistCode')
       })
-      await expect(replayButton).toBeVisible()
-      await replayButton.click()
+    ).toContain('// Shelf Bracket')
 
-      // Ensure we see the warning, and that the code has not yet updated
-      await expect(page.getByText('Would you like to create')).toBeVisible()
-      await expect(page.locator('.cm-content')).toHaveText(initialCode)
+    // 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)
+  })
 
-      const nextButton = page.getByTestId('onboarding-next')
-      await nextButton.hover()
-      await nextButton.click()
+  test('Click through each onboarding step', async ({ page }) => {
+    const u = await getUtils(page)
 
-      // 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'
-      )
-
-      // There used to be old code here that checked if we stored the reset
-      // code into localStorage but that isnt the case on desktop. It gets
-      // saved to the file system, which we have other tests for.
-    }
-  )
-
-  test(
-    'Click through each onboarding step',
-    {
-      appSettings: {
-        app: {
-          onboardingStatus: 'incomplete',
-        },
+    // Override beforeEach test setup
+    await page.addInitScript(
+      async ({ settingsKey, settings }) => {
+        // Give no initial code, so that the onboarding start is shown immediately
+        localStorage.setItem('persistCode', '')
+        localStorage.setItem(settingsKey, settings)
       },
-    },
-    async ({ context, page, homePage }) => {
-      // Override beforeEach test setup
-      await context.addInitScript(
-        async ({ settingsKey, settings }) => {
-          // Give no initial code, so that the onboarding start is shown immediately
-          localStorage.setItem('persistCode', '')
-          localStorage.setItem(settingsKey, settings)
-        },
-        {
-          settingsKey: TEST_SETTINGS_KEY,
-          settings: TOML.stringify({
-            settings: TEST_SETTINGS_ONBOARDING_START,
-          }),
-        }
-      )
-
-      await page.setBodyDimensions({ width: 1200, height: 1080 })
-      await homePage.goToModelingScene()
-
-      // Test that the onboarding pane loaded
-      await expect(
-        page.getByText('Welcome to Modeling App! This')
-      ).toBeVisible()
-
-      const nextButton = page.getByTestId('onboarding-next')
-
-      while ((await nextButton.innerText()) !== 'Finish') {
-        await nextButton.hover()
-        await nextButton.click()
+      {
+        settingsKey: TEST_SETTINGS_KEY,
+        settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_START }),
       }
+    )
 
-      // Finish the onboarding
-      await nextButton.hover()
+    await page.setViewportSize({ width: 1200, height: 1080 })
+
+    await u.waitForAuthSkipAppStart()
+
+    // Test that the onboarding pane loaded
+    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.click()
-
-      // Test that the onboarding pane is gone
-      await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
-      await expect.poll(() => page.url()).not.toContain('/onboarding')
     }
-  )
 
-  test(
-    'Onboarding redirects and code updating',
-    {
-      appSettings: {
-        app: {
-          onboardingStatus: '/export',
-        },
+    // Finish the onboarding
+    await expect(nextButton).toBeVisible()
+    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 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)
       },
-      cleanProjectDir: true,
-    },
-    async ({ context, page, homePage }) => {
-      const originalCode = 'sigmaAllow = 15000'
-
-      // Override beforeEach test setup
-      await context.addInitScript(
-        async ({ settingsKey, settings }) => {
-          // 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_EXPORT,
-          }),
-        }
-      )
-
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-
-      // Test that the redirect happened
-      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, '')
-
-      // Check the code got reset on load
-      await expect(page.locator('#code-pane')).toBeVisible()
-      await expect(u.codeLocator).toHaveText(bracketNoNewLines, {
-        timeout: 10_000,
-      })
-
-      // Mess with the code again
-      await u.codeLocator.selectText()
-      await u.codeLocator.fill(badCode)
-      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',
-      })
-
-      // Check that the code has been reset
-      await expect(u.codeLocator).toHaveText(bracketNoNewLines)
-    }
-  )
-
-  // (lee) The two avatar tests are weird because even on main, we don't have
-  // 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 context.addInitScript(
-        async ({ settingsKey, settings }) => {
-          localStorage.setItem(settingsKey, settings)
-        },
-        {
-          settingsKey: TEST_SETTINGS_KEY,
-          settings: TOML.stringify({
-            settings: TEST_SETTINGS_ONBOARDING_USER_MENU,
-          }),
-        }
-      )
-
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-
-      // Test that the text in this step is correct
-      const avatarLocator = await page
-        .getByTestId('user-sidebar-toggle')
-        .locator('img')
-      const onboardingOverlayLocator = await page
-        .getByTestId('onboarding-content')
-        .locator('div')
-        .nth(1)
-
-      // Expect the avatar to be visible and for the text to reference it
-      await expect(avatarLocator).toBeVisible()
-      await expect(onboardingOverlayLocator).toBeVisible()
-      await expect(onboardingOverlayLocator).toContainText('your avatar')
-
-      // This is to force the avatar to 404.
-      // For our test image (only triggers locally. on CI, it's Kurt's /
-      // gravatar image )
-      await page.route('/cat.jpg', async (route) => {
-        await route.fulfill({
-          status: 404,
-          contentType: 'text/plain',
-          body: 'Not Found!',
-        })
-      })
-
-      // 404 the CI avatar image
-      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' })
-
-      // Now expect the text to be different
-      await expect(avatarLocator).not.toBeVisible()
-      await expect(onboardingOverlayLocator).toBeVisible()
-      await expect(onboardingOverlayLocator).toContainText('the menu button')
-    }
-  )
-
-  test.fixme(
-    "Avatar text doesn't mention avatar when no avatar",
-    {
-      appSettings: {
-        app: {
-          onboardingStatus: 'incomplete',
-        },
-      },
-      cleanProjectDir: true,
-    },
-    async ({ context, page, homePage }) => {
-      // Override beforeEach test setup
-      await context.addInitScript(
-        async ({ settingsKey, settings }) => {
-          localStorage.setItem(settingsKey, settings)
-          localStorage.setItem('FORCE_NO_IMAGE', 'FORCE_NO_IMAGE')
-        },
-        {
-          settingsKey: TEST_SETTINGS_KEY,
-          settings: TOML.stringify({
-            settings: TEST_SETTINGS_ONBOARDING_USER_MENU,
-          }),
-        }
-      )
-
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-
-      // Test that the text in this step is correct
-      const sidebar = page.getByTestId('user-sidebar-toggle')
-      const avatar = sidebar.locator('img')
-      const onboardingOverlayLocator = page
-        .getByTestId('onboarding-content')
-        .locator('div')
-        .nth(1)
-
-      // Expect the avatar to be visible and for the text to reference it
-      await expect(avatar).not.toBeVisible()
-      await expect(onboardingOverlayLocator).toBeVisible()
-      await expect(onboardingOverlayLocator).toContainText('the menu button')
-
-      // Test we mention what else is in this menu for https://github.com/KittyCAD/modeling-app/issues/2939
-      // which doesn't deserver its own full test spun up
-      const userMenuFeatures = [
-        'manage your account',
-        'report a bug',
-        'request a feature',
-        'sign out',
-      ]
-      for (const feature of userMenuFeatures) {
-        await expect(onboardingOverlayLocator).toContainText(feature)
+      {
+        settingsKey: TEST_SETTINGS_KEY,
+        settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_EXPORT }),
       }
+    )
+
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    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(
+      async ({ settingsKey, settings, badCode }) => {
+        localStorage.setItem('persistCode', badCode)
+        localStorage.setItem(settingsKey, settings)
+      },
+      {
+        settingsKey: TEST_SETTINGS_KEY,
+        settings: TOML.stringify({
+          settings: TEST_SETTINGS_ONBOARDING_PARAMETRIC_MODELING,
+        }),
+        badCode,
+      }
+    )
+
+    await page.setViewportSize({ width: 1200, height: 1080 })
+    await u.waitForAuthSkipAppStart()
+
+    await page.waitForURL('**' + onboardingPaths.PARAMETRIC_MODELING, {
+      waitUntil: 'domcontentloaded',
+    })
+
+    const bracketNoNewLines = bracket.replace(/\n/g, '')
+
+    // Check the code got reset on load
+    await expect(page.locator('#code-pane')).toBeVisible()
+    await expect(u.codeLocator).toHaveText(bracketNoNewLines, {
+      timeout: 10_000,
+    })
+
+    // Mess with the code again
+    await u.codeLocator.selectText()
+    await u.codeLocator.fill(badCode)
+    await expect(u.codeLocator).toHaveText(badCode)
+
+    // Click to the next step
+    await page.locator('[data-testid="onboarding-next"]').click()
+    await page.waitForURL('**' + onboardingPaths.INTERACTIVE_NUMBERS, {
+      waitUntil: 'domcontentloaded',
+    })
+
+    // Check that the code has been reset
+    await expect(u.codeLocator).toHaveText(bracketNoNewLines)
+  })
+
+  test('Avatar text updates depending on image load success', async ({
+    page,
+  }) => {
+    // Override beforeEach test setup
+    await page.addInitScript(
+      async ({ settingsKey, settings }) => {
+        localStorage.setItem(settingsKey, settings)
+      },
+      {
+        settingsKey: TEST_SETTINGS_KEY,
+        settings: TOML.stringify({
+          settings: TEST_SETTINGS_ONBOARDING_USER_MENU,
+        }),
+      }
+    )
+
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
+
+    await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
+
+    // Test that the text in this step is correct
+    const avatarLocator = await page
+      .getByTestId('user-sidebar-toggle')
+      .locator('img')
+    const onboardingOverlayLocator = await page
+      .getByTestId('onboarding-content')
+      .locator('div')
+      .nth(1)
+
+    // Expect the avatar to be visible and for the text to reference it
+    await expect(avatarLocator).toBeVisible()
+    await expect(onboardingOverlayLocator).toBeVisible()
+    await expect(onboardingOverlayLocator).toContainText('your avatar')
+
+    // This is to force the avatar to 404.
+    // For our test image (only triggers locally. on CI, it's Kurt's /
+    // gravatar image )
+    await page.route('/cat.jpg', async (route) => {
+      await route.fulfill({
+        status: 404,
+        contentType: 'text/plain',
+        body: 'Not Found!',
+      })
+    })
+
+    // 404 the CI avatar image
+    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' })
+
+    // Now expect the text to be different
+    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 ({
+    page,
+  }) => {
+    // Override beforeEach test setup
+    await page.addInitScript(
+      async ({ settingsKey, settings }) => {
+        localStorage.setItem(settingsKey, settings)
+        localStorage.setItem('FORCE_NO_IMAGE', 'FORCE_NO_IMAGE')
+      },
+      {
+        settingsKey: TEST_SETTINGS_KEY,
+        settings: TOML.stringify({
+          settings: TEST_SETTINGS_ONBOARDING_USER_MENU,
+        }),
+      }
+    )
+
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    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')
+    const avatar = sidebar.locator('img')
+    const onboardingOverlayLocator = page
+      .getByTestId('onboarding-content')
+      .locator('div')
+      .nth(1)
+
+    // Expect the avatar to be visible and for the text to reference it
+    await expect(avatar).not.toBeVisible()
+    await expect(onboardingOverlayLocator).toBeVisible()
+    await expect(onboardingOverlayLocator).toContainText('the menu button')
+
+    // Test we mention what else is in this menu for https://github.com/KittyCAD/modeling-app/issues/2939
+    // which doesn't deserver its own full test spun up
+    const userMenuFeatures = [
+      'manage your account',
+      'report a bug',
+      'request a feature',
+      'sign out',
+    ]
+    for (const feature of userMenuFeatures) {
+      await expect(onboardingOverlayLocator).toContainText(feature)
     }
-  )
+  })
 })
 
 test(
   'Restarting onboarding on desktop takes one attempt',
-  {
-    appSettings: {
-      app: {
-        onboardingStatus: 'dismissed',
+  { tag: '@electron' },
+  async ({ browser: _ }, testInfo) => {
+    const { electronApp, page } = await setupElectron({
+      testInfo,
+      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')
+        )
       },
-    },
-    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
@@ -443,8 +450,9 @@ test(
     const restartOnboardingButton = page.getByRole('button', {
       name: 'Reset onboarding',
     })
-    const nextButton = page.getByTestId('onboarding-next')
-
+    const restartConfirmationButton = page.getByRole('button', {
+      name: 'Make a new project',
+    })
     const tutorialProjectIndicator = page
       .getByTestId('project-sidebar-toggle')
       .filter({ hasText: 'Tutorial Project 00' })
@@ -463,7 +471,7 @@ test(
     })
 
     await test.step('Navigate into project', async () => {
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 1000 })
 
       page.on('console', console.log)
 
@@ -479,14 +487,22 @@ test(
       await helpMenuButton.click()
       await restartOnboardingButton.click()
 
-      await nextButton.hover()
-      await nextButton.click()
+      await expect(restartConfirmationButton).toBeVisible()
+      await restartConfirmationButton.click()
     })
 
     await test.step('Confirm that the onboarding has restarted', async () => {
       await expect(tutorialProjectIndicator).toBeVisible()
       await expect(tutorialModalText).toBeVisible()
+      // Make sure the model loaded
+      const XYPlanePoint = { x: 988, y: 523 } as const
+      const modelColor: [number, number, number] = [76, 76, 76]
+
+      await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
+      await expectPixelColor(page, modelColor, XYPlanePoint, 8)
       await tutorialDismissButton.click()
+      // Make sure model still there.
+      await expectPixelColor(page, modelColor, XYPlanePoint, 8)
     })
 
     await test.step('Clear code and restart onboarding from settings', async () => {
@@ -504,9 +520,11 @@ test(
 
       await restartOnboardingSettingsButton.click()
       // Since the code is empty, we should not see the confirmation dialog
-      await expect(nextButton).not.toBeVisible()
+      await expect(restartConfirmationButton).not.toBeVisible()
       await expect(tutorialProjectIndicator).toBeVisible()
       await expect(tutorialModalText).toBeVisible()
     })
+
+    await electronApp.close()
   }
 )

e2e/playwright/point-click.spec.ts

@@ -1,49 +1,25 @@
-import { test, expect, Page } from './zoo-test'
+import { test, expect, AuthenticatedApp } from './fixtures/fixtureSetup'
 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('verify extruding circle works', async ({
-  context,
-  homePage,
-  cmdBar,
-  editor,
-  toolbar,
-  scene,
-}) => {
-  const file = await fs.readFile(
-    path.resolve(
-      __dirname,
-      '../../',
-      './src/wasm-lib/tests/executor/inputs/test-circle-extrude.kcl'
-    ),
-    'utf-8'
-  )
-  await context.addInitScript((file) => {
-    localStorage.setItem('persistCode', file)
-  }, file)
-  await homePage.goToModelingScene()
+test(
+  'verify extruding circle works',
+  { tag: ['@skipWin'] },
+  async ({ app, cmdBar, editor, toolbar, scene }) => {
+    test.skip(
+      process.platform === 'win32',
+      'Fails on windows in CI, can not be replicated locally on windows.'
+    )
+    const file = await app.getInputFile('test-circle-extrude.kcl')
+    await app.initialise(file)
+    const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)
 
-  const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)
-
-  await test.step('because there is sweepable geometry, verify extrude is enable when nothing is selected', async () => {
-    await scene.clickNoWhere()
-    await expect(toolbar.extrudeButton).toBeEnabled()
-  })
-
-  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: [],
+    await test.step('because there is sweepable geometry, verify extrude is enable when nothing is selected', async () => {
+      await scene.clickNoWhere()
+      await expect(toolbar.extrudeButton).toBeEnabled()
     })
 
     await test.step('check code model connection works and that button is still enable once circle is selected ', async () => {
@@ -51,7 +27,7 @@ test('verify extruding circle works', async ({
       const circleSnippet =
         'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
       await editor.expectState({
-        activeLines: ["constsketch002=startSketchOn('XZ')"],
+        activeLines: [],
         highlightedCode: circleSnippet,
         diagnostics: [],
       })
@@ -64,40 +40,39 @@ test('verify extruding circle works', async ({
       })
       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()
+    await test.step('do extrude flow and check extrude code is added to editor', async () => {
+      await toolbar.extrudeButton.click()
 
-    await cmdBar.expectState({
-      stage: 'arguments',
-      currentArgKey: 'distance',
-      currentArgValue: '5',
-      headerArguments: { Selection: '1 face', Distance: '' },
-      highlightedHeaderArg: 'distance',
-      commandName: 'Extrude',
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'distance',
+        currentArgValue: '5',
+        headerArguments: { Selection: '1 face', Distance: '' },
+        highlightedHeaderArg: 'distance',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
+
+      const expectString = 'extrude001 = extrude(5, sketch001)'
+      await editor.expectEditor.not.toContain(expectString)
+
+      await cmdBar.expectState({
+        stage: 'review',
+        headerArguments: { Selection: '1 face', Distance: '5' },
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
+
+      await editor.expectEditor.toContain(expectString)
     })
-    await cmdBar.progressCmdBar()
-
-    const expectString = 'extrude001 = extrude(5, sketch001)'
-    await editor.expectEditor.not.toContain(expectString)
-
-    await cmdBar.expectState({
-      stage: 'review',
-      headerArguments: { Selection: '1 face', Distance: '5' },
-      commandName: 'Extrude',
-    })
-    await cmdBar.progressCmdBar()
-
-    await editor.expectEditor.toContain(expectString)
-  })
-})
+  }
+)
 
 test.describe('verify sketch on chamfer works', () => {
   const _sketchOnAChamfer =
     (
-      page: Page,
+      app: AuthenticatedApp,
       editor: EditorFixture,
       toolbar: ToolbarFixture,
       scene: SceneFixture
@@ -149,7 +124,7 @@ test.describe('verify sketch on chamfer works', () => {
         await toolbar.startSketchPlaneSelection()
         await clickChamfer()
         // timeout wait for engine animation is unavoidable
-        await page.waitForTimeout(1000)
+        await app.page.waitForTimeout(600)
         await editor.expectEditor.toContain(afterChamferSelectSnippet)
       })
       await test.step('make sure a basic sketch can be added', async () => {
@@ -177,35 +152,24 @@ test.describe('verify sketch on chamfer works', () => {
         })
       })
     }
-  test('works on all edge selections and can break up multi edges in a chamfer array', async ({
-    context,
-    page,
-    homePage,
-    editor,
-    toolbar,
-    scene,
-  }) => {
-    const file = await fs.readFile(
-      path.resolve(
-        __dirname,
-        '../../',
-        './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
-      ),
-      'utf-8'
-    )
-    await context.addInitScript((file) => {
-      localStorage.setItem('persistCode', file)
-    }, file)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
+  test(
+    'works on all edge selections and can break up multi edges in a chamfer array',
+    { tag: ['@skipWin'] },
+    async ({ app, editor, toolbar, scene }) => {
+      test.skip(
+        process.platform === 'win32',
+        'Fails on windows in CI, can not be replicated locally on windows.'
+      )
+      const file = await app.getInputFile('e2e-can-sketch-on-chamfer.kcl')
+      await app.initialise(file)
 
-    const sketchOnAChamfer = _sketchOnAChamfer(page, editor, toolbar, scene)
+      const sketchOnAChamfer = _sketchOnAChamfer(app, editor, toolbar, scene)
 
-    await sketchOnAChamfer({
-      clickCoords: { x: 570, y: 220 },
-      cameraPos: { x: 16020, y: -2000, z: 10500 },
-      cameraTarget: { x: -150, y: -4500, z: -80 },
-      beforeChamferSnippet: `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)
+      await sketchOnAChamfer({
+        clickCoords: { x: 570, y: 220 },
+        cameraPos: { x: 16020, y: -2000, z: 10500 },
+        cameraTarget: { x: -150, y: -4500, z: -80 },
+        beforeChamferSnippet: `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)
       chamfer({length = 30,tags = [
       seg01,
       getNextAdjacentEdge(yo),
@@ -213,26 +177,22 @@ test.describe('verify sketch on chamfer works', () => {
       getOppositeEdge(seg01)
     ]}, %)`,
 
-      afterChamferSelectSnippet: 'sketch002 = startSketchOn(extrude001, seg03)',
-      afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], %)',
-      afterRectangle2ndClickSnippet: `angledLine([0, 11.39], %, $rectangleSegmentA002)
-    |> angledLine([
-         segAng(rectangleSegmentA002) - 90,
-         105.26
-       ], %, $rectangleSegmentB001)
-    |> angledLine([
-         segAng(rectangleSegmentA002),
-         -segLen(rectangleSegmentA002)
-       ], %, $rectangleSegmentC001)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`,
-    })
+        afterChamferSelectSnippet:
+          'sketch002 = startSketchOn(extrude001, seg03)',
+        afterRectangle1stClickSnippet:
+          'startProfileAt([205.96, 254.59], sketch002)',
+        afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
+        |>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)
+        |>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)
+        |>lineTo([profileStartX(%),profileStartY(%)],%)
+        |>close(%)`,
+      })
 
-    await sketchOnAChamfer({
-      clickCoords: { x: 690, y: 250 },
-      cameraPos: { x: 16020, y: -2000, z: 10500 },
-      cameraTarget: { x: -150, y: -4500, z: -80 },
-      beforeChamferSnippet: `angledLine([
+      await sketchOnAChamfer({
+        clickCoords: { x: 690, y: 250 },
+        cameraPos: { x: 16020, y: -2000, z: 10500 },
+        cameraTarget: { x: -150, y: -4500, z: -80 },
+        beforeChamferSnippet: `angledLine([
          segAng(rectangleSegmentA001) - 90,
          217.26
        ], %, $seg01)chamfer({
@@ -244,210 +204,185 @@ test.describe('verify sketch on chamfer works', () => {
          ]
        }, %)`,
 
-      afterChamferSelectSnippet: 'sketch003 = startSketchOn(extrude001, seg04)',
-      afterRectangle1stClickSnippet: 'startProfileAt([-209.64, 255.28], %)',
-      afterRectangle2ndClickSnippet: `angledLine([0, 11.56], %, $rectangleSegmentA003)
-    |> angledLine([
-         segAng(rectangleSegmentA003) - 90,
-         106.84
-       ], %, $rectangleSegmentB002)
-    |> angledLine([
-         segAng(rectangleSegmentA003),
-         -segLen(rectangleSegmentA003)
-       ], %, $rectangleSegmentC002)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`,
-    })
-    await sketchOnAChamfer({
-      clickCoords: { x: 677, y: 87 },
-      cameraPos: { x: -6200, y: 1500, z: 6200 },
-      cameraTarget: { x: 8300, y: 1100, z: 4800 },
-      beforeChamferSnippet: `angledLine([0, 268.43], %, $rectangleSegmentA001)chamfer({
+        afterChamferSelectSnippet:
+          'sketch003 = startSketchOn(extrude001, seg04)',
+        afterRectangle1stClickSnippet:
+          'startProfileAt([-209.64, 255.28], sketch003)',
+        afterRectangle2ndClickSnippet: `angledLine([0,11.56],%,$rectangleSegmentA003)
+        |>angledLine([segAng(rectangleSegmentA003)-90,106.84],%)
+        |>angledLine([segAng(rectangleSegmentA003),-segLen(rectangleSegmentA003)],%)
+        |>lineTo([profileStartX(%),profileStartY(%)],%)
+        |>close(%)`,
+      })
+
+      await sketchOnAChamfer({
+        clickCoords: { x: 677, y: 87 },
+        cameraPos: { x: -6200, y: 1500, z: 6200 },
+        cameraTarget: { x: 8300, y: 1100, z: 4800 },
+        beforeChamferSnippet: `angledLine([0, 268.43], %, $rectangleSegmentA001)chamfer({
          length = 30,
          tags = [
            getNextAdjacentEdge(yo),
            getNextAdjacentEdge(seg02)
          ]
        }, %)`,
-      afterChamferSelectSnippet: 'sketch003 = startSketchOn(extrude001, seg04)',
-      afterRectangle1stClickSnippet: 'startProfileAt([75.8, 317.2], %)',
-      afterRectangle2ndClickSnippet: `angledLine([0, 11.56], %, $rectangleSegmentA003)
-    |> angledLine([
-         segAng(rectangleSegmentA003) - 90,
-         106.84
-       ], %, $rectangleSegmentB002)
-    |> angledLine([
-         segAng(rectangleSegmentA003),
-         -segLen(rectangleSegmentA003)
-       ], %, $rectangleSegmentC002)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`,
-    })
-    /// last one
-    await sketchOnAChamfer({
-      clickCoords: { x: 620, y: 300 },
-      cameraPos: { x: -1100, y: -7700, z: 1600 },
-      cameraTarget: { x: 1450, y: 670, z: 4000 },
-      beforeChamferSnippet: `chamfer({
+        afterChamferSelectSnippet:
+          'sketch004 = startSketchOn(extrude001, seg05)',
+        afterRectangle1stClickSnippet:
+          'startProfileAt([82.57, 322.96], sketch004)',
+        afterRectangle2ndClickSnippet: `angledLine([0,11.16],%,$rectangleSegmentA004)
+        |>angledLine([segAng(rectangleSegmentA004)-90,103.07],%)
+        |>angledLine([segAng(rectangleSegmentA004),-segLen(rectangleSegmentA004)],%)
+        |>lineTo([profileStartX(%),profileStartY(%)],%)|
+        >close(%)`,
+      })
+      /// last one
+      await sketchOnAChamfer({
+        clickCoords: { x: 620, y: 300 },
+        cameraPos: { x: -1100, y: -7700, z: 1600 },
+        cameraTarget: { x: 1450, y: 670, z: 4000 },
+        beforeChamferSnippet: `chamfer({
          length = 30,
          tags = [getNextAdjacentEdge(yo)]
        }, %)`,
-      afterChamferSelectSnippet: 'sketch005 = startSketchOn(extrude001, seg06)',
-      afterRectangle1stClickSnippet: 'startProfileAt([-23.43, 19.69], %)',
-      afterRectangle2ndClickSnippet: `angledLine([0, 9.1], %, $rectangleSegmentA005)
+        afterChamferSelectSnippet:
+          'sketch005 = startSketchOn(extrude001, seg06)',
+        afterRectangle1stClickSnippet:
+          'startProfileAt([-23.43, 19.69], sketch005)',
+        afterRectangle2ndClickSnippet: `angledLine([0,9.1],%,$rectangleSegmentA005)
+        |>angledLine([segAng(rectangleSegmentA005)-90,84.07],%)
+        |>angledLine([segAng(rectangleSegmentA005),-segLen(rectangleSegmentA005)],%)
+        |>lineTo([profileStartX(%),profileStartY(%)],%)
+        |>close(%)`,
+      })
 
-    |> angledLine([
-         segAng(rectangleSegmentA005) - 90,
-         84.07
-       ], %, $rectangleSegmentB004)
-    |> angledLine([
-         segAng(rectangleSegmentA005),
-         -segLen(rectangleSegmentA005)
-       ], %, $rectangleSegmentC004)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`,
-    })
+      await test.step('verify at the end of the test that final code is what is expected', async () => {
+        await editor.expectEditor.toContain(
+          `sketch001 = startSketchOn('XZ')
+  |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
+  |> angledLine([0, 268.43], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       217.26
+     ], %, $seg01)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $yo)
+  |> lineTo([profileStartX(%), profileStartY(%)], %, $seg02)
+  |> close(%)
+extrude001 = extrude(100, sketch001)
+  |> chamfer({
+       length = 30,
+       tags = [getOppositeEdge(seg01)]
+     }, %, $seg03)
+  |> chamfer({ length = 30, tags = [seg01] }, %, $seg04)
+  |> chamfer({
+       length = 30,
+       tags = [getNextAdjacentEdge(seg02)]
+     }, %, $seg05)
+  |> chamfer({
+       length = 30,
+       tags = [getNextAdjacentEdge(yo)]
+     }, %, $seg06)
+sketch005 = startSketchOn(extrude001, seg06)
+profile004 = startProfileAt([-23.43, 19.69], sketch005)
+  |> angledLine([0, 9.1], %, $rectangleSegmentA005)
+  |> angledLine([
+       segAng(rectangleSegmentA005) - 90,
+       84.07
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA005),
+       -segLen(rectangleSegmentA005)
+     ], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+sketch004 = startSketchOn(extrude001, seg05)
+profile003 = startProfileAt([82.57, 322.96], sketch004)
+  |> angledLine([0, 11.16], %, $rectangleSegmentA004)
+  |> angledLine([
+       segAng(rectangleSegmentA004) - 90,
+       103.07
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA004),
+       -segLen(rectangleSegmentA004)
+     ], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+sketch003 = startSketchOn(extrude001, seg04)
+profile002 = startProfileAt([-209.64, 255.28], sketch003)
+  |> angledLine([0, 11.56], %, $rectangleSegmentA003)
+  |> angledLine([
+       segAng(rectangleSegmentA003) - 90,
+       106.84
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA003),
+       -segLen(rectangleSegmentA003)
+     ], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+sketch002 = startSketchOn(extrude001, seg03)
+profile001 = startProfileAt([205.96, 254.59], sketch002)
+  |> angledLine([0, 11.39], %, $rectangleSegmentA002)
+  |> angledLine([
+       segAng(rectangleSegmentA002) - 90,
+       105.26
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA002),
+       -segLen(rectangleSegmentA002)
+     ], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+`,
+          { shouldNormalise: true }
+        )
+      })
+    }
+  )
 
-    await test.step('verify at the end of the test that final code is what is expected', async () => {
-      await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn('XZ')
-
-      |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
-      |> angledLine([0, 268.43], %, $rectangleSegmentA001)
-      |> angledLine([
-           segAng(rectangleSegmentA001) - 90,
-           217.26
-         ], %, $seg01)
-      |> angledLine([
-           segAng(rectangleSegmentA001),
-           -segLen(rectangleSegmentA001)
-         ], %, $yo)
-      |> lineTo([profileStartX(%), profileStartY(%)], %, $seg02)
-      |> close(%)
-    extrude001 = extrude(100, sketch001)
-      |> chamfer({
-           length = 30,
-           tags = [getOppositeEdge(seg01)]
-         }, %, $seg03)
-      |> chamfer({ length = 30, tags = [seg01] }, %, $seg04)
-      |> chamfer({
-           length = 30,
-           tags = [getNextAdjacentEdge(seg02)]
-         }, %, $seg05)
-      |> chamfer({
-           length = 30,
-           tags = [getNextAdjacentEdge(yo)]
-         }, %, $seg06)
-    sketch005 = startSketchOn(extrude001, seg06)
-      |> startProfileAt([-23.43,19.69], %)
-      |> angledLine([0, 9.1], %, $rectangleSegmentA005)
-      |> angledLine([
-           segAng(rectangleSegmentA005) - 90,
-           84.07
-         ], %, $rectangleSegmentB004)
-      |> angledLine([
-           segAng(rectangleSegmentA005),
-           -segLen(rectangleSegmentA005)
-         ], %, $rectangleSegmentC004)
-      |> lineTo([profileStartX(%), profileStartY(%)], %)
-      |> close(%)
-    sketch004 = startSketchOn(extrude001, seg05)
-      |> startProfileAt([82.57,322.96], %)
-      |> angledLine([0, 11.16], %, $rectangleSegmentA004)
-      |> angledLine([
-           segAng(rectangleSegmentA004) - 90,
-           103.07
-         ], %, $rectangleSegmentB003)
-      |> angledLine([
-           segAng(rectangleSegmentA004),
-           -segLen(rectangleSegmentA004)
-         ], %, $rectangleSegmentC003)
-      |> lineTo([profileStartX(%), profileStartY(%)], %)
-      |> close(%)
-    sketch003 = startSketchOn(extrude001, seg04)
-      |> startProfileAt([-209.64,255.28], %)
-      |> angledLine([0, 11.56], %, $rectangleSegmentA003)
-      |> angledLine([
-           segAng(rectangleSegmentA003) - 90,
-           106.84
-         ], %, $rectangleSegmentB002)
-      |> angledLine([
-           segAng(rectangleSegmentA003),
-           -segLen(rectangleSegmentA003)
-         ], %, $rectangleSegmentC002)
-      |> lineTo([profileStartX(%), profileStartY(%)], %)
-      |> close(%)
-    sketch002 = startSketchOn(extrude001, seg03)
-      |> startProfileAt([205.96,254.59], %)
-      |> angledLine([0, 11.39], %, $rectangleSegmentA002)
-      |> angledLine([
-           segAng(rectangleSegmentA002) - 90,
-           105.26
-         ], %, $rectangleSegmentB001)
-      |> angledLine([
-           segAng(rectangleSegmentA002),
-           -segLen(rectangleSegmentA002)
-         ], %, $rectangleSegmentC001)
-      |> lineTo([profileStartX(%), profileStartY(%)], %)
-      |> close(%)
-    `,
-        { shouldNormalise: true }
+  test(
+    'Works on chamfers that are non in a pipeExpression can break up multi edges in a chamfer array',
+    { tag: ['@skipWin'] },
+    async ({ app, editor, toolbar, scene }) => {
+      test.skip(
+        process.platform === 'win32',
+        'Fails on windows in CI, can not be replicated locally on windows.'
       )
-    })
-  })
+      const file = await app.getInputFile(
+        'e2e-can-sketch-on-chamfer-no-pipeExpr.kcl'
+      )
+      await app.initialise(file)
 
-  test('Works on chamfers that are non in a pipeExpression can break up multi edges in a chamfer array', async ({
-    context,
-    page,
-    homePage,
-    editor,
-    toolbar,
-    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'
-    )
-    await context.addInitScript((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 },
-      cameraPos: { x: 16020, y: -2000, z: 10500 },
-      cameraTarget: { x: -150, y: -4500, z: -80 },
-      beforeChamferSnippet: `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)
+      await sketchOnAChamfer({
+        clickCoords: { x: 570, y: 220 },
+        cameraPos: { x: 16020, y: -2000, z: 10500 },
+        cameraTarget: { x: -150, y: -4500, z: -80 },
+        beforeChamferSnippet: `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)
       chamfer({length=30,tags=[
       seg01,
       getNextAdjacentEdge(yo),
       getNextAdjacentEdge(seg02),
       getOppositeEdge(seg01)
     ]}, extrude001)`,
-      beforeChamferSnippetEnd: '}, extrude001)',
-      afterChamferSelectSnippet: 'sketch002 = startSketchOn(extrude001, seg03)',
-      afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], %)',
-      afterRectangle2ndClickSnippet: `angledLine([0, 11.39], %, $rectangleSegmentA002)
-    |> angledLine([
-         segAng(rectangleSegmentA002) - 90,
-         105.26
-       ], %, $rectangleSegmentB001)
-    |> angledLine([
-         segAng(rectangleSegmentA002),
-         -segLen(rectangleSegmentA002)
-       ], %, $rectangleSegmentC001)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`,
-    })
-    await editor.expectEditor.toContain(
-      `sketch001 = startSketchOn('XZ')
+        beforeChamferSnippetEnd: '}, extrude001)',
+        afterChamferSelectSnippet:
+          'sketch002 = startSketchOn(extrude001, seg03)',
+        afterRectangle1stClickSnippet:
+          'startProfileAt([205.96, 254.59], sketch002)',
+        afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
+        |>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)
+        |>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)
+        |>lineTo([profileStartX(%),profileStartY(%)],%)
+        |>close(%)`,
+      })
+      await editor.expectEditor.toContain(
+        `sketch001 = startSketchOn('XZ')
   |> startProfileAt([75.8, 317.2], %)
   |> angledLine([0, 268.43], %, $rectangleSegmentA001)
   |> angledLine([
@@ -474,69 +409,63 @@ chamf = chamfer({
        ]
      }, %)
 sketch002 = startSketchOn(extrude001, seg03)
-  |> startProfileAt([205.96, 254.59], %)
+profile001 = startProfileAt([205.96, 254.59], sketch002)
   |> angledLine([0, 11.39], %, $rectangleSegmentA002)
   |> angledLine([
        segAng(rectangleSegmentA002) - 90,
        105.26
-     ], %, $rectangleSegmentB001)
+     ], %)
   |> angledLine([
        segAng(rectangleSegmentA002),
        -segLen(rectangleSegmentA002)
-     ], %, $rectangleSegmentC001)
+     ], %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 `,
-      { shouldNormalise: true }
-    )
-  })
+        { shouldNormalise: true }
+      )
+    }
+  )
 })
 
 test(`Verify axis, origin, and horizontal snapping`, async ({
-  page,
-  homePage,
+  app,
   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 = [
-    viewPortSize.width * 0.65,
-    viewPortSize.height * 0.3,
+    app.viewPortSize.width * 0.65,
+    app.viewPortSize.height * 0.3,
   ] as const
   const originSloppy = {
     screen: [
-      viewPortSize.width / 2 + 3, // 3px off the center of the screen
-      viewPortSize.height / 2,
+      app.viewPortSize.width / 2 + 3, // 3px off the center of the screen
+      app.viewPortSize.height / 2,
     ],
     kcl: [0, 0],
   } as const
   const xAxisSloppy = {
     screen: [
-      viewPortSize.width * 0.75,
-      viewPortSize.height / 2 - 3, // 3px off the X-axis
+      app.viewPortSize.width * 0.75,
+      app.viewPortSize.height / 2 - 3, // 3px off the X-axis
     ],
-    kcl: [20.34, 0],
+    kcl: [16.95, 0],
   } as const
   const offYAxis = {
     screen: [
-      viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
-      viewPortSize.height * 0.3,
+      app.viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
+      app.viewPortSize.height * 0.3,
     ],
-    kcl: [8.14, 6.78],
+    kcl: [6.78, 6.78],
   } as const
   const yAxisSloppy = {
     screen: [
-      viewPortSize.width / 2 + 5, // 5px off the Y-axis
-      viewPortSize.height * 0.3,
+      app.viewPortSize.width / 2 + 5, // 5px off the Y-axis
+      app.viewPortSize.height * 0.3,
     ],
     kcl: [0, 6.78],
   } as const
@@ -551,19 +480,21 @@ test(`Verify axis, origin, and horizontal snapping`, async ({
 
   const expectedCodeSnippets = {
     sketchOnXzPlane: `sketch001 = startSketchOn('XZ')`,
-    pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], %)`,
+    pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], sketch001)`,
     segmentOnXAxis: `xLine(${xAxisSloppy.kcl[0]}, %)`,
-    afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], %)`,
-    afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], %)`,
+    afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], sketch001)`,
+    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 page.waitForTimeout(600)
+    await app.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 () => {
@@ -598,15 +529,11 @@ test(`Verify axis, origin, and horizontal snapping`, async ({
 })
 
 test(`Verify user can double-click to edit a sketch`, async ({
-  context,
-  page,
-  homePage,
+  app,
   editor,
   toolbar,
   scene,
 }) => {
-  const u = await getUtils(page)
-
   const initialCode = `closedSketch = startSketchOn('XZ')
   |> circle({ center = [8, 5], radius = 2 }, %)
 openSketch = startSketchOn('XY')
@@ -615,24 +542,15 @@ openSketch = startSketchOn('XY')
   |> xLine(5, %)
   |> tangentialArcTo([10, 0], %)
 `
-  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)
+  await app.initialise(initialCode)
 
   const pointInsideCircle = {
-    x: viewPortSize.width * 0.63,
-    y: viewPortSize.height * 0.5,
+    x: app.viewPortSize.width * 0.63,
+    y: app.viewPortSize.height * 0.5,
   }
   const pointOnPathAfterSketching = {
-    x: viewPortSize.width * 0.65,
-    y: viewPortSize.height * 0.5,
+    x: app.viewPortSize.width * 0.58,
+    y: app.viewPortSize.height * 0.5,
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_clickOpenPath, moveToOpenPath, dblClickOpenPath] =
@@ -665,59 +583,41 @@ 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 page.waitForTimeout(500)
+    await app.page.waitForTimeout(500)
     await dblClickOpenPath()
     await expect(toolbar.startSketchBtn).not.toBeVisible()
     await expect(toolbar.exitSketchBtn).toBeVisible()
     // Wait for enter sketch mode to complete
-    await page.waitForTimeout(500)
+    await app.page.waitForTimeout(500)
     await editor.expectState({
-      activeLines: [`|>tangentialArcTo([10,0],%)`],
-      highlightedCode: 'tangentialArcTo([10,0],%)',
+      activeLines: [`|>xLine(5,%)`],
+      highlightedCode: 'xLine(5,%)',
       diagnostics: [],
     })
   })
 })
 
 test(`Offset plane point-and-click`, async ({
-  context,
-  page,
-  homePage,
+  app,
   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)
   })
@@ -851,9 +751,7 @@ const shellPointAndClickCapCases = [
 ]
 shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
   test(`Shell point-and-click cap (preselected sketches: ${shouldPreselect})`, async ({
-    context,
-    page,
-    homePage,
+    app,
     scene,
     editor,
     toolbar,
@@ -863,11 +761,7 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
     |> circle({ center = [0, 0], radius = 30 }, %)
     extrude001 = extrude(30, sketch001)
     `
-    await context.addInitScript((initialCode) => {
-      localStorage.setItem('persistCode', initialCode)
-    }, initialCode)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
+    await app.initialise(initialCode)
 
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 575, y: 200 }
@@ -894,7 +788,7 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
           commandName: 'Shell',
         })
         await clickOnCap()
-        await page.waitForTimeout(500)
+        await app.page.waitForTimeout(500)
         await cmdBar.progressCmdBar()
         await cmdBar.progressCmdBar()
         await cmdBar.expectState({
@@ -910,7 +804,7 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
     } else {
       await test.step(`Preselect the cap`, async () => {
         await clickOnCap()
-        await page.waitForTimeout(500)
+        await app.page.waitForTimeout(500)
       })
 
       await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {
@@ -942,9 +836,8 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
 })
 
 test('Shell point-and-click wall', async ({
-  context,
+  app,
   page,
-  homePage,
   scene,
   editor,
   toolbar,
@@ -959,11 +852,7 @@ test('Shell point-and-click wall', async ({
   |> close(%)
 extrude001 = extrude(40, sketch001)
   `
-  await context.addInitScript((initialCode) => {
-    localStorage.setItem('persistCode', initialCode)
-  }, initialCode)
-  await page.setBodyDimensions({ width: 1000, height: 500 })
-  await homePage.goToModelingScene()
+  await app.initialise(initialCode)
 
   // One dumb hardcoded screen pixel value
   const testPoint = { x: 580, y: 180 }
@@ -994,7 +883,7 @@ extrude001 = extrude(40, sketch001)
     await clickOnCap()
     await page.keyboard.down('Shift')
     await clickOnWall()
-    await page.waitForTimeout(500)
+    await app.page.waitForTimeout(500)
     await page.keyboard.up('Shift')
     await cmdBar.progressCmdBar()
     await cmdBar.progressCmdBar()

e2e/playwright/regression-tests.spec.ts

@@ -1,37 +1,46 @@
-import { test, expect, Page } from './zoo-test'
-import path from 'path'
+import { test, expect, Page } from '@playwright/test'
+import { join } from 'path'
 import * as fsp from 'fs/promises'
-import { getUtils, executorInputPath } from './test-utils'
+import {
+  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 ({
-    context,
-    page,
-    homePage,
-  }) => {
+  test('bad model has inline error #3251', async ({ page }) => {
     // 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 context.addInitScript(async () => {
+    await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch2 = startSketchOn("XY")
-  sketch001 = startSketchAt([-0, -0])
-    |> line([0, 0], %)
-    |> line([-4.84, -5.29], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`
+sketch001 = startSketchAt([-0, -0])
+  |> line([0, 0], %)
+  |> line([-4.84, -5.29], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)`
       )
     })
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
@@ -47,7 +56,6 @@ test.describe('Regression tests', () => {
   })
   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
@@ -56,38 +64,26 @@ test.describe('Regression tests', () => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `sketch001 = startSketchOn('XY')
-  |> startProfileAt([82.33, 238.21], %)
-  |> angledLine([0, 288.63], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001) - 90,
-       197.97
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001),
-       -segLen(rectangleSegmentA001)
-     ], %, $rectangleSegmentC001)
+        `sketch2 = startSketchOn("XY")
+sketch001 = startSketchAt([-0, -0])
+  |> line([0, 0], %)
+  |> line([-4.84, -5.29], %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-extrude001 = extrude(50, sketch001)
-`
+  |> close(%)`
       )
     })
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await page.goto('/')
     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()
 
-      const floppy = page.getByRole('option', {
-        name: 'floppy disk arrow Export',
-      })
-
-      await floppy.click()
+      await page
+        .getByRole('option', { name: 'floppy disk arrow Export' })
+        .click()
 
       // press arrow down key twice
       await page.keyboard.press('ArrowDown')
@@ -119,22 +115,21 @@ extrude001 = extrude(50, sketch001)
       )
     })
   })
-  test('executes on load', async ({ page, homePage }) => {
+  test('executes on load', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('-XZ')
-  |> startProfileAt([-6.95, 4.98], %)
-  |> line([25.1, 0.41], %)
-  |> line([0.73, -14.93], %)
-  |> line([-23.44, 0.52], %)`
+    |> startProfileAt([-6.95, 4.98], %)
+    |> line([25.1, 0.41], %)
+    |> line([0.73, -14.93], %)
+    |> line([-23.44, 0.52], %)`
       )
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     // expand variables section
     const variablesTabButton = page.getByTestId('variables-pane-button')
@@ -153,15 +148,14 @@ extrude001 = extrude(50, sketch001)
     ).toBeVisible()
   })
 
-  test('re-executes', async ({ page, homePage }) => {
+  test('re-executes', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem('persistCode', `myVar = 5`)
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     const variablesTabButton = page.getByTestId('variables-pane-button')
     await variablesTabButton.click()
@@ -180,33 +174,32 @@ extrude001 = extrude(50, sketch001)
       page.locator('.pretty-json-container >> text=myVar:67')
     ).toBeVisible()
   })
-  test('ProgramMemory can be serialised', async ({ page, homePage }) => {
+  test('ProgramMemory can be serialised', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `part = startSketchOn('XY')
-  |> startProfileAt([0, 0], %)
-  |> line([0, 1], %)
-  |> line([1, 0], %)
-  |> line([0, -1], %)
-  |> close(%)
-  |> extrude(1, %)
-  |> patternLinear3d({
-        axis: [1, 0, 1],
-        repetitions: 3,
-        distance: 6
-      }, %)`
+    |> startProfileAt([0, 0], %)
+    |> line([0, 1], %)
+    |> line([1, 0], %)
+    |> line([0, -1], %)
+    |> close(%)
+    |> extrude(1, %)
+    |> patternLinear3d({
+          axis: [1, 0, 1],
+          repetitions: 3,
+          distance: 6
+        }, %)`
       )
     })
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ 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 homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -219,26 +212,19 @@ extrude001 = extrude(50, sketch001)
       })
     })
   })
-
-  // 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,
-  }) => {
+  test('ensure the Zoo logo is not a link in browser app', async ({ page }) => {
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await page.setViewportSize({ width: 1000, height: 500 })
+    await u.waitForAuthSkipAppStart()
 
     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 ({ context, page, homePage }) => {
+    async ({ page }) => {
       // SKip on windows, its being weird.
       test.skip(
         process.platform === 'win32',
@@ -247,26 +233,25 @@ extrude001 = extrude(50, sketch001)
 
       const u = await getUtils(page)
       // const PUR = 400 / 37.5 //pixeltoUnitRatio
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await context.addInitScript(async () => {
+      await page.setViewportSize({ width: 1200, height: 500 })
+      await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
           `exampleSketch = startSketchOn("XZ")
-      |> startProfileAt([0, 0], %)
-      |> angledLine({ angle: 50, length: 45 }, %)
-      |> yLineTo(0, %)
-      |> close(%)
-      |>
-  
-    example = extrude(5, exampleSketch)
-    shell({ faces: ['end'], thickness: 0.25 }, exampleSketch)`
+    |> startProfileAt([0, 0], %)
+    |> angledLine({ angle: 50, length: 45 }, %)
+    |> yLineTo(0, %)
+    |> close(%)
+    |>
+
+  example = extrude(5, exampleSketch)
+  shell({ faces: ['end'], thickness: 0.25 }, exampleSketch)`
         )
       })
 
       await expect(async () => {
-        await homePage.goToModelingScene()
+        await page.goto('/')
         await u.waitForPageLoad()
-
         // error in guter
         await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
           timeout: 1_000,
@@ -308,12 +293,12 @@ extrude001 = extrude(50, sketch001)
 
       await expect(page.locator('.cm-content'))
         .toContainText(`exampleSketch = startSketchOn("XZ")
-      |> startProfileAt([0, 0], %)
-      |> angledLine({ angle: 50, length: 45 }, %)
-      |> yLineTo(0, %)
-      |> close(%)
-  
-      thing: "blah"`)
+    |> startProfileAt([0, 0], %)
+    |> angledLine({ angle: 50, length: 45 }, %)
+    |> yLineTo(0, %)
+    |> close(%)
+
+    thing: "blah"`)
 
       await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
     }
@@ -321,7 +306,6 @@ extrude001 = extrude(50, sketch001)
 
   test('when engine fails export we handle the failure and alert the user', async ({
     page,
-    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(
@@ -332,10 +316,9 @@ extrude001 = extrude(50, sketch001)
       { code: TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR }
     )
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -391,6 +374,7 @@ extrude001 = extrude(50, sketch001)
 
     // wait for execution done
     await u.openDebugPanel()
+    await u.clearCommandLogs()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
@@ -424,7 +408,7 @@ extrude001 = extrude(50, sketch001)
   test(
     'ensure you can not export while an export is already going',
     { tag: ['@skipLinux', '@skipWin'] },
-    async ({ page, homePage }) => {
+    async ({ page }) => {
       // This is being weird on ubuntu and windows.
       test.skip(
         // eslint-disable-next-line jest/valid-title
@@ -444,10 +428,9 @@ extrude001 = extrude(50, sketch001)
           }
         )
 
-        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await page.setViewportSize({ width: 1000, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         // wait for execution done
         await u.openDebugPanel()
@@ -517,17 +500,20 @@ extrude001 = extrude(50, sketch001)
   test(
     `Network health indicator only appears in modeling view`,
     { tag: '@electron' },
-    async ({ context, page }, testInfo) => {
-      await context.folderSetupFn(async (dir) => {
-        const bracketDir = path.join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          path.join(bracketDir, 'main.kcl')
-        )
+    async ({ browserName: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        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.setBodyDimensions({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 500 })
       const u = await getUtils(page)
 
       // Locators
@@ -553,17 +539,18 @@ extrude001 = extrude(50, sketch001)
         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,
   }) => {
     const u = await getUtils(page)
 
     // Constants and locators
-    const planeColor: [number, number, number] = [170, 220, 170]
+    const planeColor: [number, number, number] = [161, 220, 155]
     const bgColor: [number, number, number] = [27, 27, 27]
     const middlePixelIsColor = async (color: [number, number, number]) => {
       return u.getGreatestPixDiff({ x: 600, y: 250 }, color)
@@ -574,9 +561,8 @@ extrude001 = extrude(50, sketch001)
       await page.addInitScript(async () => {
         localStorage.setItem('persistCode', '')
       })
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
+      await page.setViewportSize({ width: 1200, height: 500 })
+      await u.waitForAuthSkipAppStart()
       await u.closeKclCodePanel()
     })
 

e2e/playwright/snapshot-tests.spec.ts

@@ -47,11 +47,7 @@ test.beforeEach(async ({ page }) => {
 
 test.setTimeout(60_000)
 
-// 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(
+test(
   'exports of each format should work',
   { tag: ['@snapshot', '@skipWin', '@skipMacos'] },
   async ({ page, context }) => {
@@ -450,8 +446,7 @@ test(
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `
-  |> startProfileAt([7.19, -9.7], %)`
+    code += `profile001 = startProfileAt([7.19, -9.7], sketch001)`
     await expect(page.locator('.cm-content')).toHaveText(code)
     await page.waitForTimeout(100)
 
@@ -473,6 +468,10 @@ test(
       .getByRole('button', { name: 'arc Tangential Arc', exact: true })
       .click()
 
+    // click to continue profile
+    await page.mouse.move(813, 392, { steps: 10 })
+    await page.waitForTimeout(100)
+
     await page.mouse.move(startXPx + PUR * 30, 500 - PUR * 20, { steps: 10 })
 
     await page.waitForTimeout(1000)
@@ -595,8 +594,7 @@ test(
       mask: [page.getByTestId('model-state-indicator')],
     })
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [14.44, -2.44], radius = 1 }, %)`
+      `sketch001 = startSketchOn('XZ')profile001 = circle({ center = [14.44, -2.44], radius = 1 }, sketch001)`
     )
   }
 )
@@ -640,8 +638,7 @@ test.describe(
 
       const startXPx = 600
       await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-      code += `
-  |> startProfileAt([7.19, -9.7], %)`
+      code += `profile001 = startProfileAt([7.19, -9.7], sketch001)`
       await expect(u.codeLocator).toHaveText(code)
       await page.waitForTimeout(100)
 
@@ -659,6 +656,10 @@ test.describe(
         .click()
       await page.waitForTimeout(100)
 
+      // click to continue profile
+      await page.mouse.click(813, 392)
+      await page.waitForTimeout(100)
+
       await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
       code += `
@@ -745,8 +746,7 @@ test.describe(
 
       const startXPx = 600
       await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-      code += `
-  |> startProfileAt([182.59, -246.32], %)`
+      code += `profile001 = startProfileAt([182.59, -246.32], sketch001)`
       await expect(u.codeLocator).toHaveText(code)
       await page.waitForTimeout(100)
 
@@ -764,6 +764,10 @@ test.describe(
         .click()
       await page.waitForTimeout(100)
 
+      // click to continue profile
+      await page.mouse.click(813, 392)
+      await page.waitForTimeout(100)
+
       await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
       code += `
@@ -1168,3 +1172,109 @@ test.fixme('theme persists', async ({ page, context }) => {
     maxDiffPixels: 100,
   })
 })
+
+test.describe('code color goober', { tag: '@snapshot' }, () => {
+  test('code color goober', async ({ page, context }) => {
+    const u = await getUtils(page)
+    await context.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `// Create a pipe using a sweep.
+
+// Create a path for the sweep.
+sweepPath = startSketchOn('XZ')
+  |> startProfileAt([0.05, 0.05], %)
+  |> line([0, 7], %)
+  |> tangentialArc({ offset = 90, radius = 5 }, %)
+  |> line([-3, 0], %)
+  |> tangentialArc({ offset = -90, radius = 5 }, %)
+  |> line([0, 7], %)
+
+sweepSketch = startSketchOn('XY')
+  |> startProfileAt([2, 0], %)
+  |> arc({
+       angleEnd = 360,
+       angleStart = 0,
+       radius = 2
+     }, %)
+  |> sweep({
+    path = sweepPath,
+  }, %)
+  |> appearance({
+       color = "#bb00ff",
+       metalness = 90,
+       roughness = 90
+     }, %)
+`
+      )
+    })
+
+    await page.setViewportSize({ width: 1200, height: 1000 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.clearAndCloseDebugPanel()
+
+    await expect(page, 'expect small color widget').toHaveScreenshot({
+      maxDiffPixels: 100,
+    })
+  })
+
+  test('code color goober opening window', async ({ page, context }) => {
+    const u = await getUtils(page)
+    await context.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `// Create a pipe using a sweep.
+
+// Create a path for the sweep.
+sweepPath = startSketchOn('XZ')
+  |> startProfileAt([0.05, 0.05], %)
+  |> line([0, 7], %)
+  |> tangentialArc({ offset = 90, radius = 5 }, %)
+  |> line([-3, 0], %)
+  |> tangentialArc({ offset = -90, radius = 5 }, %)
+  |> line([0, 7], %)
+
+sweepSketch = startSketchOn('XY')
+  |> startProfileAt([2, 0], %)
+  |> arc({
+       angleEnd = 360,
+       angleStart = 0,
+       radius = 2
+     }, %)
+  |> sweep({
+    path = sweepPath,
+  }, %)
+  |> appearance({
+       color = "#bb00ff",
+       metalness = 90,
+       roughness = 90
+     }, %)
+`
+      )
+    })
+
+    await page.setViewportSize({ width: 1200, height: 1000 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.clearAndCloseDebugPanel()
+
+    await expect(page.locator('.cm-css-color-picker-wrapper')).toBeVisible()
+
+    // Click the color widget
+    await page.locator('.cm-css-color-picker-wrapper input').click()
+
+    await expect(
+      page,
+      'expect small color widget to have window open'
+    ).toHaveScreenshot({
+      maxDiffPixels: 100,
+    })
+  })
+})

e2e/playwright/storageStates.ts

@@ -14,7 +14,7 @@ export const TEST_SETTINGS = {
   },
   modeling: {
     defaultUnit: 'in',
-    mouseControls: 'KittyCAD',
+    mouseControls: 'Zoo',
     cameraProjection: 'perspective',
     showDebugPanel: true,
   },
@@ -109,21 +109,242 @@ keychain = startSketchOn("XY")
   |> close(%)
   |> extrude(thickness, %)
 
-keychain1 = startSketchOn("XY")
-  |> startProfileAt([0, 0], %)
-  |> lineTo([width, 0], %)
-  |> lineTo([width, height], %)
-  |> lineTo([0, height], %)
-  |> close(%)
-  |> extrude(thickness, %)
+// generated from  /home/paultag/Downloads/zma-logomark.svg
+fn svg = (surface, origin, depth) => {
+  let a0 = surface |> startProfileAt([origin[0] + 45.430427, origin[1] + -14.627736], %)
+    |> bezierCurve({
+    control1: [ 0, 0.764157 ],
+    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, %)
 
-keychain2 = startSketchOn("XY")
-  |> startProfileAt([0, 0], %)
-  |> lineTo([width, 0], %)
-  |> lineTo([width, height], %)
-  |> lineTo([0, height], %)
-  |> close(%)
-  |> extrude(thickness, %)
+  let a1 = surface |> startProfileAt([origin[0] + 57.920488, origin[1] + -15.244943], %)
+    |> bezierCurve({
+    control1: [ -2.78904, 0.106635 ],
+    control2: [ -5.052548, -2.969529 ],
+    to: [ -4.055141, -5.598369 ]
+   }, %)
+    |> 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, %)
+
+  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], %)
@@ -133,7 +354,7 @@ box = startSketchOn('XY')
   |> close(%)
   |> extrude(10, %)
 
-sketch001 = startSketchOn(box, revolveAxis)
+  sketch001 = startSketchOn(box, revolveAxis)
   |> startProfileAt([5, 10], %)
   |> line([0, -10], %)
   |> line([2, 0], %)
@@ -143,12 +364,18 @@ sketch001 = startSketchOn(box, revolveAxis)
   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,16 +1,31 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/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'
+
+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,
-    homePage,
+    browserName,
   }) => {
+    // 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     const networkToggle = page.getByTestId('network-toggle')
 
@@ -49,7 +64,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Problem')
+    await expect(networkToggle).toContainText('Offline')
 
     // Click the network widget
     await networkWidget.click()
@@ -80,19 +95,26 @@ test.describe('Test network and connection issues', () => {
 
   test('Engine disconnect & reconnect in sketch mode', async ({
     page,
-    homePage,
+    browserName,
   }) => {
     // 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
     const PUR = 400 / 37.5 //pixeltoUnitRatio
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
-
+    await u.waitForAuthSkipAppStart()
     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()
@@ -110,18 +132,17 @@ test.describe('Test network and connection issues', () => {
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)`)
+    await expect(page.locator('.cm-content')).toHaveText(
+      `sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
+    )
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
     await page.waitForTimeout(100)
 
     await expect(page.locator('.cm-content'))
-      .toHaveText(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
-  |> xLine(${commonPoints.num1}, %)`)
+      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
+    |> xLine(${commonPoints.num1}, %)`)
 
     // Expect the network to be up
     await expect(networkToggle).toContainText('Connected')
@@ -136,7 +157,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Problem')
+    await expect(networkToggle).toContainText('Offline')
 
     // Ensure we are not in sketch mode
     await expect(
@@ -168,7 +189,9 @@ test.describe('Test network and connection issues', () => {
     await page.mouse.click(100, 100)
 
     // select a line
-    await page.getByText(`startProfileAt(${commonPoints.startAt}, %)`).click()
+    await page
+      .getByText(`startProfileAt(${commonPoints.startAt}, sketch001)`)
+      .click()
 
     // enter sketch again
     await u.doAndWaitForCmd(
@@ -182,11 +205,36 @@ test.describe('Test network and connection issues', () => {
 
     await page.waitForTimeout(150)
 
+    const camCommand: EngineCommand = {
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_look_at',
+        center: { x: 109, y: 0, z: -152 },
+        vantage: { x: 115, y: -505, z: -152 },
+        up: { x: 0, y: 0, z: 1 },
+      },
+    }
+    const updateCamCommand: EngineCommand = {
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_get_settings',
+      },
+    }
+    await u.sendCustomCmd(camCommand)
+    await page.waitForTimeout(100)
+    await u.sendCustomCmd(updateCamCommand)
+    await page.waitForTimeout(100)
+
+    // click to continue profile
+    await page.mouse.click(1007, 400)
+    await page.waitForTimeout(100)
     // Ensure we can continue sketching
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
     await expect.poll(u.normalisedEditorCode)
       .toBe(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([12.34, -12.34], %)
+profile001 = startProfileAt([12.34, -12.34], sketch001)
   |> xLine(12.34, %)
   |> line([-12.34, 12.34], %)
 
@@ -196,7 +244,7 @@ test.describe('Test network and connection issues', () => {
 
     await expect.poll(u.normalisedEditorCode)
       .toBe(`sketch001 = startSketchOn('XZ')
-  |> startProfileAt([12.34, -12.34], %)
+profile001 = startProfileAt([12.34, -12.34], sketch001)
   |> xLine(12.34, %)
   |> line([-12.34, 12.34], %)
   |> xLine(-12.34, %)

e2e/playwright/test-utils.ts

@@ -1,20 +1,22 @@
 import {
   expect,
+  Page,
+  Download,
   BrowserContext,
   TestInfo,
   _electron as electron,
   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 path from 'path'
+import { join } from 'path'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
 import { Protocol } from 'playwright-core/types/protocol'
 import type { Models } from '@kittycad/lib'
-import { COOKIE_NAME } from 'lib/constants'
+import { APP_NAME, COOKIE_NAME } from 'lib/constants'
 import { secrets } from './secrets'
 import {
   TEST_SETTINGS_KEY,
@@ -28,134 +30,6 @@ import { isErrorWhitelisted } from './lib/console-error-whitelist'
 import { isArray } from 'lib/utils'
 import { reportRejection } from 'lib/trap'
 
-// The below is copied from playwright-core because it exports none of them :(
-import { Env, BrowserContextOptions } from 'playwright-core'
-import type * as channels from '@protocol/channels'
-
-// Copied from playwright-core
-function envObjectToArray(env: Env): { name: string; value: string }[] {
-  const result: { name: string; value: string }[] = []
-  for (const name in env) {
-    if (!Object.is(env[name], undefined))
-      result.push({ name, value: String(env[name]) })
-  }
-  return result
-}
-
-// Copied from playwright-core
-export async function toClientCertificatesProtocol(
-  certs?: BrowserContextOptions['clientCertificates']
-): Promise<channels.PlaywrightNewRequestParams['clientCertificates']> {
-  if (!certs) return undefined
-
-  const bufferizeContent = async (
-    value?: Buffer,
-    path?: string
-  ): Promise<Buffer | undefined> => {
-    if (value) return value
-    if (path) return await fs.promises.readFile(path)
-  }
-
-  return await Promise.all(
-    certs.map(async (cert) => ({
-      origin: cert.origin,
-      cert: await bufferizeContent(cert.cert, cert.certPath),
-      key: await bufferizeContent(cert.key, cert.keyPath),
-      pfx: await bufferizeContent(cert.pfx, cert.pfxPath),
-      passphrase: cert.passphrase,
-    }))
-  )
-}
-
-// Copied from playwright-core
-function toAcceptDownloadsProtocol(acceptDownloads?: boolean) {
-  if (acceptDownloads === undefined) return undefined
-  if (acceptDownloads) return 'accept'
-  return 'deny'
-}
-
-// Copied from playwright-core
-function prepareRecordHarOptions(
-  options: BrowserContextOptions['recordHar']
-): channels.RecordHarOptions | undefined {
-  if (!options) return
-  return {
-    path: options.path,
-    content: options.content || (options.omitContent ? 'omit' : undefined),
-    urlGlob: isString(options.urlFilter) ? options.urlFilter : undefined,
-    urlRegexSource: isRegExp(options.urlFilter)
-      ? options.urlFilter.source
-      : undefined,
-    urlRegexFlags: isRegExp(options.urlFilter)
-      ? options.urlFilter.flags
-      : undefined,
-    mode: options.mode,
-  }
-}
-
-// Copied from playwright-core
-async function prepareStorageState(
-  options: BrowserContextOptions
-): Promise<channels.BrowserNewContextParams['storageState']> {
-  if (typeof options.storageState !== 'string') return options.storageState
-  try {
-    return JSON.parse(await fs.promises.readFile(options.storageState, 'utf8'))
-  } catch (e) {
-    rewriteErrorMessage(
-      e,
-      `Error reading storage state from ${options.storageState}:\n` + e.message
-    )
-    throw e
-  }
-}
-
-// Copied from playwright-core
-async function prepareBrowserContextParams(
-  options: BrowserContextOptions
-): Promise<channels.BrowserNewContextParams> {
-  if (options.videoSize && !options.videosPath)
-    throw new Error(`"videoSize" option requires "videosPath" to be specified`)
-  if (options.extraHTTPHeaders)
-    network.validateHeaders(options.extraHTTPHeaders)
-  const contextParams: channels.BrowserNewContextParams = {
-    ...options,
-    viewport: options.viewport === null ? undefined : options.viewport,
-    noDefaultViewport: options.viewport === null,
-    extraHTTPHeaders: options.extraHTTPHeaders
-      ? headersObjectToArray(options.extraHTTPHeaders)
-      : undefined,
-    storageState: await prepareStorageState(options),
-    serviceWorkers: options.serviceWorkers,
-    recordHar: prepareRecordHarOptions(options.recordHar),
-    colorScheme:
-      options.colorScheme === null ? 'no-override' : options.colorScheme,
-    reducedMotion:
-      options.reducedMotion === null ? 'no-override' : options.reducedMotion,
-    forcedColors:
-      options.forcedColors === null ? 'no-override' : options.forcedColors,
-    acceptDownloads: toAcceptDownloadsProtocol(options.acceptDownloads),
-    clientCertificates: await toClientCertificatesProtocol(
-      options.clientCertificates
-    ),
-  }
-  if (!contextParams.recordVideo && options.videosPath) {
-    contextParams.recordVideo = {
-      dir: options.videosPath,
-      size: options.videoSize,
-    }
-  }
-  if (contextParams.recordVideo && contextParams.recordVideo.dir)
-    contextParams.recordVideo.dir = path.resolve(
-      process.cwd(),
-      contextParams.recordVideo.dir
-    )
-  return contextParams
-}
-
-const toNormalizedCode = (text: string) => {
-  return text.replace(/\s+/g, '')
-}
-
 type TestColor = [number, number, number]
 export const TEST_COLORS = {
   WHITE: [249, 249, 249] as TestColor,
@@ -224,16 +98,11 @@ async function removeCurrentCode(page: Page) {
 }
 
 export async function sendCustomCmd(page: Page, cmd: EngineCommand) {
-  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-input').fill(JSON.stringify(cmd))
   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()
 }
 
@@ -281,19 +150,6 @@ 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) {
@@ -309,9 +165,6 @@ 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) {
@@ -559,10 +412,6 @@ 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)
@@ -633,18 +482,13 @@ export async function getUtils(page: Page, test_?: typeof test) {
       )
     },
 
-    toNormalizedCode(text: string) {
-      return toNormalizedCode(text)
+    toNormalizedCode: (text: string) => {
+      return text.replace(/\s+/g, '')
     },
 
-    async editorTextMatches(code: string) {
+    editorTextMatches: async (code: string) => {
       const editor = page.locator(editorSelector)
-      return expect
-        .poll(async () => {
-          const text = await editor.textContent()
-          return toNormalizedCode(text ?? '')
-        })
-        .toContain(toNormalizedCode(code))
+      return expect(editor).toHaveText(code, { useInnerText: true })
     },
 
     pasteCodeInEditor: async (code: string) => {
@@ -670,7 +514,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('tree-input-field').fill(name)
+        await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
       })
     },
@@ -830,34 +674,6 @@ 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
@@ -870,8 +686,7 @@ export const doExport = async (
   exportFrom: 'dropdown' | 'sidebarButton' | 'commandBar' = 'dropdown'
 ): Promise<Paths> => {
   if (exportFrom === 'dropdown') {
-    await page.getByTestId('project-sidebar-toggle').click()
-
+    await page.getByRole('button', { name: APP_NAME }).click()
     const exportMenuButton = page.getByRole('button', {
       name: 'Export current part',
     })
@@ -912,12 +727,25 @@ 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: '',
@@ -927,12 +755,15 @@ 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')
@@ -941,12 +772,6 @@ 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 {
@@ -973,8 +798,6 @@ 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,
@@ -985,24 +808,12 @@ export async function setup(
   testInfo?: TestInfo
 ) {
   await context.addInitScript(
-    async ({
-      token,
-      settingsKey,
-      settings,
-      IS_PLAYWRIGHT_KEY,
-      PLAYWRIGHT_TEST_DIR,
-      PERSIST_MODELING_CONTEXT,
-    }) => {
+    async ({ token, settingsKey, settings, IS_PLAYWRIGHT_KEY }) => {
       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,
@@ -1019,8 +830,6 @@ export async function setup(
         } as Partial<SaveSettingsPayload>,
       }),
       IS_PLAYWRIGHT_KEY,
-      PLAYWRIGHT_TEST_DIR: TEST_SETTINGS.app.projectDirectory,
-      PERSIST_MODELING_CONTEXT,
     }
   )
 
@@ -1039,15 +848,12 @@ 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 = undefined
-let context = undefined
-let page = undefined
-
 export async function setupElectron({
   testInfo,
+  folderSetupFn,
   cleanProjectDir = true,
   appSettings,
 }: {
@@ -1070,7 +876,7 @@ export async function setupElectron({
     await fsp.mkdir(projectDirName)
   }
 
-  const options = {
+  const electronApp = await electron.launch({
     args: ['.', '--no-sandbox'],
     env: {
       ...process.env,
@@ -1080,22 +886,14 @@ export async function setupElectron({
     ...(process.env.ELECTRON_OVERRIDE_DIST_PATH
       ? { executablePath: process.env.ELECTRON_OVERRIDE_DIST_PATH + 'electron' }
       : {}),
-  }
-
-  // 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)
-  }
+  })
+  const context = electronApp.context()
+  const page = await electronApp.firstWindow()
+  context.on('console', console.log)
+  page.on('console', console.log)
 
   if (cleanProjectDir) {
-    const tempSettingsFilePath = path.join(projectDirName, SETTINGS_FILE_NAME)
+    const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
     const settingsOverrides = TOML.stringify(
       appSettings
         ? {
@@ -1122,7 +920,11 @@ export async function setupElectron({
     await fsp.writeFile(tempSettingsFilePath, settingsOverrides)
   }
 
-  return { electronApp, page, context, dir: projectDirName, options }
+  await folderSetupFn?.(projectDirName)
+
+  await setup(context, page)
+
+  return { electronApp, page, dir: projectDirName }
 }
 
 function failOnConsoleErrors(page: Page, testInfo?: TestInfo) {
@@ -1208,7 +1010,7 @@ export async function createProject({
 }
 
 export function executorInputPath(fileName: string): string {
-  return path.join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
+  return join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
 }
 
 export async function doAndWaitForImageDiff(
@@ -1299,12 +1101,3 @@ 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,14 +1,23 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import { uuidv4 } from 'lib/utils'
-import { getUtils } from './test-utils'
+import { getUtils, setup, tearDown } 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, homePage }) => {
+  test('Can move camera reliably', async ({ page, context }) => {
+    test.skip(process.platform === 'darwin', 'Can move camera reliably')
     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 u.openAndClearDebugPanel()
     await u.closeKclCodePanel()
 
@@ -174,7 +183,6 @@ test.describe('Testing Camera Movement', () => {
 
   test('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
@@ -182,9 +190,9 @@ test.describe('Testing Camera Movement', () => {
 
     test.skip(process.platform !== 'darwin', 'Zoom should be consistent')
     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 u.openDebugPanel()
 
     await expect(
@@ -336,10 +344,7 @@ test.describe('Testing Camera Movement', () => {
     })
   })
 
-  test(`Zoom by scroll should not fire while orbiting`, async ({
-    page,
-    homePage,
-  }) => {
+  test(`Zoom by scroll should not fire while orbiting`, async ({ page }) => {
     /**
      * Currently we only allow zooming by scroll when no other camera movement is happening,
      * set within cameraMouseDragGuards in cameraControls.ts,
@@ -378,7 +383,7 @@ test.describe('Testing Camera Movement', () => {
     const expectedOrbitCamZPosition = 64.0
 
     await test.step(`Test setup`, async () => {
-      await homePage.goToModelingScene()
+      await u.waitForAuthSkipAppStart()
       await u.closeKclCodePanel()
       // This test requires the mouse controls to be set to Solidworks
       await u.openDebugPanel()
@@ -474,4 +479,26 @@ test.describe('Testing Camera Movement', () => {
       })
     }
   })
+
+  test('Right-click opens context menu when not dragged', async ({ page }) => {
+    const u = await getUtils(page)
+    await u.waitForAuthSkipAppStart()
+
+    await test.step(`The menu should not show if we drag the mouse`, async () => {
+      await page.mouse.move(900, 200)
+      await page.mouse.down({ button: 'right' })
+      await page.mouse.move(900, 300)
+      await page.mouse.up({ button: 'right' })
+
+      await expect(page.getByTestId('view-controls-menu')).not.toBeVisible()
+    })
+
+    await test.step(`The menu should show if we don't drag the mouse`, async () => {
+      await page.mouse.move(900, 200)
+      await page.mouse.down({ button: 'right' })
+      await page.mouse.up({ button: 'right' })
+
+      await expect(page.getByTestId('view-controls-menu')).toBeVisible()
+    })
+  })
 })

e2e/playwright/testing-constraints.spec.ts

@@ -1,14 +1,18 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import {
-  getUtils,
-  TEST_COLORS,
-  pollEditorLinesSelectedLength,
-} from './test-utils'
+import { getUtils, setup, tearDown, TEST_COLORS } from './test-utils'
 import { XOR } 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 constraints', () => {
-  test('Can constrain line length', async ({ page, homePage }) => {
+  test('Can constrain line length', async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -17,44 +21,51 @@ test.describe('Testing constraints', () => {
   |> line([20, 0], %)
   |> line([0, 20], %)
   |> xLine(-20, %)
-    `
+`
       )
     })
 
     const u = await getUtils(page)
-    const PUR = 400 / 37.5 //pixeltoUnitRatio
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    // constants and locators
+    const lengthValue = {
+      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 homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
     // Click the line of code for line.
-    await page.getByText(`line([0, 20], %)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+    // 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()
-
-    // Wait for overlays to populate
-    await page.waitForTimeout(1000)
-
-    const startXPx = 500
-    await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
-    await page.keyboard.down('Shift')
-    await page.mouse.click(834, 244)
-    await page.keyboard.up('Shift')
-
+    await page.waitForTimeout(500) // wait for animation
     await page
       .getByRole('button', { name: 'dimension Length', exact: true })
       .click()
-    await page.getByText('Add constraining value').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 = 20sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
+      `length001 = ${lengthValue.new}sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
     )
 
     // Make sure we didn't pop out of sketch mode.
@@ -62,48 +73,41 @@ test.describe('Testing constraints', () => {
       page.getByRole('button', { name: 'Exit Sketch' })
     ).toBeVisible()
 
-    await page.waitForTimeout(2500) // wait for animation
+    await page.waitForTimeout(500) // wait for animation
 
     // Exit sketch
-    await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
-    await expect
-      .poll(async () => {
-        await page.keyboard.press('Escape', { delay: 500 })
-        return page.getByRole('button', { name: 'Exit Sketch' }).isVisible()
-      })
-      .toBe(true)
+    await page.keyboard.press('Escape')
+    await expect(
+      page.getByRole('button', { name: 'Exit Sketch' })
+    ).not.toBeVisible()
   })
-  test(`Remove constraints`, async ({ page, homePage }) => {
+  test(`Remove constraints`, async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `yo = 79
-  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')
-    |> startProfileAt([299.05, 120], %)
-    |> xLine(-385.34, %, $seg_what)
-    |> yLine(-170.06, %)
-    |> xLine(segLen(seg_what), %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 120], %)
+  |> xLine(-385.34, %, $seg_what)
+  |> yLine(-170.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
       )
     })
     const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     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)
@@ -116,8 +120,8 @@ test.describe('Testing constraints', () => {
     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
@@ -135,75 +139,43 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, offset } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> 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.setBodyDimensions({ width: 1200, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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.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.waitForTimeout(100) // this wait is needed for webkit - not sure why
         await page.keyboard.up('Shift')
-        await page.waitForTimeout(100)
         await page
           .getByRole('button', {
             name: 'Length: open menu',
@@ -231,7 +203,6 @@ test.describe('Testing constraints', () => {
           `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)`
@@ -267,37 +238,33 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
+      test(`${constraint} - ${testName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`),
@@ -377,37 +344,33 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
+      test(`${constraint} - ${testName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1200, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`),
         ])
@@ -418,11 +381,9 @@ test.describe('Testing constraints', () => {
           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)
+        await page.waitForTimeout(100) // this wait is needed for webkit - not sure why
         await page.keyboard.up('Shift')
-        await page.waitForTimeout(100)
         await page
           .getByRole('button', {
             name: 'Length: open menu',
@@ -490,37 +451,33 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, addVariable, value, axisSelect } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1200, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`),
@@ -592,37 +549,33 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`
         )
@@ -668,7 +621,7 @@ test.describe('Testing constraints', () => {
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ context, homePage, page }) => {
+      test(`${testName}`, async ({ page }) => {
         // constants and locators
         const cmdBarKclInput = page
           .getByTestId('cmd-bar-arg-value')
@@ -698,9 +651,9 @@ part002 = startSketchOn('XZ')
           )
         })
         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.getByText('line([74.36, 130.4], %)').click()
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
@@ -756,37 +709,33 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page }) => {
         await page.addInitScript(async (customCode) => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`
         )
@@ -805,8 +754,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',
@@ -857,36 +806,32 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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}"]`)
 
@@ -913,8 +858,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(
@@ -938,47 +883,40 @@ part002 = startSketchOn('XZ')
       },
     ] as const
     for (const { codeAfter, constraintName, axisClick } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page }) => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
             `yo = 5
-      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')
-        |> startProfileAt([299.05, 231.45], %)
-        |> xLine(-425.34, %, $seg_what)
-        |> yLine(-264.06, %)
-        |> xLine(segLen(seg_what), %)
-        |> lineTo([profileStartX(%), profileStartY(%)], %)`
+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')
+  |> startProfileAt([299.05, 231.45], %)
+  |> xLine(-425.34, %, $seg_what)
+  |> yLine(-264.06, %)
+  |> xLine(segLen(seg_what), %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
         const u = await getUtils(page)
-        await page.setBodyDimensions({ width: 1200, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
 
-        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await u.waitForAuthSkipAppStart()
 
         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',
         })
@@ -1000,23 +938,30 @@ part002 = startSketchOn('XZ')
 
   test('Horizontally constrained line remains selected after applying constraint', async ({
     page,
-    homePage,
   }) => {
     test.setTimeout(70_000)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-1.05, -1.07], %)
-    |> line([3.79, 2.68], %, $seg01)
-    |> line([3.13, -2.4], %)`
+  |> startProfileAt([-1.05, -1.07], %)
+  |> line([3.79, 2.68], %, $seg01)
+  |> line([3.13, -2.4], %)`
       )
     })
-    const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    // 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 u.waitForAuthSkipAppStart()
 
     await page.getByText('line([3.79, 2.68], %, $seg01)').click()
     await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeEnabled(
@@ -1024,9 +969,6 @@ part002 = startSketchOn('XZ')
     )
     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"]`,
@@ -1047,17 +989,11 @@ part002 = startSketchOn('XZ')
         name: 'Length: open menu',
       })
       .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"]')
@@ -1067,17 +1003,11 @@ part002 = startSketchOn('XZ')
       `[data-overlay-index="1"]`,
       0
     )
+    expect(
+      await u.getGreatestPixDiff(lineAfter, TEST_COLORS.BLUE)
+    ).toBeLessThan(3)
 
-    const linebb = await u.getBoundingBox('[data-overlay-index="1"]')
-    await page.mouse.move(linebb.x, linebb.y, { steps: 25 })
-    await page.mouse.click(linebb.x, linebb.y)
-
-    await expect
-      .poll(async () => await u.getGreatestPixDiff(lineAfter, TEST_COLORS.BLUE))
-      .toBeLessThan(3)
-
-    await page.waitForTimeout(500)
-
+    await page.waitForTimeout(300)
     await page
       .getByRole('button', {
         name: 'Length: open menu',
@@ -1088,10 +1018,9 @@ part002 = startSketchOn('XZ')
     // await page.getByRole('button', { name: 'length', exact: true }).click()
     await page.getByTestId('dropdown-constraint-length').click()
 
-    await page.getByLabel('length Value').fill('10')
-    await page.getByRole('button', { name: 'Add constraining value' }).click()
+    await cmdBarKclInput.fill('10')
+    await cmdBarSubmitButton.click()
 
-    await pollEditorLinesSelectedLength(page, 1)
     activeLinesContent = await page.locator('.cm-activeLine').all()
     await expect(activeLinesContent[0]).toHaveText(`|> xLine(length001, %)`)
 

e2e/playwright/testing-gizmo.spec.ts

@@ -1,9 +1,18 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
+import { _test, _expect } from './playwright-deprecated'
+import { test } from './fixtures/fixtureSetup'
+import { getUtils, setup, tearDown } from './test-utils'
 import { uuidv4 } from 'lib/utils'
 import { TEST_CODE_GIZMO } from './storageStates'
 
-test.describe('Testing Gizmo', () => {
+_test.beforeEach(async ({ context, page }, testInfo) => {
+  await setup(context, page, testInfo)
+})
+
+_test.afterEach(async ({ page }, testInfo) => {
+  await tearDown(page, testInfo)
+})
+
+_test.describe('Testing Gizmo', () => {
   const cases = [
     {
       testDescription: 'top view',
@@ -48,17 +57,14 @@ test.describe('Testing Gizmo', () => {
     expectedCameraTarget,
     testDescription,
   } of cases) {
-    test(`check ${testDescription}`, async ({ page, homePage }) => {
+    _test(`check ${testDescription}`, async ({ page, browserName }) => {
       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 page.setBodyDimensions({ width: 1000, height: 500 })
-
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
-
+      await u.waitForAuthSkipAppStart()
       await page.waitForTimeout(100)
       // wait for execution done
       await u.openDebugPanel()
@@ -111,30 +117,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, homePage }) => {
+  _test('Context menu and popover menu', async ({ page }) => {
     const testCase = {
       testDescription: 'Right view',
       expectedCameraPosition: { x: 5660.02, y: -152, z: 26 },
@@ -146,9 +152,9 @@ test.describe('Testing Gizmo', () => {
     await page.addInitScript((TEST_CODE_GIZMO) => {
       localStorage.setItem('persistCode', TEST_CODE_GIZMO)
     }, TEST_CODE_GIZMO)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
     await page.waitForTimeout(100)
     // wait for execution done
     await u.openDebugPanel()
@@ -190,7 +196,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
@@ -209,23 +215,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()
       ),
     ])
@@ -236,59 +242,32 @@ 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 ({
-    context,
-    page,
-    homePage,
+    app,
     cmdBar,
     editor,
     toolbar,
     scene,
   }) => {
-    await context.addInitScript(() => {
-      localStorage.setItem(
-        '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()
+    test.skip(
+      process.platform === 'win32',
+      'Fails on windows in CI, can not be replicated locally on windows.'
+    )
 
     await test.step(`Setup`, async () => {
+      const file = await app.getInputFile('test-circle-extrude.kcl')
+      await app.initialise(file)
       await scene.expectState({
         camera: {
-          position: [11912.6, -39586.98, 21391.21],
-          target: [11912.6, -635, 3317.49],
+          position: [4982.21, -23865.37, 13810.64],
+          target: [4982.21, 0, 2737.1],
         },
       })
     })
@@ -296,7 +275,7 @@ test.describe(`Testing gizmo, fixture-based`, () => {
 
     await test.step(`Select an edge of this circle`, async () => {
       const circleSnippet =
-        'circle({ center: [818.33, 168.1], radius: 182.8 }, %)'
+        'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
       await moveToCircle()
       await clickCircle()
       await editor.expectState({
@@ -313,8 +292,8 @@ test.describe(`Testing gizmo, fixture-based`, () => {
     await test.step(`Verify the camera moved`, async () => {
       await scene.expectState({
         camera: {
-          position: [20785.58, -40221.98, 22343.46],
-          target: [20785.58, -1270, 4269.74],
+          position: [0, -23865.37, 11073.53],
+          target: [0, 0, 0],
         },
       })
     })

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

@@ -1,8 +1,18 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
+import { test, expect } from '@playwright/test'
+import { getUtils, setup, tearDown } 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.fixme('via command palette and toggle', async ({ page, homePage }) => {
+  test('via command palette and toggle', async ({ page }) => {
     const u = await getUtils(page)
 
     // Locators and constants
@@ -10,7 +20,7 @@ test.describe('Test toggling perspective', () => {
     const screenHeight = 500
     const checkedScreenLocation = {
       x: screenWidth * 0.71,
-      y: screenHeight * 0.2,
+      y: screenHeight * 0.4,
     }
     const backgroundColor: [number, number, number] = [29, 29, 29]
     const xzPlaneColor: [number, number, number] = [82, 55, 96]
@@ -30,8 +40,8 @@ test.describe('Test toggling perspective', () => {
     })
 
     await test.step('Setup', async () => {
-      await page.setBodyDimensions({ width: screenWidth, height: screenHeight })
-      await homePage.goToModelingScene()
+      await page.setViewportSize({ width: screenWidth, height: screenHeight })
+      await u.waitForAuthSkipAppStart()
       await u.closeKclCodePanel()
       await expect
         .poll(async () => locationToHaveColor(backgroundColor), {
@@ -42,17 +52,11 @@ 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,
@@ -63,9 +67,27 @@ 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 page.waitForTimeout(1000)
-      await u.closeKclCodePanel()
+      await u.waitForAuthSkipAppStart()
       await expect
         .poll(async () => locationToHaveColor(xzPlaneColor), {
           timeout: 5000,

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

@@ -1,30 +1,35 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
+import { test, expect } from '@playwright/test'
+import { getUtils, setup, setupElectron, tearDown } 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 context.addInitScript((code) => {
+      await page.addInitScript((code) => {
         window.localStorage.setItem('persistCode', code)
       }, bracket)
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
+      await page.setViewportSize({ width: 1200, height: 500 })
+      await u.waitForAuthSkipAppStart()
     })
 
     // Locators and constants
@@ -49,13 +54,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 editor.scrollToText(bracket.split('\n')[0])
-      await editor.expectEditor.toContain(bracket.split('\n')[0])
+      await expect(codeLocator).toContainText(bracket.split('\n')[0])
     })
 
     await test.step(`Load a KCL sample with the command palette`, async () => {
@@ -68,7 +73,7 @@ test.describe('Testing in-app sample loading', () => {
       await expect(warningText).toBeVisible()
       await confirmButton.click()
 
-      await editor.expectEditor.toContain('// ' + newSample.title)
+      await expect(codeLocator).toContainText('// ' + newSample.title)
       await expect(unitsToast('in')).toBeVisible()
     })
   })
@@ -81,13 +86,16 @@ test.describe('Testing in-app sample loading', () => {
   test(
     'Desktop: should create new file by default, optionally overwrite',
     { tag: '@electron' },
-    async ({ editor, context, page }, testInfo) => {
-      const { dir } = await context.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',
-        })
+    async ({ browserName: _ }, testInfo) => {
+      const { electronApp, page, dir } = await setupElectron({
+        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)
 
@@ -126,19 +134,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.setBodyDimensions({ width: 1200, height: 500 })
+        await page.setViewportSize({ width: 1200, height: 500 })
         await projectCard.click()
         await u.waitForPageLoad()
       })
 
       await test.step(`Precondition: check the initial code`, async () => {
         await u.openKclCodePanel()
-        await editor.scrollToText(bracket.split('\n')[0])
-        await editor.expectEditor.toContain(bracket.split('\n')[0])
+        await expect(codeLocator).toContainText(bracket.split('\n')[0])
         await u.openFilePanel()
 
         await expect(projectMenuButton).toContainText('main.kcl')
@@ -155,7 +163,7 @@ test.describe('Testing in-app sample loading', () => {
       })
 
       await test.step(`Ensure we made and opened a new file`, async () => {
-        await editor.expectEditor.toContain('// ' + sampleOne.title)
+        await expect(codeLocator).toContainText('// ' + sampleOne.title)
         await expect(newlyCreatedFile(sampleOne.file)).toBeVisible()
         await expect(projectMenuButton).toContainText(sampleOne.file)
         await expect(unitsToast('in')).toBeVisible()
@@ -174,7 +182,7 @@ test.describe('Testing in-app sample loading', () => {
       })
 
       await test.step(`Ensure we overwrote the current file without navigating`, async () => {
-        await editor.expectEditor.toContain('// ' + sampleTwo.title)
+        await expect(codeLocator).toContainText('// ' + sampleTwo.title)
         await test.step(`Check actual file contents`, async () => {
           await expect
             .poll(async () => {
@@ -190,6 +198,8 @@ test.describe('Testing in-app sample loading', () => {
         await expect(projectMenuButton).toContainText(sampleOne.file)
         await expect(unitsToast('mm')).toBeVisible()
       })
+
+      await electronApp.close()
     }
   )
 })

e2e/playwright/testing-selections.spec.ts

@@ -1,16 +1,24 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import { commonPoints, getUtils } from './test-utils'
+import { commonPoints, getUtils, setup, tearDown } 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, homePage }) => {
+    async ({ page }) => {
       // Skip on windows its being weird.
       test.skip(process.platform === 'win32', 'Skip on windows')
 
@@ -19,9 +27,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.setBodyDimensions({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+      await u.waitForAuthSkipAppStart()
       await u.openDebugPanel()
 
       const yAxisClick = () =>
@@ -69,33 +77,34 @@ test.describe('Testing selections', () => {
       const startXPx = 600
       await u.closeDebugPanel()
       await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-      await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn('XZ')
-      |> startProfileAt(${commonPoints.startAt}, %)`)
+      await expect(page.locator('.cm-content')).toHaveText(
+        `sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
+      )
 
       await page.waitForTimeout(100)
       await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
       await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn('XZ')
-      |> startProfileAt(${commonPoints.startAt}, %)
-      |> xLine(${commonPoints.num1}, %)`)
+        .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
+    |> xLine(${commonPoints.num1}, %)`)
 
       await page.waitForTimeout(100)
       await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
       await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn('XZ')
-      |> startProfileAt(${commonPoints.startAt}, %)
-      |> xLine(${commonPoints.num1}, %)
-      |> yLine(${commonPoints.num1 + 0.01}, %)`)
+        .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
+        commonPoints.startAt
+      }, sketch001)
+    |> xLine(${commonPoints.num1}, %)
+    |> yLine(${commonPoints.num1 + 0.01}, %)`)
       await page.waitForTimeout(100)
       await page.mouse.click(startXPx, 500 - PUR * 20)
       await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn('XZ')
-      |> startProfileAt(${commonPoints.startAt}, %)
-      |> xLine(${commonPoints.num1}, %)
-      |> yLine(${commonPoints.num1 + 0.01}, %)
-      |> xLine(${commonPoints.num2 * -1}, %)`)
+        .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
+        commonPoints.startAt
+      }, sketch001)
+    |> xLine(${commonPoints.num1}, %)
+    |> yLine(${commonPoints.num1 + 0.01}, %)
+    |> xLine(${commonPoints.num2 * -1}, %)`)
 
       // deselect line tool
       await page.getByRole('button', { name: 'line Line', exact: true }).click()
@@ -256,78 +265,100 @@ test.describe('Testing selections', () => {
     }
   )
 
-  test('Solids should be select and deletable', async ({ page, homePage }) => {
+  test('Solids should be select and deletable', async ({ page }) => {
     test.setTimeout(90_000)
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-      |> startProfileAt([-79.26, 95.04], %)
-      |> line([112.54, 127.64], %, $seg02)
-      |> line([170.36, -121.61], %, $seg01)
-      |> lineTo([profileStartX(%), profileStartY(%)], %)
-      |> close(%)
-  extrude001 = extrude(50, sketch001)
-  sketch005 = startSketchOn(extrude001, 'END')
-    |> startProfileAt([23.24, 136.52], %)
-    |> line([-8.44, 36.61], %)
-    |> line([49.4, 2.05], %)
-    |> line([29.69, -46.95], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  sketch003 = startSketchOn(extrude001, seg01)
-    |> startProfileAt([21.23, 17.81], %)
-    |> line([51.97, 21.32], %)
-    |> line([4.07, -22.75], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  sketch002 = startSketchOn(extrude001, seg02)
-    |> startProfileAt([-100.54, 16.99], %)
-    |> line([0, 20.03], %)
-    |> line([62.61, 0], %, $seg03)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude002 = extrude(50, sketch002)
-  sketch004 = startSketchOn(extrude002, seg03)
-    |> startProfileAt([57.07, 134.77], %)
-    |> line([-4.72, 22.84], %)
-    |> line([28.8, 6.71], %)
-    |> line([9.19, -25.33], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude003 = extrude(20, sketch004)
-  pipeLength = 40
-  pipeSmallDia = 10
-  pipeLargeDia = 20
-  thickness = 0.5
-  part009 = startSketchOn('XY')
-    |> startProfileAt([pipeLargeDia - (thickness / 2), 38], %)
-    |> line([thickness, 0], %)
-    |> line([0, -1], %)
-    |> angledLineToX({
-     angle = 60,
-     to = pipeSmallDia + thickness
-   }, %)
-    |> line([0, -pipeLength], %)
-    |> angledLineToX({
-     angle = -60,
-     to = pipeLargeDia + thickness
-   }, %)
-    |> line([0, -1], %)
-    |> line([-thickness, 0], %)
-    |> line([0, 1], %)
-    |> angledLineToX({ angle = 120, to = pipeSmallDia }, %)
-    |> line([0, pipeLength], %)
-    |> angledLineToX({ angle = 60, to = pipeLargeDia }, %)
-    |> close(%)
-  rev = revolve({ axis: 'y' }, part009)
-  `
+        |> startProfileAt([-79.26, 95.04], %)
+        |> line([112.54, 127.64], %, $seg02)
+        |> line([170.36, -121.61], %, $seg01)
+        |> lineTo([profileStartX(%), profileStartY(%)], %)
+        |> close(%)
+extrude001 = extrude(50, sketch001)
+sketch005 = startSketchOn(extrude001, 'END')
+  |> startProfileAt([23.24, 136.52], %)
+  |> line([-8.44, 36.61], %)
+  |> line([49.4, 2.05], %)
+  |> line([29.69, -46.95], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+sketch003 = startSketchOn(extrude001, seg01)
+  |> startProfileAt([21.23, 17.81], %)
+  |> line([51.97, 21.32], %)
+  |> line([4.07, -22.75], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+sketch002 = startSketchOn(extrude001, seg02)
+  |> startProfileAt([-100.54, 16.99], %)
+  |> line([0, 20.03], %)
+  |> line([62.61, 0], %, $seg03)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude002 = extrude(50, sketch002)
+sketch004 = startSketchOn(extrude002, seg03)
+  |> startProfileAt([57.07, 134.77], %)
+  |> line([-4.72, 22.84], %)
+  |> line([28.8, 6.71], %)
+  |> line([9.19, -25.33], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude003 = extrude(20, sketch004)
+pipeLength = 40
+pipeSmallDia = 10
+pipeLargeDia = 20
+thickness = 0.5
+part009 = startSketchOn('XY')
+  |> startProfileAt([pipeLargeDia - (thickness / 2), 38], %)
+  |> line([thickness, 0], %)
+  |> line([0, -1], %)
+  |> angledLineToX({
+       angle = 60,
+       to = pipeSmallDia + thickness
+     }, %)
+  |> line([0, -pipeLength], %)
+  |> angledLineToX({
+       angle = -60,
+       to = pipeLargeDia + thickness
+     }, %)
+  |> line([0, -1], %)
+  |> line([-thickness, 0], %)
+  |> line([0, 1], %)
+  |> angledLineToX({ angle = 120, to = pipeSmallDia }, %)
+  |> line([0, pipeLength], %)
+  |> angledLineToX({ angle = 60, to = pipeLargeDia }, %)
+  |> close(%)
+rev = revolve({ axis = 'y' }, part009)
+sketch006 = startSketchOn('XY')
+profile001 = circle({
+  center = [42.91, -70.42],
+  radius = 17.96
+}, sketch006)
+profile002 = startProfileAt([86.92, -63.81], sketch006)
+  |> angledLine([0, 63.81], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       17.05
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+profile003 = startProfileAt([40.16, -120.48], sketch006)
+  |> line([26.95, 24.21], %)
+  |> line([20.91, -28.61], %)
+  |> line([32.46, 18.71], %)
+
+`
       )
     }, KCL_DEFAULT_LENGTH)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.goto('/')
+    await u.waitForAuthSkipAppStart()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -354,9 +385,10 @@ test.describe('Testing selections', () => {
     })
     await page.waitForTimeout(100)
 
-    const revolve = { x: 646, y: 248 }
+    const revolve = { x: 635, y: 253 }
     const parentExtrude = { x: 915, y: 133 }
     const solid2d = { x: 770, y: 167 }
+    const individualProfile = { x: 694, y: 432 }
 
     // DELETE REVOLVE
     await page.mouse.click(revolve.x, revolve.y)
@@ -387,29 +419,29 @@ test.describe('Testing selections', () => {
       `extrude001 = extrude(50, sketch001)`
     )
     await expect(u.codeLocator).toContainText(`sketch005 = startSketchOn({
-     plane = {
-       origin = { x = 0, y = -50, z = 0 },
-       x_axis = { x = 1, y = 0, z = 0 },
-       y_axis = { x = 0, y = 0, z = 1 },
-       z_axis = { x = 0, y = -1, z = 0 }
-     }
-   })`)
+       plane = {
+         origin = { x = 0, y = -50, z = 0 },
+         x_axis = { x = 1, y = 0, z = 0 },
+         y_axis = { x = 0, y = 0, z = 1 },
+         z_axis = { x = 0, y = -1, z = 0 }
+       }
+     })`)
     await expect(u.codeLocator).toContainText(`sketch003 = startSketchOn({
-     plane = {
-       origin = { x = 116.53, y = 0, z = 163.25 },
-       x_axis = { x = -0.81, y = 0, z = 0.58 },
-       y_axis = { x = 0, y = -1, z = 0 },
-       z_axis = { x = 0.58, y = 0, z = 0.81 }
-     }
-   })`)
+       plane = {
+         origin = { x = 116.53, y = 0, z = 163.25 },
+         x_axis = { x = -0.81, y = 0, z = 0.58 },
+         y_axis = { x = 0, y = -1, z = 0 },
+         z_axis = { x = 0.58, y = 0, z = 0.81 }
+       }
+     })`)
     await expect(u.codeLocator).toContainText(`sketch002 = startSketchOn({
-     plane = {
-       origin = { x = -91.74, y = 0, z = 80.89 },
-       x_axis = { x = -0.66, y = 0, z = -0.75 },
-       y_axis = { x = 0, y = -1, z = 0 },
-       z_axis = { x = -0.75, y = 0, z = 0.66 }
-     }
-   })`)
+       plane = {
+         origin = { x = -91.74, y = 0, z = 80.89 },
+         x_axis = { x = -0.66, y = 0, z = -0.75 },
+         y_axis = { x = 0, y = -1, z = 0 },
+         z_axis = { x = -0.75, y = 0, z = 0.66 }
+       }
+     })`)
 
     // DELETE SOLID 2D
     await page.mouse.click(solid2d.x, solid2d.y)
@@ -422,35 +454,48 @@ test.describe('Testing selections', () => {
     await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
     await page.waitForTimeout(200)
     await expect(u.codeLocator).not.toContainText(`sketch005 = startSketchOn({`)
+
+    // Delete a single profile
+    await page.mouse.click(individualProfile.x, individualProfile.y)
+    await page.waitForTimeout(100)
+    const codeToBeDeletedSnippet =
+      'profile003 = startProfileAt([40.16, -120.48], sketch006)'
+    await expect(page.locator('.cm-activeLine')).toHaveText(
+      '  |> line([20.91, -28.61], %)'
+    )
+    await u.clearCommandLogs()
+    await page.keyboard.press('Backspace')
+    await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
+    await page.waitForTimeout(200)
+    await expect(u.codeLocator).not.toContainText(codeToBeDeletedSnippet)
   })
   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 () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-    |> startProfileAt([-79.26, 95.04], %)
-    |> line([112.54, 127.64], %, $seg02)
-    |> line([170.36, -121.61], %, $seg01)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude001 = extrude(50, sketch001)
-  launderExtrudeThroughVar = extrude001
-  sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
-    |> startProfileAt([-100.54, 16.99], %)
-    |> line([0, 20.03], %)
-    |> line([62.61, 0], %, $seg03)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  `
+  |> startProfileAt([-79.26, 95.04], %)
+  |> line([112.54, 127.64], %, $seg02)
+  |> line([170.36, -121.61], %, $seg01)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(50, sketch001)
+launderExtrudeThroughVar = extrude001
+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.setBodyDimensions({ width: 1000, height: 500 })
-
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1000, height: 500 })
+    await page.goto('/')
+    await u.waitForAuthSkipAppStart()
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
@@ -490,38 +535,37 @@ test.describe('Testing selections', () => {
   })
   test('Hovering over 3d features highlights code, clicking puts the cursor in the right place and sends selection id to engine', async ({
     page,
-    homePage,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async (KCL_DEFAULT_LENGTH) => {
       localStorage.setItem(
         'persistCode',
         `part001 = startSketchOn('XZ')
-  |> startProfileAt([20, 0], %)
-  |> line([7.13, 4 + 0], %)
-  |> angledLine({ angle = 3 + 0, length = 3.14 + 0 }, %)
-  |> lineTo([20.14 + 0, -0.14 + 0], %)
-  |> xLineTo(29 + 0, %)
-  |> yLine(-3.14 + 0, %, $a)
-  |> xLine(1.63, %)
-  |> angledLineOfXLength({ angle = 3 + 0, length = 3.14 }, %)
-  |> angledLineOfYLength({ angle = 30, length = 3 + 0 }, %)
-  |> angledLineToX({ angle = 22.14 + 0, to = 12 }, %)
-  |> angledLineToY({ angle = 30, to = 11.14 }, %)
-  |> angledLineThatIntersects({
-        angle = 3.14,
-        intersectTag = a,
-        offset = 0
-      }, %)
-  |> tangentialArcTo([13.14 + 0, 13.14], %)
-  |> close(%)
-  |> extrude(5 + 7, %)
-    `
+    |> startProfileAt([20, 0], %)
+    |> line([7.13, 4 + 0], %)
+    |> angledLine({ angle = 3 + 0, length = 3.14 + 0 }, %)
+    |> lineTo([20.14 + 0, -0.14 + 0], %)
+    |> xLineTo(29 + 0, %)
+    |> yLine(-3.14 + 0, %, $a)
+    |> xLine(1.63, %)
+    |> angledLineOfXLength({ angle = 3 + 0, length = 3.14 }, %)
+    |> angledLineOfYLength({ angle = 30, length = 3 + 0 }, %)
+    |> angledLineToX({ angle = 22.14 + 0, to = 12 }, %)
+    |> angledLineToY({ angle = 30, to = 11.14 }, %)
+    |> angledLineThatIntersects({
+          angle = 3.14,
+          intersectTag = a,
+          offset = 0
+        }, %)
+    |> tangentialArcTo([13.14 + 0, 13.14], %)
+    |> close(%)
+    |> extrude(5 + 7, %)
+  `
       )
     }, KCL_DEFAULT_LENGTH)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -644,7 +688,7 @@ test.describe('Testing selections', () => {
     await checkCodeAtHoverPosition(
       'flatExtrusionFace',
       flatExtrusionFace,
-      `angledLineThatIntersects({angle:3.14,intersectTag:a,offset:0},%)extrude(5+7,%)`,
+      `angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)extrude(5+7,%)`,
       '}, %)'
     )
 
@@ -701,19 +745,19 @@ test.describe('Testing selections', () => {
     await checkCodeAtHoverPosition(
       'straightSegmentEdge',
       straightSegmentEdge,
-      `angledLineToY({angle:30,to:11.14},%)`,
-      'angledLineToY({ angle: 30, to: 11.14 }, %)'
+      `angledLineToY({angle=30,to=11.14},%)`,
+      'angledLineToY({ angle = 30, to = 11.14 }, %)'
     )
     await checkCodeAtHoverPosition(
       'straightSegmentOppositeEdge',
       straightSegmentOppositeEdge,
-      `angledLineToY({angle:30,to:11.14},%)`,
-      'angledLineToY({ angle: 30, to: 11.14 }, %)'
+      `angledLineToY({angle=30,to=11.14},%)`,
+      'angledLineToY({ angle = 30, to = 11.14 }, %)'
     )
     await checkCodeAtHoverPosition(
       'straightSegmentAdjacentEdge',
       straightSegmentAdjacentEdge,
-      `angledLineThatIntersects({angle:3.14,intersectTag:a,offset:0},%)`,
+      `angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)`,
       '}, %)'
     )
 
@@ -721,29 +765,29 @@ test.describe('Testing selections', () => {
 
     await u.removeCurrentCode()
     await u.codeLocator.fill(`sketch001 = startSketchOn('XZ')
-    |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
-    |> angledLine([0, 268.43], %, $rectangleSegmentA001)
-    |> angledLine([
-     segAng(rectangleSegmentA001) - 90,
-     217.26
-   ], %, $seg01)
-    |> angledLine([
-     segAng(rectangleSegmentA001),
-     -segLen(rectangleSegmentA001)
-   ], %, $yo)
-    |> lineTo([profileStartX(%), profileStartY(%)], %, $seg02)
-    |> close(%)
-  extrude001 = extrude(100, sketch001)
-    |> chamfer({
-     length = 30,
-     tags = [
-       seg01,
-       getNextAdjacentEdge(yo),
-       getNextAdjacentEdge(seg02),
-       getOppositeEdge(seg01)
-     ]
-   }, %)
-  `)
+  |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
+  |> angledLine([0, 268.43], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       217.26
+     ], %, $seg01)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $yo)
+  |> lineTo([profileStartX(%), profileStartY(%)], %, $seg02)
+  |> close(%)
+extrude001 = extrude(100, sketch001)
+  |> chamfer({
+       length = 30,
+       tags = [
+         seg01,
+         getNextAdjacentEdge(yo),
+         getNextAdjacentEdge(seg02),
+         getOppositeEdge(seg01)
+       ]
+     }, %)
+`)
     await expect(
       page.getByTestId('model-state-indicator-execution-done')
     ).toBeVisible()
@@ -780,14 +824,14 @@ test.describe('Testing selections', () => {
     await checkCodeAtHoverPosition(
       'oppositeChamfer',
       oppositeChamfer,
-      `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)chamfer({length:30,tags:[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
+      `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)chamfer({length=30,tags=[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
       '}, %)'
     )
 
     await checkCodeAtHoverPosition(
       'baseChamfer',
       baseChamfer,
-      `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)chamfer({length:30,tags:[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
+      `angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)chamfer({length=30,tags=[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
       '}, %)'
     )
 
@@ -818,58 +862,52 @@ test.describe('Testing selections', () => {
     await checkCodeAtHoverPosition(
       'adjacentChamfer1',
       adjacentChamfer1,
-      `lineTo([profileStartX(%),profileStartY(%)],%,$seg02)chamfer({length:30,tags:[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
+      `lineTo([profileStartX(%),profileStartY(%)],%,$seg02)chamfer({length=30,tags=[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
       '}, %)'
     )
 
     await checkCodeAtHoverPosition(
       'adjacentChamfer2',
       adjacentChamfer2,
-      `angledLine([segAng(rectangleSegmentA001),-segLen(rectangleSegmentA001)],%,$yo)chamfer({length:30,tags:[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
+      `angledLine([segAng(rectangleSegmentA001),-segLen(rectangleSegmentA001)],%,$yo)chamfer({length=30,tags=[seg01,getNextAdjacentEdge(yo),getNextAdjacentEdge(seg02),getOppositeEdge(seg01)]},%)`,
       '}, %)'
     )
   })
   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',
         `sketch001 = startSketchOn('XZ')
-    |> startProfileAt([3.29, 7.86], %)
-    |> line([2.48, 2.44], %)
-    |> line([2.66, 1.17], %)
-    |> line([3.75, 0.46], %)
-    |> line([4.99, -0.46], %, $seg01)
-    |> line([3.3, -2.12], %)
-    |> line([2.16, -3.33], %)
-    |> line([0.85, -3.08], %)
-    |> line([-0.18, -3.36], %)
-    |> line([-3.86, -2.73], %)
-    |> line([-17.67, 0.85], %)
-    |> close(%)
-  extrude001 = extrude(10, sketch001)
-    `
+  |> startProfileAt([3.29, 7.86], %)
+  |> line([2.48, 2.44], %)
+  |> line([2.66, 1.17], %)
+  |> line([3.75, 0.46], %)
+  |> line([4.99, -0.46], %, $seg01)
+  |> line([3.3, -2.12], %)
+  |> line([2.16, -3.33], %)
+  |> line([0.85, -3.08], %)
+  |> line([-0.18, -3.36], %)
+  |> line([-3.86, -2.73], %)
+  |> line([-17.67, 0.85], %)
+  |> close(%)
+extrude001 = extrude(10, sketch001)
+  `
       )
     })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
-    const selectUnExtrudable = async () => {
-      await editor.scrollToText(`line([4.99, -0.46], %, $seg01)`)
-      await page.getByText(`line([4.99, -0.46], %, $seg01)`).click()
-    }
+    const selectUnExtrudable = () =>
+      page.getByText(`line([4.99, -0.46], %, $seg01)`).click()
     const clickEmpty = () => page.mouse.click(700, 460)
     await selectUnExtrudable()
     // expect extrude button to be disabled
@@ -879,18 +917,17 @@ test.describe('Testing selections', () => {
 
     // 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)
-    |> startProfileAt([-12.94, 6.6], %)
-    |> line([2.45, -0.2], %)
-    |> line([-2, -1.25], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  `
+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()
@@ -905,23 +942,23 @@ test.describe('Testing selections', () => {
     ).not.toBeDisabled()
   })
 
-  test('Fillet button states test', async ({ page, homePage }) => {
+  test('Fillet button states test', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-    |> startProfileAt([-5, -5], %)
-    |> line([0, 10], %)
-    |> line([10, 0], %)
-    |> line([0, -10], %)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)`
+  |> startProfileAt([-5, -5], %)
+  |> line([0, 10], %)
+  |> line([10, 0], %)
+  |> line([0, -10], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)`
       )
     })
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
+    await page.setViewportSize({ width: 1000, height: 500 })
+    await u.waitForAuthSkipAppStart()
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
@@ -938,7 +975,7 @@ test.describe('Testing selections', () => {
 
     // 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()
@@ -959,7 +996,6 @@ test.describe('Testing selections', () => {
 
   test('Testing selections (and hovers) work on sketches when NOT in sketch mode', async ({
     page,
-    homePage,
   }) => {
     const cases = [
       {
@@ -980,21 +1016,21 @@ test.describe('Testing selections', () => {
         localStorage.setItem(
           'persistCode',
           `yo = 79
-  part001 = startSketchOn('XZ')
-    |> startProfileAt([-7.54, -26.74], %)
-    |> ${cases[0].expectedCode}
-    |> line([-3.19, -138.43], %)
-    |> ${cases[1].expectedCode}
-    |> line([41.19, 28.97 + 5], %)
-    |> ${cases[2].expectedCode}`
+part001 = startSketchOn('XZ')
+  |> startProfileAt([-7.54, -26.74], %)
+  |> ${cases[0].expectedCode}
+  |> line([-3.19, -138.43], %)
+  |> ${cases[1].expectedCode}
+  |> line([41.19, 28.97 + 5], %)
+  |> ${cases[2].expectedCode}`
         )
       },
       { cases }
     )
     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 u.openAndClearDebugPanel()
 
     await u.sendCustomCmd({
@@ -1027,25 +1063,24 @@ test.describe('Testing selections', () => {
   })
   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(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-    |> startProfileAt([-79.26, 95.04], %)
-    |> line([112.54, 127.64], %)
-    |> line([170.36, -121.61], %, $seg01)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
-  extrude001 = extrude(50, sketch001)
-      `
+  |> startProfileAt([-79.26, 95.04], %)
+  |> line([112.54, 127.64], %)
+  |> line([170.36, -121.61], %, $seg01)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(50, sketch001)
+        `
       )
     })
     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 u.openAndClearDebugPanel()
 
     await u.sendCustomCmd({
@@ -1128,7 +1163,6 @@ test.describe('Testing selections', () => {
   })
   test("Various pipe expressions should and shouldn't allow edit and or extrude", async ({
     page,
-    homePage,
   }) => {
     const u = await getUtils(page)
     const selectionsSnippets = {
@@ -1147,46 +1181,46 @@ test.describe('Testing selections', () => {
         localStorage.setItem(
           'persistCode',
           `part001 = startSketchOn('XZ')
-  ${extrudeAndEditBlocked}
-  |> line([25.96, 2.93], %)
-  |> line([5.25, -5.72], %)
-  |> line([-2.01, -10.35], %)
-  |> line([-27.65, -2.78], %)
-  |> close(%)
-  |> extrude(5, %)
-    sketch002 = startSketchOn('XZ')
-  ${extrudeAndEditAllowed}
-  |> line([10.32, 6.47], %)
-  |> line([9.71, -6.16], %)
-  |> line([-3.08, -9.86], %)
-  |> line([-12.02, -1.54], %)
-  |> close(%)
-    sketch003 = startSketchOn('XZ')
-  ${editOnly}
-  |> line([27.55, -1.65], %)
-  |> line([4.95, -8], %)
-  |> line([-20.38, -10.12], %)
-  |> line([-15.79, 17.08], %)
-  
-    fn yohey = (pos) => {
-  sketch004 = startSketchOn('XZ')
-  ${extrudeAndEditBlockedInFunction}
-  |> line([27.55, -1.65], %)
-  |> line([4.95, -10.53], %)
-  |> line([-20.38, -8], %)
-  |> line([-15.79, 17.08], %)
-  return ''
-    }
-  
-    yohey([15.79, -34.6])
-    `
+    ${extrudeAndEditBlocked}
+    |> line([25.96, 2.93], %)
+    |> line([5.25, -5.72], %)
+    |> line([-2.01, -10.35], %)
+    |> line([-27.65, -2.78], %)
+    |> close(%)
+    |> extrude(5, %)
+  sketch002 = startSketchOn('XZ')
+    ${extrudeAndEditAllowed}
+    |> line([10.32, 6.47], %)
+    |> line([9.71, -6.16], %)
+    |> line([-3.08, -9.86], %)
+    |> line([-12.02, -1.54], %)
+    |> close(%)
+  sketch003 = startSketchOn('XZ')
+    ${editOnly}
+    |> line([27.55, -1.65], %)
+    |> line([4.95, -8], %)
+    |> line([-20.38, -10.12], %)
+    |> line([-15.79, 17.08], %)
+
+  fn yohey = (pos) => {
+    sketch004 = startSketchOn('XZ')
+    ${extrudeAndEditBlockedInFunction}
+    |> line([27.55, -1.65], %)
+    |> line([4.95, -10.53], %)
+    |> line([-20.38, -8], %)
+    |> line([-15.79, 17.08], %)
+    return ''
+  }
+
+      yohey([15.79, -34.6])
+  `
         )
       },
       selectionsSnippets
     )
-    await page.setBodyDimensions({ width: 1200, height: 1000 })
+    await page.setViewportSize({ width: 1200, height: 1000 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
 
     // wait for execution done
     await u.openDebugPanel()
@@ -1226,7 +1260,6 @@ test.describe('Testing selections', () => {
 
   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.
@@ -1235,9 +1268,9 @@ test.describe('Testing selections', () => {
      * 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.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
-    await homePage.goToModelingScene()
+    await u.waitForAuthSkipAppStart()
     await u.openDebugPanel()
 
     await expect(
@@ -1263,12 +1296,15 @@ test.describe('Testing selections', () => {
 
     await page.waitForTimeout(600)
 
+    const firstClickCoords = { x: 650, y: 200 } as const
     // Place a point because the line tool will exit if no points are pressed
-    await page.mouse.click(650, 200)
+    await page.mouse.click(firstClickCoords.x, firstClickCoords.y)
     await page.waitForTimeout(600)
 
     // Code before exiting the tool
-    let previousCodeContent = await page.locator('.cm-content').innerText()
+    let previousCodeContent = (
+      await page.locator('.cm-content').innerText()
+    ).replace(/\s+/g, '')
 
     // deselect the line tool by clicking it
     await page.getByRole('button', { name: 'line Line', exact: true }).click()
@@ -1280,14 +1316,23 @@ test.describe('Testing selections', () => {
     await page.mouse.click(750, 200)
     await page.waitForTimeout(100)
 
-    // expect no change
-    await expect(page.locator('.cm-content')).toHaveText(previousCodeContent)
+    await expect
+      .poll(async () => {
+        let str = await page.locator('.cm-content').innerText()
+        str = str.replace(/\s+/g, '')
+        return str
+      })
+      .toBe(previousCodeContent)
 
     // select line tool again
     await page.getByRole('button', { name: 'line Line', exact: true }).click()
 
     await u.closeDebugPanel()
 
+    // Click to continue profile
+    await page.mouse.click(firstClickCoords.x, firstClickCoords.y)
+    await page.waitForTimeout(100)
+
     // line tool should work as expected again
     await page.mouse.click(700, 200)
     await expect(page.locator('.cm-content')).not.toHaveText(

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

@@ -1,16 +1,29 @@
-import { test, expect, Page } from './zoo-test'
-import { getUtils, createProject } from './test-utils'
+import { test, expect, Page } from '@playwright/test'
+import {
+  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, homePage }) => {
+  test('basic lego happy case', async ({ page }) => {
     const u = await getUtils(page)
 
     await test.step('Set up', async () => {
-      await page.setBodyDimensions({ width: 1000, height: 500 })
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
+      await page.setViewportSize({ width: 1000, height: 500 })
+      await u.waitForAuthSkipAppStart()
     })
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
@@ -30,17 +43,25 @@ test.describe('Text-to-CAD tests', () => {
     const successToastMessage = page.getByText(`Text-to-CAD successful`)
     await expect(successToastMessage).toBeVisible({ timeout: 15000 })
 
-    // Hit accept.
+    await expect(page.getByText('Copied')).not.toBeVisible()
+
+    // Hit copy to clipboard.
     const copyToClipboardButton = page.getByRole('button', {
-      name: 'Accept',
+      name: 'Copy to clipboard',
     })
     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`)
 
@@ -49,18 +70,29 @@ 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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     await sendPromptFromCommandBar(page, 'a 2x6 lego')
 
@@ -79,6 +111,10 @@ 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')
 
@@ -97,14 +133,12 @@ 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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -136,16 +170,12 @@ test.describe('Text-to-CAD tests', () => {
     await expect(page.locator('.cm-content')).toContainText(``)
   })
 
-  test('sending a bad prompt fails, can dismiss', async ({
-    page,
-    homePage,
-  }) => {
+  test('sending a bad prompt fails, can dismiss', async ({ page }) => {
     const u = await getUtils(page)
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -206,14 +236,12 @@ 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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -296,14 +324,12 @@ 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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     await expect(commandBarButton).toBeVisible()
@@ -365,21 +391,19 @@ 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,
-    homePage,
-  }) => {
+  test('ensure you can shift+enter in the prompt box', async ({ page }) => {
     const u = await getUtils(page)
 
-    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     const promptWithNewline = `a 2x4\nlego`
 
@@ -432,7 +456,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, homePage }) => {
+    async ({ page }) => {
       // Let this test run longer since we've seen it timeout.
       test.setTimeout(180_000)
       // skip on windows
@@ -443,10 +467,9 @@ test.describe('Text-to-CAD tests', () => {
 
       const u = await getUtils(page)
 
-      await page.setBodyDimensions({ width: 1000, height: 500 })
+      await page.setViewportSize({ width: 1000, height: 500 })
 
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
+      await u.waitForAuthSkipAppStart()
 
       await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -472,6 +495,8 @@ 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()
@@ -489,15 +514,31 @@ test.describe('Text-to-CAD tests', () => {
 
       // Ensure you can copy the code for one of the models remaining.
       const copyToClipboardButton = page.getByRole('button', {
-        name: 'Accept',
+        name: 'Copy to clipboard',
       })
       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()
@@ -508,21 +549,40 @@ 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.setBodyDimensions({ width: 1000, height: 500 })
+    await page.setViewportSize({ width: 1000, height: 500 })
 
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await u.waitForAuthSkipAppStart()
 
     await sendPromptFromCommandBar(page, 'a 2x4 lego')
 
@@ -571,37 +631,57 @@ test.describe('Text-to-CAD tests', () => {
 
     // Ensure you can copy the code for one of the models remaining.
     const copyToClipboardButton = page.getByRole('button', {
-      name: 'Accept',
+      name: 'Copy to clipboard',
     })
     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')
@@ -617,13 +697,12 @@ async function sendPromptFromCommandBar(page: Page, promptStr: string) {
 test(
   'Text-to-CAD functionality',
   { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ browserName }, testInfo) => {
     const projectName = 'project-000'
     const prompt = 'lego 2x4'
     const textToCadFileName = 'lego-2x4.kcl'
 
-    const { dir } = await context.folderSetupFn(async () => {})
-
+    const { electronApp, page, dir } = await setupElectron({ testInfo })
     const fileExists = () =>
       fs.existsSync(join(dir, projectName, textToCadFileName))
 
@@ -632,7 +711,7 @@ test(
       test
     )
 
-    await page.setBodyDimensions({ width: 1200, height: 500 })
+    await page.setViewportSize({ width: 1200, height: 500 })
 
     // Locators
     const projectMenuButton = page
@@ -682,5 +761,7 @@ 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,10 +1,19 @@
-import { test, expect } from './zoo-test'
+import { test, expect } from '@playwright/test'
 
-import { doExport, getUtils, makeTemplate } from './test-utils'
+import { doExport, getUtils, makeTemplate, setup, tearDown } from './test-utils'
 
-test.fixme('Units menu', async ({ page, homePage }) => {
-  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await homePage.goToModelingScene()
+test.beforeEach(async ({ context, page }, testInfo) => {
+  await setup(context, page, testInfo)
+})
+
+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',
@@ -32,7 +41,7 @@ test.fixme('Units menu', async ({ page, homePage }) => {
   await expect(unitsMenuButton).toContainText('mm')
 })
 
-test('Successful export shows a success toast', async ({ page, homePage }) => {
+test('Successful export shows a success toast', async ({ page }) => {
   // 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)
@@ -48,41 +57,41 @@ totalHeightHalf = 2
 armThick = 0.5
 totalLen = 9.5
 part001 = startSketchOn('-XZ')
-|> startProfileAt([0, 0], %)
-|> yLine(baseHeight, %)
-|> xLine(baseLen, %)
-|> angledLineToY({
-      angle = topAng,
-      to = totalHeightHalf,
-    }, %, $seg04)
-|> xLineTo(totalLen, %, $seg03)
-|> yLine(-armThick, %, $seg01)
-|> angledLineThatIntersects({
-      angle = HALF_TURN,
-      offset = -armThick,
-      intersectTag = seg04
-    }, %)
-|> angledLineToY([segAng(seg04) + 180, ZERO], %)
-|> angledLineToY({
-      angle = -bottomAng,
-      to = -totalHeightHalf - armThick,
-    }, %, $seg02)
-|> xLineTo(segEndX(seg03) + 0, %)
-|> yLine(-segLen(seg01), %)
-|> angledLineThatIntersects({
-      angle = HALF_TURN,
-      offset = -armThick,
-      intersectTag = seg02
-    }, %)
-|> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
-|> xLineTo(ZERO, %)
-|> close(%)
-|> extrude(4, %)`
+  |> startProfileAt([0, 0], %)
+  |> yLine(baseHeight, %)
+  |> xLine(baseLen, %)
+  |> angledLineToY({
+        angle: topAng,
+        to: totalHeightHalf,
+      }, %, $seg04)
+  |> xLineTo(totalLen, %, $seg03)
+  |> yLine(-armThick, %, $seg01)
+  |> angledLineThatIntersects({
+        angle: HALF_TURN,
+        offset: -armThick,
+        intersectTag: seg04
+      }, %)
+  |> angledLineToY([segAng(seg04) + 180, ZERO], %)
+  |> angledLineToY({
+        angle: -bottomAng,
+        to: -totalHeightHalf - armThick,
+      }, %, $seg02)
+  |> xLineTo(segEndX(seg03) + 0, %)
+  |> yLine(-segLen(seg01), %)
+  |> angledLineThatIntersects({
+        angle: HALF_TURN,
+        offset: -armThick,
+        intersectTag: seg02
+      }, %)
+  |> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
+  |> xLineTo(ZERO, %)
+  |> close(%)
+  |> extrude(4, %)`
     )
   })
-  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await page.setViewportSize({ width: 1200, height: 500 })
 
-  await homePage.goToModelingScene()
+  await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.waitForCmdReceive('extrude')
@@ -97,14 +106,25 @@ 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,
-  homePage,
+  browserName,
 }) => {
-  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await homePage.goToModelingScene()
+  // To run this test locally, uncomment Firefox in playwright.config.ts
+  test.skip(
+    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' })
@@ -144,12 +164,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,
 }) => {
-  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await homePage.goToModelingScene()
+  const u = await getUtils(page)
+  await page.setViewportSize({ width: 1200, height: 500 })
+  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' })
@@ -161,7 +181,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.poll(() => page.url()).toContain('?tab=keybindings')
+  await expect(page.url()).toContain('?tab=keybindings')
   await expect(
     page.getByRole('heading', { name: 'Enter Sketch Mode' })
   ).toBeAttached()
@@ -169,13 +189,12 @@ 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.setBodyDimensions({ width: 1200, height: 500 })
+  await page.setViewportSize({ width: 1200, height: 500 })
 
-  await homePage.goToModelingScene()
+  await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.closeDebugPanel()
@@ -205,8 +224,13 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   // Draw a line
   await page.mouse.move(700, 200, { steps: 5 })
   await page.mouse.click(700, 200)
-  await page.mouse.move(800, 250, { steps: 5 })
-  await page.mouse.click(800, 250)
+
+  const secondMousePosition = { x: 800, y: 250 }
+
+  await page.mouse.move(secondMousePosition.x, secondMousePosition.y, {
+    steps: 5,
+  })
+  await page.mouse.click(secondMousePosition.x, secondMousePosition.y)
   // Unequip line tool
   await page.keyboard.press('Escape')
   // Make sure we didn't pop out of sketch mode.
@@ -215,9 +239,17 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   // Equip arc tool
   await page.keyboard.press('a')
   await expect(arcButton).toHaveAttribute('aria-pressed', 'true')
+
+  // click in the same position again to continue the profile
+  await page.mouse.move(secondMousePosition.x, secondMousePosition.y, {
+    steps: 5,
+  })
+  await page.mouse.click(secondMousePosition.x, secondMousePosition.y)
+
   await page.mouse.move(1000, 100, { steps: 5 })
   await page.mouse.click(1000, 100)
   await page.keyboard.press('Escape')
+  await expect(arcButton).toHaveAttribute('aria-pressed', 'false')
   await page.keyboard.press('l')
   await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
 
@@ -239,7 +271,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, homePage }) => {
+  async ({ page }) => {
     const u = await getUtils(page)
 
     // This test can run long if it takes a little too long to load
@@ -266,8 +298,8 @@ test.fixme(
           })
         )
       })
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
+      await page.setViewportSize({ width: 1200, height: 500 })
+      await u.waitForAuthSkipAppStart()
       await u.openDebugPanel()
       await u.expectCmdLog('[data-message-type="execution-done"]')
       await u.closeDebugPanel()
@@ -418,11 +450,10 @@ test.fixme(
   }
 )
 
-test('Delete key does not navigate back', async ({ page, homePage }) => {
-  await page.setBodyDimensions({ width: 1200, height: 500 })
-  await homePage.goToModelingScene()
-
-  await page.waitForURL('file:///**', { waitUntil: 'domcontentloaded' })
+test('Delete key does not navigate back', async ({ page }) => {
+  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.goto('/')
+  await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
 
   const settingsButton = page.getByRole('link', {
     name: 'Settings',
@@ -431,45 +462,45 @@ test('Delete key does not navigate back', async ({ page, homePage }) => {
   const settingsCloseButton = page.getByTestId('settings-close-button')
 
   await settingsButton.click()
-  await expect.poll(() => page.url()).toContain('/settings')
+  await expect(page.url()).toContain('/settings')
 
   // Make sure that delete doesn't go back from settings
   await page.keyboard.press('Delete')
-  await expect.poll(() => page.url()).toContain('/settings')
+  await expect(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.poll(() => page.url()).not.toContain('/settings')
+  await expect(page.url()).not.toContain('/settings')
 })
 
-test('Sketch on face', async ({ page, homePage }) => {
+test('Sketch on face', async ({ page }) => {
   test.setTimeout(90_000)
   const u = await getUtils(page)
   await page.addInitScript(async () => {
     localStorage.setItem(
       'persistCode',
       `sketch001 = startSketchOn('XZ')
-|> startProfileAt([3.29, 7.86], %)
-|> line([2.48, 2.44], %)
-|> line([2.66, 1.17], %)
-|> line([3.75, 0.46], %)
-|> line([4.99, -0.46], %)
-|> line([3.3, -2.12], %)
-|> line([2.16, -3.33], %)
-|> line([0.85, -3.08], %)
-|> line([-0.18, -3.36], %)
-|> line([-3.86, -2.73], %)
-|> line([-17.67, 0.85], %)
-|> close(%)
-extrude001 = extrude(5 + 7, sketch001)`
+  |> startProfileAt([3.29, 7.86], %)
+  |> line([2.48, 2.44], %)
+  |> line([2.66, 1.17], %)
+  |> line([3.75, 0.46], %)
+  |> line([4.99, -0.46], %)
+  |> line([3.3, -2.12], %)
+  |> line([2.16, -3.33], %)
+  |> line([0.85, -3.08], %)
+  |> line([-0.18, -3.36], %)
+  |> line([-3.86, -2.73], %)
+  |> line([-17.67, 0.85], %)
+  |> close(%)
+  extrude001 = extrude(5 + 7, sketch001)`
     )
   })
 
-  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await page.setViewportSize({ width: 1200, height: 500 })
 
-  await homePage.goToModelingScene()
+  await u.waitForAuthSkipAppStart()
 
   // wait for execution done
   await u.openDebugPanel()
@@ -519,12 +550,11 @@ extrude001 = extrude(5 + 7, sketch001)`
 
   await expect.poll(u.normalisedEditorCode).toContain(
     u.normalisedCode(`sketch002 = startSketchOn(extrude001, seg01)
-  |> startProfileAt([-12.94, 6.6], %)
-  |> line([2.45, -0.2], %)
-  |> line([-2.6, -1.25], %)
+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()
@@ -537,9 +567,8 @@ extrude001 = extrude(5 + 7, sketch001)`
   await page.getByText('startProfileAt([-12').click()
   await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeVisible()
   await page.getByRole('button', { name: 'Edit Sketch' }).click()
-  await page.waitForTimeout(400)
-  await page.waitForTimeout(150)
-  await page.setBodyDimensions({ width: 1200, height: 1200 })
+  await page.waitForTimeout(500)
+  await page.setViewportSize({ width: 1200, height: 1200 })
   await u.openAndClearDebugPanel()
   await u.updateCamPosition([452, -152, 1166])
   await u.closeDebugPanel()
@@ -557,11 +586,11 @@ extrude001 = extrude(5 + 7, sketch001)`
   previousCodeContent = await page.locator('.cm-content').innerText()
 
   const result = makeTemplate`sketch002 = startSketchOn(extrude001, seg01)
-|> startProfileAt([-12.83, 6.7], %)
-|> line([${[2.28, 2.35]}, -${0.07}], %)
-|> line([-3.05, -1.47], %)
-|> lineTo([profileStartX(%), profileStartY(%)], %)
-|> close(%)`
+  |> startProfileAt([-12.83, 6.7], %)
+  |> line([${[2.28, 2.35]}, -${0.07}], %)
+  |> line([-3.05, -1.47], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)`
 
   await expect(page.locator('.cm-content')).toHaveText(result.regExp)
 
@@ -585,6 +614,6 @@ extrude001 = extrude(5 + 7, sketch001)`
   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

@@ -1,334 +0,0 @@
-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 everyhting in the book to make electron change its
-      // damn window size. I succeded 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) => {
-        console.log('ABCDEFGHI', app.testProperty['TEST_SETTINGS_FILE_KEY'])
-        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,7 +7,6 @@ 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

package.json

@@ -103,24 +103,24 @@
     "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:make": "electron-forge make",
-    "tron:publish": "electron-forge publish",
-    "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'",
+    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron",
     "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:electron": "playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
-    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipWin|@snapshot'",
-    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
-    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
-    "test:playwright:electron:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
-    "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:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
-    "test:playwright:electron:ubuntu:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
+    "test:playwright:browser:chrome": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron'",
+    "test:playwright:browser:chrome:windows": "playwright test --project=\"Google Chrome\" --config=playwright.ci.config.ts --grep-invert=\"@snapshot|@electron|@skipWin\"",
+    "test:playwright:browser:chrome:ubuntu": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron|@skipLinux'",
+    "test:playwright:electron": "playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipWin",
+    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipMacos",
+    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipLinux",
+    "test:playwright:electron:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "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,7 +152,7 @@
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@nabla/vite-plugin-eslint": "^2.0.5",
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.46.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@types/d3-force": "^3.0.10",

playwright.ci.config.ts

@@ -0,0 +1,58 @@
+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: 30,
+  workers: 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: [
     ['dot'],

src/Toolbar.tsx

@@ -6,7 +6,6 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useNetworkContext } from 'hooks/useNetworkContext'
 import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ActionButton } from 'components/ActionButton'
-import { isSingleCursorInPipe } from 'lang/queryAst'
 import { useKclContext } from 'lang/KclProvider'
 import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
@@ -22,6 +21,7 @@ import {
 } from 'lib/toolbar'
 import { isDesktop } from 'lib/isDesktop'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
+import { isCursorInFunctionDefinition } from 'lang/queryAst'
 
 export function Toolbar({
   className = '',
@@ -38,7 +38,12 @@ export function Toolbar({
     '!border-transparent hover:!border-chalkboard-20 dark:enabled:hover:!border-primary pressed:!border-primary ui-open:!border-primary'
 
   const sketchPathId = useMemo(() => {
-    if (!isSingleCursorInPipe(context.selectionRanges, kclManager.ast))
+    if (
+      isCursorInFunctionDefinition(
+        kclManager.ast,
+        context.selectionRanges.graphSelections[0]
+      )
+    )
       return false
     return isCursorInSketchCommandRange(
       engineCommandManager.artifactGraph,

src/clientSideScene/CameraControls.ts

@@ -105,7 +105,7 @@ export class CameraControls {
   pendingZoom: number | null = null
   pendingRotation: Vector2 | null = null
   pendingPan: Vector2 | null = null
-  interactionGuards: MouseGuard = cameraMouseDragGuards.KittyCAD
+  interactionGuards: MouseGuard = cameraMouseDragGuards.Zoo
   isFovAnimationInProgress = false
   perspectiveFovBeforeOrtho = 45
   get isPerspective() {

src/clientSideScene/ClientSideSceneComp.tsx

@@ -433,6 +433,8 @@ export async function deleteSegment({
   if (!sketchDetails) return
   await sceneEntitiesManager.updateAstAndRejigSketch(
     pathToNode,
+    sketchDetails.sketchNodePaths,
+    sketchDetails.planeNodePath,
     modifiedAst,
     sketchDetails.zAxis,
     sketchDetails.yAxis,

src/clientSideScene/segments.ts

@@ -691,19 +691,21 @@ export function createProfileStartHandle({
   scale = 1,
   theme,
   isSelected,
+  size = 12,
   ...rest
 }: {
   from: Coords2d
   scale?: number
   theme: Themes
   isSelected?: boolean
+  size?: number
 } & (
   | { isDraft: true }
   | { isDraft: false; id: string; pathToNode: PathToNode }
 )) {
   const group = new Group()
 
-  const geometry = new BoxGeometry(12, 12, 12) // in pixels scaled later
+  const geometry = new BoxGeometry(size, size, size) // in pixels scaled later
   const baseColor = getThemeColorForThreeJs(theme)
   const color = isSelected ? 0x0000ff : baseColor
   const body = new MeshBasicMaterial({ color })

src/components/ContextMenu.tsx

@@ -1,13 +1,23 @@
 import toast from 'react-hot-toast'
 import { ActionIcon, ActionIconProps } from './ActionIcon'
-import { RefObject, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  MouseEvent,
+  RefObject,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { Dialog } from '@headlessui/react'
 
-interface ContextMenuProps
+export interface ContextMenuProps
   extends Omit<React.HTMLAttributes<HTMLUListElement>, 'children'> {
   items?: React.ReactElement[]
   menuTargetElement?: RefObject<HTMLElement>
+  guard?: (e: globalThis.MouseEvent) => boolean
+  event?: 'contextmenu' | 'mouseup'
 }
 
 const DefaultContextMenuItems = [
@@ -20,6 +30,8 @@ export function ContextMenu({
   items = DefaultContextMenuItems,
   menuTargetElement,
   className,
+  guard,
+  event = 'contextmenu',
   ...props
 }: ContextMenuProps) {
   const dialogRef = useRef<HTMLDivElement>(null)
@@ -32,6 +44,15 @@ export function ContextMenu({
   useHotkeys('esc', () => setOpen(false), {
     enabled: open,
   })
+  const handleContextMenu = useCallback(
+    (e: globalThis.MouseEvent) => {
+      if (guard && !guard(e)) return
+      e.preventDefault()
+      setPosition({ x: e.clientX, y: e.clientY })
+      setOpen(true)
+    },
+    [guard, setPosition, setOpen]
+  )
 
   const dialogPositionStyle = useMemo(() => {
     if (!dialogRef.current)
@@ -78,21 +99,9 @@ export function ContextMenu({
 
   // Add context menu listener to target once mounted
   useEffect(() => {
-    const handleContextMenu = (e: MouseEvent) => {
-      console.log('context menu', e)
-      e.preventDefault()
-      setPosition({ x: e.x, y: e.y })
-      setOpen(true)
-    }
-    menuTargetElement?.current?.addEventListener(
-      'contextmenu',
-      handleContextMenu
-    )
+    menuTargetElement?.current?.addEventListener(event, handleContextMenu)
     return () => {
-      menuTargetElement?.current?.removeEventListener(
-        'contextmenu',
-        handleContextMenu
-      )
+      menuTargetElement?.current?.removeEventListener(event, handleContextMenu)
     }
   }, [menuTargetElement?.current])
 
@@ -100,7 +109,10 @@ export function ContextMenu({
     <Dialog open={open} onClose={() => setOpen(false)}>
       <div
         className="fixed inset-0 z-50 w-screen h-screen"
-        onContextMenu={(e) => e.preventDefault()}
+        onContextMenu={(e) => {
+          e.preventDefault()
+          setPosition({ x: e.clientX, y: e.clientY })
+        }}
       >
         <Dialog.Backdrop className="fixed z-10 inset-0" />
         <Dialog.Panel

src/components/Gizmo.tsx

@@ -1,6 +1,6 @@
 import { SceneInfra } from 'clientSideScene/sceneInfra'
 import { sceneInfra } from 'lib/singletons'
-import { MutableRefObject, useEffect, useMemo, useRef } from 'react'
+import { MutableRefObject, useEffect, useRef } from 'react'
 import {
   WebGLRenderer,
   Scene,
@@ -19,16 +19,14 @@ import {
   Intersection,
   Object3D,
 } from 'three'
-import {
-  ContextMenu,
-  ContextMenuDivider,
-  ContextMenuItem,
-  ContextMenuItemRefresh,
-} from './ContextMenu'
 import { Popover } from '@headlessui/react'
 import { CustomIcon } from './CustomIcon'
 import { reportRejection } from 'lib/trap'
-import { useModelingContext } from 'hooks/useModelingContext'
+import {
+  useViewControlMenuItems,
+  ViewControlContextMenu,
+} from './ViewControlMenu'
+import { AxisNames } from 'lib/constants'
 
 const CANVAS_SIZE = 80
 const FRUSTUM_SIZE = 0.5
@@ -40,64 +38,14 @@ enum AxisColors {
   Z = '#6689ef',
   Gray = '#c6c7c2',
 }
-enum AxisNames {
-  X = 'x',
-  Y = 'y',
-  Z = 'z',
-  NEG_X = '-x',
-  NEG_Y = '-y',
-  NEG_Z = '-z',
-}
-const axisNamesSemantic: Record<AxisNames, string> = {
-  [AxisNames.X]: 'Right',
-  [AxisNames.Y]: 'Back',
-  [AxisNames.Z]: 'Top',
-  [AxisNames.NEG_X]: 'Left',
-  [AxisNames.NEG_Y]: 'Front',
-  [AxisNames.NEG_Z]: 'Bottom',
-}
 
 export default function Gizmo() {
+  const menuItems = useViewControlMenuItems()
   const wrapperRef = useRef<HTMLDivElement | null>(null)
   const canvasRef = useRef<HTMLCanvasElement | null>(null)
   const raycasterIntersect = useRef<Intersection<Object3D> | null>(null)
   const cameraPassiveUpdateTimer = useRef(0)
   const raycasterPassiveUpdateTimer = useRef(0)
-  const { send: modelingSend } = useModelingContext()
-  const menuItems = useMemo(
-    () => [
-      ...Object.entries(axisNamesSemantic).map(([axisName, axisSemantic]) => (
-        <ContextMenuItem
-          key={axisName}
-          onClick={() => {
-            sceneInfra.camControls
-              .updateCameraToAxis(axisName as AxisNames)
-              .catch(reportRejection)
-          }}
-        >
-          {axisSemantic} view
-        </ContextMenuItem>
-      )),
-      <ContextMenuDivider />,
-      <ContextMenuItem
-        onClick={() => {
-          sceneInfra.camControls.resetCameraPosition().catch(reportRejection)
-        }}
-      >
-        Reset view
-      </ContextMenuItem>,
-      <ContextMenuItem
-        onClick={() => {
-          modelingSend({ type: 'Center camera on selection' })
-        }}
-      >
-        Center view on selection
-      </ContextMenuItem>,
-      <ContextMenuDivider />,
-      <ContextMenuItemRefresh />,
-    ],
-    [axisNamesSemantic]
-  )
 
   useEffect(() => {
     if (!canvasRef.current) return
@@ -161,7 +109,7 @@ export default function Gizmo() {
         className="grid place-content-center rounded-full overflow-hidden border border-solid border-primary/50 pointer-events-auto bg-chalkboard-10/70 dark:bg-chalkboard-100/80 backdrop-blur-sm"
       >
         <canvas ref={canvasRef} />
-        <ContextMenu menuTargetElement={wrapperRef} items={menuItems} />
+        <ViewControlContextMenu menuTargetElement={wrapperRef} />
       </div>
       <GizmoDropdown items={menuItems} />
     </div>

src/components/ModelingMachineProvider.tsx

@@ -24,7 +24,7 @@ import { useSetupEngineManager } from 'hooks/useSetupEngineManager'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import {
   isCursorInSketchCommandRange,
-  updatePathToNodeFromMap,
+  updateSketchDetailsNodePaths,
 } from 'lang/util'
 import {
   kclManager,
@@ -71,14 +71,24 @@ import {
   replaceValueAtNodePath,
   sketchOnExtrudedFace,
   sketchOnOffsetPlane,
+  splitPipedProfile,
   startSketchOnDefault,
 } from 'lang/modifyAst'
-import { PathToNode, Program, parse, recast, resultIsOk } from 'lang/wasm'
+import {
+  PathToNode,
+  Program,
+  VariableDeclaration,
+  parse,
+  recast,
+  resultIsOk,
+} from 'lang/wasm'
 import {
   doesSceneHaveExtrudedSketch,
   doesSceneHaveSweepableSketch,
-  getNodePathFromSourceRange,
-  isSingleCursorInPipe,
+  doesSketchPipeNeedSplitting,
+  getNodeFromPath,
+  isCursorInFunctionDefinition,
+  traverse,
 } from 'lang/queryAst'
 import { exportFromEngine } from 'lib/exportFromEngine'
 import { Models } from '@kittycad/lib/dist/types/src'
@@ -86,7 +96,7 @@ import toast from 'react-hot-toast'
 import { EditorSelection, Transaction } from '@codemirror/state'
 import { useLoaderData, useNavigate, useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
-import { err, reportRejection, trap } from 'lib/trap'
+import { err, reportRejection, trap, reject } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { modelingMachineEvent } from 'editor/manager'
 import { hasValidEdgeTreatmentSelection } from 'lang/modifyAst/addEdgeTreatment'
@@ -100,6 +110,10 @@ import { useFileContext } from 'hooks/useFileContext'
 import { uuidv4 } from 'lib/utils'
 import { IndexLoaderData } from 'lib/types'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
+import {
+  getPathsFromArtifact,
+  getPlaneFromArtifact,
+} from 'lang/std/artifactGraph'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -290,7 +304,7 @@ export const ModelingMachineProvider = ({
           return {
             sketchDetails: {
               ...sketchDetails,
-              sketchPathToNode: event.data,
+              sketchEntryNodePath: event.data,
             },
           }
         }),
@@ -413,9 +427,17 @@ export const ModelingMachineProvider = ({
                 selectionRanges: setSelections.selection,
                 sketchDetails: {
                   ...sketchDetails,
-                  sketchPathToNode:
-                    setSelections.updatedPathToNode ||
-                    sketchDetails?.sketchPathToNode ||
+                  sketchEntryNodePath:
+                    setSelections.updatedSketchEntryNodePath ||
+                    sketchDetails?.sketchEntryNodePath ||
+                    [],
+                  sketchNodePaths:
+                    setSelections.updatedSketchNodePaths ||
+                    sketchDetails?.sketchNodePaths ||
+                    [],
+                  planeNodePath:
+                    setSelections.updatedPlaneNodePath ||
+                    sketchDetails?.planeNodePath ||
                     [],
                 },
               }
@@ -625,7 +647,6 @@ export const ModelingMachineProvider = ({
           }
 
           const canShell = canShellSelection(selectionRanges)
-          console.log('canShellSelection', canShellSelection(selectionRanges))
           if (err(canShell)) return false
           return canShell
         },
@@ -648,7 +669,12 @@ export const ModelingMachineProvider = ({
         'Selection is on face': ({ context: { selectionRanges }, event }) => {
           if (event.type !== 'Enter sketch') return false
           if (event.data?.forceNewSketch) return false
-          if (!isSingleCursorInPipe(selectionRanges, kclManager.ast))
+          if (
+            isCursorInFunctionDefinition(
+              kclManager.ast,
+              selectionRanges.graphSelections[0]
+            )
+          )
             return false
           return !!isCursorInSketchCommandRange(
             engineCommandManager.artifactGraph,
@@ -679,10 +705,32 @@ export const ModelingMachineProvider = ({
               // this assumes no changes have been made to the sketch besides what we did when entering the sketch
               // i.e. doesn't account for user's adding code themselves, maybe we need store a flag userEditedSinceSketchMode?
               const newAst = structuredClone(kclManager.ast)
-              const varDecIndex = sketchDetails.sketchPathToNode[1][0]
+              const varDecIndex = sketchDetails.planeNodePath[1][0]
+
+              const varDec = getNodeFromPath<VariableDeclaration>(
+                newAst,
+                sketchDetails.planeNodePath,
+                'VariableDeclaration'
+              )
+              if (err(varDec)) return reject(new Error('No varDec'))
+              const variableName = varDec.node.declaration.id.name
+              let isIdentifierUsed = false
+              traverse(newAst, {
+                enter: (node) => {
+                  if (
+                    node.type === 'Identifier' &&
+                    node.name === variableName
+                  ) {
+                    isIdentifierUsed = true
+                  }
+                },
+              })
+              if (isIdentifierUsed) return
+
               // remove body item at varDecIndex
               newAst.body = newAst.body.filter((_, i) => i !== varDecIndex)
               await kclManager.executeAstMock(newAst)
+              await codeManager.updateEditorWithAstAndWriteToFile(newAst)
             }
             sceneInfra.setCallbacks({
               onClick: () => {},
@@ -692,7 +740,7 @@ export const ModelingMachineProvider = ({
           }
         ),
         'animate-to-face': fromPromise(async ({ input }) => {
-          if (!input) return undefined
+          if (!input) return null
           if (input.type === 'extrudeFace' || input.type === 'offsetPlane') {
             const sketched =
               input.type === 'extrudeFace'
@@ -719,7 +767,9 @@ export const ModelingMachineProvider = ({
             await letEngineAnimateAndSyncCamAfter(engineCommandManager, id)
             sceneInfra.camControls.syncDirection = 'clientToEngine'
             return {
-              sketchPathToNode: pathToNewSketchNode,
+              sketchEntryNodePath: [],
+              planeNodePath: pathToNewSketchNode,
+              sketchNodePaths: [],
               zAxis: input.zAxis,
               yAxis: input.yAxis,
               origin: input.position,
@@ -739,7 +789,9 @@ export const ModelingMachineProvider = ({
           )
 
           return {
-            sketchPathToNode: pathToNode,
+            sketchEntryNodePath: [],
+            planeNodePath: pathToNode,
+            sketchNodePaths: [],
             zAxis: input.zAxis,
             yAxis: input.yAxis,
             origin: [0, 0, 0],
@@ -747,12 +799,14 @@ export const ModelingMachineProvider = ({
         }),
         'animate-to-sketch': fromPromise(
           async ({ input: { selectionRanges } }) => {
-            const sourceRange =
-              selectionRanges.graphSelections[0]?.codeRef?.range
-            const sketchPathToNode = getNodePathFromSourceRange(
-              kclManager.ast,
-              sourceRange
+            const sketchPathToNode =
+              selectionRanges.graphSelections[0]?.codeRef?.pathToNode
+            const plane = getPlaneFromArtifact(
+              selectionRanges.graphSelections[0].artifact,
+              engineCommandManager.artifactGraph
             )
+            if (err(plane)) return Promise.reject(plane)
+
             const info = await getSketchOrientationDetails(
               sketchPathToNode || []
             )
@@ -760,8 +814,17 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               info?.sketchDetails?.faceId || ''
             )
-            return {
+            const sketchPaths = getPathsFromArtifact({
+              artifact: selectionRanges.graphSelections[0].artifact,
               sketchPathToNode: sketchPathToNode || [],
+            })
+            if (err(sketchPaths)) return Promise.reject(sketchPaths)
+            if (!plane.codeRef)
+              return Promise.reject(new Error('No plane codeRef'))
+            return {
+              sketchEntryNodePath: sketchPathToNode || [],
+              sketchNodePaths: sketchPaths,
+              planeNodePath: plane.codeRef.pathToNode,
               zAxis: info.sketchDetails.zAxis || null,
               yAxis: info.sketchDetails.yAxis || null,
               origin: info.sketchDetails.origin.map(
@@ -773,7 +836,7 @@ export const ModelingMachineProvider = ({
 
         'Get horizontal info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails } }) => {
-            const { modifiedAst, pathToNodeMap } =
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
               await applyConstraintHorzVertDistance({
                 constraint: 'setHorzDistance',
                 selectionRanges,
@@ -785,13 +848,23 @@ export const ModelingMachineProvider = ({
 
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
+
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -812,13 +885,15 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
         'Get vertical info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails } }) => {
-            const { modifiedAst, pathToNodeMap } =
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
               await applyConstraintHorzVertDistance({
                 constraint: 'setVertDistance',
                 selectionRanges,
@@ -829,13 +904,23 @@ export const ModelingMachineProvider = ({
             const _modifiedAst = pResult.program
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
+
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -856,7 +941,9 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
@@ -866,14 +953,15 @@ export const ModelingMachineProvider = ({
               selectionRanges,
             })
             if (err(info)) return Promise.reject(info)
-            const { modifiedAst, pathToNodeMap } = await (info.enabled
-              ? applyConstraintAngleBetween({
-                  selectionRanges,
-                })
-              : applyConstraintAngleLength({
-                  selectionRanges,
-                  angleOrLength: 'setAngle',
-                }))
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
+              await (info.enabled
+                ? applyConstraintAngleBetween({
+                    selectionRanges,
+                  })
+                : applyConstraintAngleLength({
+                    selectionRanges,
+                    angleOrLength: 'setAngle',
+                  }))
             const pResult = parse(recast(modifiedAst))
             if (trap(pResult) || !resultIsOk(pResult))
               return Promise.reject(new Error('Unexpected compilation error'))
@@ -882,13 +970,23 @@ export const ModelingMachineProvider = ({
 
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
+
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -909,7 +1007,9 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
@@ -924,20 +1024,30 @@ export const ModelingMachineProvider = ({
               length: lengthValue,
             })
             if (err(constraintResult)) return Promise.reject(constraintResult)
-            const { modifiedAst, pathToNodeMap } = constraintResult
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
+              constraintResult
             const pResult = parse(recast(modifiedAst))
             if (trap(pResult) || !resultIsOk(pResult))
               return Promise.reject(new Error('Unexpected compilation error'))
             const _modifiedAst = pResult.program
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -958,13 +1068,15 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
         'Get perpendicular distance info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails } }) => {
-            const { modifiedAst, pathToNodeMap } =
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
               await applyConstraintIntersect({
                 selectionRanges,
               })
@@ -974,13 +1086,22 @@ export const ModelingMachineProvider = ({
             const _modifiedAst = pResult.program
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -1001,13 +1122,15 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
         'Get ABS X info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails } }) => {
-            const { modifiedAst, pathToNodeMap } =
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
               await applyConstraintAbsDistance({
                 constraint: 'xAbs',
                 selectionRanges,
@@ -1018,13 +1141,22 @@ export const ModelingMachineProvider = ({
             const _modifiedAst = pResult.program
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -1045,13 +1177,15 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
         'Get ABS Y info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails } }) => {
-            const { modifiedAst, pathToNodeMap } =
+            const { modifiedAst, pathToNodeMap, exprInsertIndex } =
               await applyConstraintAbsDistance({
                 constraint: 'yAbs',
                 selectionRanges,
@@ -1062,13 +1196,22 @@ export const ModelingMachineProvider = ({
             const _modifiedAst = pResult.program
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            const updatedPathToNode = updatePathToNodeFromMap(
-              sketchDetails.sketchPathToNode,
-              pathToNodeMap
-            )
+
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex,
+            })
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                updatedPathToNode,
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 _modifiedAst,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -1089,7 +1232,9 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
             }
           }
         ),
@@ -1109,9 +1254,11 @@ export const ModelingMachineProvider = ({
             let result: {
               modifiedAst: Node<Program>
               pathToReplaced: PathToNode | null
+              exprInsertIndex: number
             } = {
               modifiedAst: parsed,
               pathToReplaced: null,
+              exprInsertIndex: -1,
             }
             // If the user provided a constant name,
             // we need to insert the named constant
@@ -1141,6 +1288,7 @@ export const ModelingMachineProvider = ({
               result = {
                 modifiedAst: parseResultAfterInsertion.program,
                 pathToReplaced: astAfterReplacement.pathToReplaced,
+                exprInsertIndex: astAfterReplacement.exprInsertIndex,
               }
             } else if ('valueText' in data.namedValue) {
               // If they didn't provide a constant name,
@@ -1171,10 +1319,22 @@ export const ModelingMachineProvider = ({
             parsed = parsed as Node<Program>
             if (!result.pathToReplaced)
               return Promise.reject(new Error('No path to replaced node'))
+            const {
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            } = updateSketchDetailsNodePaths({
+              sketchEntryNodePath: sketchDetails.sketchEntryNodePath,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+              exprInsertIndex: result.exprInsertIndex,
+            })
 
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                result.pathToReplaced || [],
+                updatedSketchEntryNodePath,
+                updatedSketchNodePaths,
+                updatedPlaneNodePath,
                 parsed,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -1195,7 +1355,140 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode: result.pathToReplaced,
+              updatedSketchEntryNodePath,
+              updatedSketchNodePaths,
+              updatedPlaneNodePath,
+            }
+          }
+        ),
+        'set-up-draft-circle': fromPromise(
+          async ({ input: { sketchDetails, data } }) => {
+            if (!sketchDetails || !data)
+              return reject('No sketch details or data')
+            await sceneEntitiesManager.tearDownSketch({ removeAxis: false })
+
+            const result = await sceneEntitiesManager.setupDraftCircle(
+              sketchDetails.sketchEntryNodePath,
+              sketchDetails.sketchNodePaths,
+              sketchDetails.planeNodePath,
+              sketchDetails.zAxis,
+              sketchDetails.yAxis,
+              sketchDetails.origin,
+              data
+            )
+            if (err(result)) return reject(result)
+            await codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
+
+            return result
+          }
+        ),
+        'set-up-draft-rectangle': fromPromise(
+          async ({ input: { sketchDetails, data } }) => {
+            if (!sketchDetails || !data)
+              return reject('No sketch details or data')
+            await sceneEntitiesManager.tearDownSketch({ removeAxis: false })
+
+            const result = await sceneEntitiesManager.setupDraftRectangle(
+              sketchDetails.sketchEntryNodePath,
+              sketchDetails.sketchNodePaths,
+              sketchDetails.planeNodePath,
+              sketchDetails.zAxis,
+              sketchDetails.yAxis,
+              sketchDetails.origin,
+              data
+            )
+            if (err(result)) return reject(result)
+            await codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
+
+            return result
+          }
+        ),
+        'set-up-draft-center-rectangle': fromPromise(
+          async ({ input: { sketchDetails, data } }) => {
+            if (!sketchDetails || !data)
+              return reject('No sketch details or data')
+            await sceneEntitiesManager.tearDownSketch({ removeAxis: false })
+            const result = await sceneEntitiesManager.setupDraftCenterRectangle(
+              sketchDetails.sketchEntryNodePath,
+              sketchDetails.sketchNodePaths,
+              sketchDetails.planeNodePath,
+              sketchDetails.zAxis,
+              sketchDetails.yAxis,
+              sketchDetails.origin,
+              data
+            )
+            if (err(result)) return reject(result)
+            await codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
+
+            return result
+          }
+        ),
+        'setup-client-side-sketch-segments': fromPromise(
+          async ({ input: { sketchDetails, selectionRanges } }) => {
+            if (!sketchDetails) return
+            if (!sketchDetails.sketchEntryNodePath.length) return
+            if (Object.keys(sceneEntitiesManager.activeSegments).length > 0) {
+              sceneEntitiesManager.tearDownSketch({ removeAxis: false })
+            }
+            sceneInfra.resetMouseListeners()
+            await sceneEntitiesManager.setupSketch({
+              sketchEntryNodePath: sketchDetails?.sketchEntryNodePath || [],
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              forward: sketchDetails.zAxis,
+              up: sketchDetails.yAxis,
+              position: sketchDetails.origin,
+              maybeModdedAst: kclManager.ast,
+              selectionRanges,
+            })
+            sceneInfra.resetMouseListeners()
+
+            sceneEntitiesManager.setupSketchIdleCallbacks({
+              sketchEntryNodePath: sketchDetails?.sketchEntryNodePath || [],
+              forward: sketchDetails.zAxis,
+              up: sketchDetails.yAxis,
+              position: sketchDetails.origin,
+              sketchNodePaths: sketchDetails.sketchNodePaths,
+              planeNodePath: sketchDetails.planeNodePath,
+            })
+            return undefined
+          }
+        ),
+        'split-sketch-pipe-if-needed': fromPromise(
+          async ({ input: { sketchDetails } }) => {
+            if (!sketchDetails) return reject('No sketch details')
+            const existingSketchInfoNoOp = {
+              updatedEntryNodePath: sketchDetails.sketchEntryNodePath,
+              updatedSketchNodePaths: sketchDetails.sketchNodePaths,
+              updatedPlaneNodePath: sketchDetails.planeNodePath,
+            } as const
+            if (
+              !sketchDetails.sketchNodePaths.length &&
+              sketchDetails.planeNodePath.length
+            ) {
+              // new sketch, no profiles yet
+              return existingSketchInfoNoOp
+            }
+            const doesNeedSplitting = doesSketchPipeNeedSplitting(
+              kclManager.ast,
+              sketchDetails.sketchEntryNodePath
+            )
+            if (err(doesNeedSplitting)) return reject(doesNeedSplitting)
+            if (!doesNeedSplitting) return existingSketchInfoNoOp
+
+            const splitResult = splitPipedProfile(
+              kclManager.ast,
+              sketchDetails.sketchEntryNodePath
+            )
+            if (err(splitResult)) return reject(splitResult)
+
+            await kclManager.executeAstMock(splitResult.modifiedAst)
+            await codeManager.updateEditorWithAstAndWriteToFile(
+              splitResult.modifiedAst
+            )
+            return {
+              updatedEntryNodePath: splitResult.pathToProfile,
+              updatedSketchNodePaths: [splitResult.pathToProfile],
+              updatedPlaneNodePath: sketchDetails.planeNodePath,
             }
           }
         ),

src/components/ModelingSidebar/ModelingPane.tsx

@@ -6,6 +6,7 @@ import Tooltip from 'components/Tooltip'
 import { CustomIconName } from 'components/CustomIcon'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { ActionIcon } from 'components/ActionIcon'
+import { onboardingPaths } from 'routes/Onboarding/paths'
 
 export interface ModelingPaneProps {
   id: string
@@ -70,7 +71,7 @@ export const ModelingPane = ({
   const { settings } = useSettingsAuthContext()
   const onboardingStatus = settings.context.app.onboardingStatus
   const pointerEventsCssClass =
-    onboardingStatus.current === 'camera'
+    onboardingStatus.current === onboardingPaths.CAMERA
       ? 'pointer-events-none '
       : 'pointer-events-auto '
   return (

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -19,6 +19,7 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclProvider'
 import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { onboardingPaths } from 'routes/Onboarding/paths'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
@@ -41,7 +42,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
   const onboardingStatus = settings.context.app.onboardingStatus
   const { send, context } = useModelingContext()
   const pointerEventsCssClass =
-    onboardingStatus.current === 'camera' ||
+    onboardingStatus.current === onboardingPaths.CAMERA ||
     context.store?.openPanes.length === 0
       ? 'pointer-events-none '
       : 'pointer-events-auto '

src/components/Spinner.tsx

@@ -2,7 +2,12 @@ import { SVGProps } from 'react'
 
 export const Spinner = (props: SVGProps<SVGSVGElement>) => {
   return (
-    <svg viewBox="0 0 10 10" className={'w-8 h-8'} {...props}>
+    <svg
+      data-testid="spinner"
+      viewBox="0 0 10 10"
+      className={'w-8 h-8'}
+      {...props}
+    >
       <circle
         cx="5"
         cy="5"

src/components/Stream.tsx

@@ -20,6 +20,7 @@ import { IndexLoaderData } from 'lib/types'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { err, reportRejection } from 'lib/trap'
 import { getArtifactOfTypes } from 'lang/std/artifactGraph'
+import { ViewControlContextMenu } from './ViewControlMenu'
 
 enum StreamState {
   Playing = 'playing',
@@ -30,6 +31,7 @@ enum StreamState {
 
 export const Stream = () => {
   const [isLoading, setIsLoading] = useState(true)
+  const videoWrapperRef = useRef<HTMLDivElement>(null)
   const videoRef = useRef<HTMLVideoElement>(null)
   const { settings } = useSettingsAuthContext()
   const { state, send } = useModelingContext()
@@ -258,7 +260,7 @@ export const Stream = () => {
     setIsLoading(false)
   }, [mediaStream])
 
-  const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
+  const handleClick: MouseEventHandler<HTMLDivElement> = (e) => {
     // If we've got no stream or connection, don't do anything
     if (!isNetworkOkay) return
     if (!videoRef.current) return
@@ -320,10 +322,11 @@ export const Stream = () => {
 
   return (
     <div
+      ref={videoWrapperRef}
       className="absolute inset-0 z-0"
       id="stream"
       data-testid="stream"
-      onClick={handleMouseUp}
+      onClick={handleClick}
       onDoubleClick={enterSketchModeIfSelectingSketch}
       onContextMenu={(e) => e.preventDefault()}
       onContextMenuCapture={(e) => e.preventDefault()}
@@ -384,6 +387,14 @@ export const Stream = () => {
           </Loading>
         </div>
       )}
+      <ViewControlContextMenu
+        event="mouseup"
+        guard={(e) =>
+          sceneInfra.camControls.wasDragging === false &&
+          btnName(e).right === true
+        }
+        menuTargetElement={videoWrapperRef}
+      />
     </div>
   )
 }

src/components/Toolbar/Intersect.tsx

@@ -136,6 +136,7 @@ export async function applyConstraintIntersect({
 }): Promise<{
   modifiedAst: Node<Program>
   pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
 }> {
   const info = intersectInfo({
     selectionRanges,
@@ -174,6 +175,7 @@ export async function applyConstraintIntersect({
     return {
       modifiedAst,
       pathToNodeMap,
+      exprInsertIndex: -1,
     }
   }
   // transform again but forcing certain values
@@ -192,6 +194,7 @@ export async function applyConstraintIntersect({
   const { modifiedAst: _modifiedAst, pathToNodeMap: _pathToNodeMap } =
     transform2
 
+  let exprInsertIndex = -1
   if (variableName) {
     const newBody = [..._modifiedAst.body]
     newBody.splice(
@@ -204,9 +207,11 @@ export async function applyConstraintIntersect({
       const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
       pathToNode[index][0] = Number(pathToNode[index][0]) + 1
     })
+    exprInsertIndex = newVariableInsertIndex
   }
   return {
     modifiedAst: _modifiedAst,
     pathToNodeMap: _pathToNodeMap,
+    exprInsertIndex,
   }
 }

src/components/Toolbar/RemoveConstrainingValues.tsx

@@ -28,7 +28,7 @@ export function removeConstrainingValuesInfo({
   | Error {
   const _nodes = selectionRanges.graphSelections.map(({ codeRef }) => {
     const tmp = getNodeFromPath<Expr>(kclManager.ast, codeRef.pathToNode)
-    if (err(tmp)) return tmp
+    if (tmp instanceof Error) return tmp
     return tmp.node
   })
   const _err1 = _nodes.find(err)

src/components/Toolbar/SetAbsDistance.tsx

@@ -93,6 +93,7 @@ export async function applyConstraintAbsDistance({
 }): Promise<{
   modifiedAst: Program
   pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
 }> {
   const info = absDistanceInfo({
     selectionRanges,
@@ -132,6 +133,7 @@ export async function applyConstraintAbsDistance({
   if (err(transform2)) return Promise.reject(transform2)
   const { modifiedAst: _modifiedAst, pathToNodeMap } = transform2
 
+  let exprInsertIndex = -1
   if (variableName) {
     const newBody = [..._modifiedAst.body]
     newBody.splice(
@@ -144,8 +146,9 @@ export async function applyConstraintAbsDistance({
       const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
       pathToNode[index][0] = Number(pathToNode[index][0]) + 1
     })
+    exprInsertIndex = newVariableInsertIndex
   }
-  return { modifiedAst: _modifiedAst, pathToNodeMap }
+  return { modifiedAst: _modifiedAst, pathToNodeMap, exprInsertIndex }
 }
 
 export function applyConstraintAxisAlign({

src/components/Toolbar/SetAngleBetween.tsx

@@ -86,6 +86,7 @@ export async function applyConstraintAngleBetween({
 }): Promise<{
   modifiedAst: Program
   pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
 }> {
   const info = angleBetweenInfo({ selectionRanges })
   if (err(info)) return Promise.reject(info)
@@ -122,6 +123,7 @@ export async function applyConstraintAngleBetween({
     return {
       modifiedAst,
       pathToNodeMap,
+      exprInsertIndex: -1,
     }
   }
 
@@ -141,6 +143,7 @@ export async function applyConstraintAngleBetween({
   const { modifiedAst: _modifiedAst, pathToNodeMap: _pathToNodeMap } =
     transformed2
 
+  let exprInsertIndex = -1
   if (variableName) {
     const newBody = [..._modifiedAst.body]
     newBody.splice(
@@ -153,9 +156,11 @@ export async function applyConstraintAngleBetween({
       const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
       pathToNode[index][0] = Number(pathToNode[index][0]) + 1
     })
+    exprInsertIndex = newVariableInsertIndex
   }
   return {
     modifiedAst: _modifiedAst,
     pathToNodeMap: _pathToNodeMap,
+    exprInsertIndex,
   }
 }

src/components/Toolbar/SetHorzVertDistance.tsx

@@ -87,15 +87,13 @@ export function horzVertDistanceInfo({
 export async function applyConstraintHorzVertDistance({
   selectionRanges,
   constraint,
-  // TODO align will always be false (covered by synconous applyConstraintHorzVertAlign), remove it
-  isAlign = false,
 }: {
   selectionRanges: Selections
   constraint: 'setHorzDistance' | 'setVertDistance'
-  isAlign?: false
 }): Promise<{
   modifiedAst: Program
   pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
 }> {
   const info = horzVertDistanceInfo({
     selectionRanges: selectionRanges,
@@ -133,13 +131,12 @@ export async function applyConstraintHorzVertDistance({
     return {
       modifiedAst,
       pathToNodeMap,
+      exprInsertIndex: -1,
     }
   } else {
     if (!isExprBinaryPart(valueNode))
       return Promise.reject('Invalid valueNode, is not a BinaryPart')
-    let finalValue = isAlign
-      ? createLiteral(0)
-      : removeDoubleNegatives(valueNode, sign, variableName)
+    let finalValue = removeDoubleNegatives(valueNode, sign, variableName)
     // transform again but forcing certain values
     const transformed = transformSecondarySketchLinesTagFirst({
       ast: kclManager.ast,
@@ -152,6 +149,7 @@ export async function applyConstraintHorzVertDistance({
 
     if (err(transformed)) return Promise.reject(transformed)
     const { modifiedAst: _modifiedAst, pathToNodeMap } = transformed
+    let exprInsertIndex = -1
     if (variableName) {
       const newBody = [..._modifiedAst.body]
       newBody.splice(
@@ -164,10 +162,12 @@ export async function applyConstraintHorzVertDistance({
         const index = pathToNode.findIndex((a) => a[0] === 'body') + 1
         pathToNode[index][0] = Number(pathToNode[index][0]) + 1
       })
+      exprInsertIndex = newVariableInsertIndex
     }
     return {
       modifiedAst: _modifiedAst,
       pathToNodeMap,
+      exprInsertIndex,
     }
   }
 }

src/components/Toolbar/setAngleLength.tsx

@@ -70,10 +70,14 @@ export async function applyConstraintLength({
 }: {
   length: KclCommandValue
   selectionRanges: Selections
-}) {
+}): Promise<{
+  modifiedAst: Program
+  pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
+}> {
   const ast = kclManager.ast
   const angleLength = angleLengthInfo({ selectionRanges })
-  if (err(angleLength)) return angleLength
+  if (err(angleLength)) return Promise.reject(angleLength)
   const { transforms } = angleLength
 
   let distanceExpression: Expr = length.valueAst
@@ -94,7 +98,7 @@ export async function applyConstraintLength({
   }
 
   if (!isExprBinaryPart(distanceExpression)) {
-    return new Error('Invalid valueNode, is not a BinaryPart')
+    return Promise.reject('Invalid valueNode, is not a BinaryPart')
   }
 
   const retval = transformAstSketchLines({
@@ -112,6 +116,12 @@ export async function applyConstraintLength({
   return {
     modifiedAst: _modifiedAst,
     pathToNodeMap,
+    exprInsertIndex:
+      'variableName' in length &&
+      length.variableName &&
+      length.insertIndex !== undefined
+        ? length.insertIndex
+        : -1,
   }
 }
 
@@ -124,6 +134,7 @@ export async function applyConstraintAngleLength({
 }): Promise<{
   modifiedAst: Program
   pathToNodeMap: PathToNodeMap
+  exprInsertIndex: number
 }> {
   const angleLength = angleLengthInfo({ selectionRanges, angleOrLength })
   if (err(angleLength)) return Promise.reject(angleLength)
@@ -208,5 +219,6 @@ export async function applyConstraintAngleLength({
   return {
     modifiedAst: _modifiedAst,
     pathToNodeMap,
+    exprInsertIndex: variableName ? newVariableInsertIndex : -1,
   }
 }

src/components/ViewControlMenu.tsx

@@ -0,0 +1,66 @@
+import { reportRejection } from 'lib/trap'
+import {
+  ContextMenu,
+  ContextMenuDivider,
+  ContextMenuItem,
+  ContextMenuItemRefresh,
+  ContextMenuProps,
+} from './ContextMenu'
+import { AxisNames, VIEW_NAMES_SEMANTIC } from 'lib/constants'
+import { useModelingContext } from 'hooks/useModelingContext'
+import { useMemo } from 'react'
+import { sceneInfra } from 'lib/singletons'
+
+export function useViewControlMenuItems() {
+  const { send: modelingSend } = useModelingContext()
+  const menuItems = useMemo(
+    () => [
+      ...Object.entries(VIEW_NAMES_SEMANTIC).map(([axisName, axisSemantic]) => (
+        <ContextMenuItem
+          key={axisName}
+          onClick={() => {
+            sceneInfra.camControls
+              .updateCameraToAxis(axisName as AxisNames)
+              .catch(reportRejection)
+          }}
+        >
+          {axisSemantic} view
+        </ContextMenuItem>
+      )),
+      <ContextMenuDivider />,
+      <ContextMenuItem
+        onClick={() => {
+          sceneInfra.camControls.resetCameraPosition().catch(reportRejection)
+        }}
+      >
+        Reset view
+      </ContextMenuItem>,
+      <ContextMenuItem
+        onClick={() => {
+          modelingSend({ type: 'Center camera on selection' })
+        }}
+      >
+        Center view on selection
+      </ContextMenuItem>,
+      <ContextMenuDivider />,
+      <ContextMenuItemRefresh />,
+    ],
+    [VIEW_NAMES_SEMANTIC]
+  )
+  return menuItems
+}
+
+export function ViewControlContextMenu({
+  menuTargetElement: wrapperRef,
+  ...props
+}: ContextMenuProps) {
+  const menuItems = useViewControlMenuItems()
+  return (
+    <ContextMenu
+      data-testid="view-controls-menu"
+      menuTargetElement={wrapperRef}
+      items={menuItems}
+      {...props}
+    />
+  )
+}

src/editor/plugins/lsp/kcl/colors.ts

@@ -0,0 +1,327 @@
+import {
+  EditorView,
+  WidgetType,
+  ViewUpdate,
+  ViewPlugin,
+  DecorationSet,
+  Decoration,
+} from '@codemirror/view'
+import { Range, Extension, Text } from '@codemirror/state'
+import { NodeProp, Tree } from '@lezer/common'
+import { language, syntaxTree } from '@codemirror/language'
+
+interface PickerState {
+  from: number
+  to: number
+  alpha: string
+  colorType: ColorType
+}
+
+export interface WidgetOptions extends PickerState {
+  color: string
+}
+
+export type ColorData = Omit<WidgetOptions, 'from' | 'to'>
+
+const pickerState = new WeakMap<HTMLInputElement, PickerState>()
+
+export enum ColorType {
+  hex = 'HEX',
+}
+
+const hexRegex = /(^|\b)(#[0-9a-f]{3,9})(\b|$)/i
+
+function discoverColorsInKCL(
+  syntaxTree: Tree,
+  from: number,
+  to: number,
+  typeName: string,
+  doc: Text,
+  language?: string
+): WidgetOptions | Array<WidgetOptions> | null {
+  switch (typeName) {
+    case 'Program':
+    case 'VariableDeclaration':
+    case 'CallExpression':
+    case 'ObjectExpression':
+    case 'ObjectProperty':
+    case 'ArgumentList':
+    case 'PipeExpression': {
+      let innerTree = syntaxTree.resolveInner(from, 0).tree
+
+      if (!innerTree) {
+        innerTree = syntaxTree.resolveInner(from, 1).tree
+        if (!innerTree) {
+          return null
+        }
+      }
+
+      const overlayTree = innerTree.prop(NodeProp.mounted)?.tree
+
+      if (overlayTree?.type.name !== 'Styles') {
+        return null
+      }
+
+      const ret: Array<WidgetOptions> = []
+      overlayTree.iterate({
+        from: 0,
+        to: overlayTree.length,
+        enter: ({ type, from: overlayFrom, to: overlayTo }) => {
+          const maybeWidgetOptions = discoverColorsInKCL(
+            syntaxTree,
+            // We add one because the tree doesn't include the
+            // quotation mark from the style tag
+            from + 1 + overlayFrom,
+            from + 1 + overlayTo,
+            type.name,
+            doc,
+            language
+          )
+
+          if (maybeWidgetOptions) {
+            if (Array.isArray(maybeWidgetOptions)) {
+              console.error('Unexpected nested overlays')
+              ret.push(...maybeWidgetOptions)
+            } else {
+              ret.push(maybeWidgetOptions)
+            }
+          }
+        },
+      })
+
+      return ret
+    }
+
+    case 'String': {
+      const result = parseColorLiteral(doc.sliceString(from, to))
+      if (!result) {
+        return null
+      }
+      return {
+        ...result,
+        from,
+        to,
+      }
+    }
+
+    default:
+      return null
+  }
+}
+
+export function parseColorLiteral(colorLiteral: string): ColorData | null {
+  const literal = colorLiteral.replace(/"/g, '')
+  const match = hexRegex.exec(literal)
+  if (!match) {
+    return null
+  }
+  const [color, alpha] = toFullHex(literal)
+
+  return {
+    colorType: ColorType.hex,
+    color,
+    alpha,
+  }
+}
+
+function colorPickersDecorations(
+  view: EditorView,
+  discoverColors: typeof discoverColorsInKCL
+) {
+  const widgets: Array<Range<Decoration>> = []
+
+  const st = syntaxTree(view.state)
+
+  for (const range of view.visibleRanges) {
+    st.iterate({
+      from: range.from,
+      to: range.to,
+      enter: ({ type, from, to }) => {
+        const maybeWidgetOptions = discoverColors(
+          st,
+          from,
+          to,
+          type.name,
+          view.state.doc,
+          view.state.facet(language)?.name
+        )
+
+        if (!maybeWidgetOptions) {
+          return
+        }
+
+        if (!Array.isArray(maybeWidgetOptions)) {
+          widgets.push(
+            Decoration.widget({
+              widget: new ColorPickerWidget(maybeWidgetOptions),
+              side: 1,
+            }).range(maybeWidgetOptions.from)
+          )
+
+          return
+        }
+
+        for (const wo of maybeWidgetOptions) {
+          widgets.push(
+            Decoration.widget({
+              widget: new ColorPickerWidget(wo),
+              side: 1,
+            }).range(wo.from)
+          )
+        }
+      },
+    })
+  }
+
+  return Decoration.set(widgets)
+}
+
+function toFullHex(color: string): string[] {
+  if (color.length === 4) {
+    // 3-char hex
+    return [
+      `#${color[1].repeat(2)}${color[2].repeat(2)}${color[3].repeat(2)}`,
+      '',
+    ]
+  }
+
+  if (color.length === 5) {
+    // 4-char hex (alpha)
+    return [
+      `#${color[1].repeat(2)}${color[2].repeat(2)}${color[3].repeat(2)}`,
+      color[4].repeat(2),
+    ]
+  }
+
+  if (color.length === 9) {
+    // 8-char hex (alpha)
+    return [`#${color.slice(1, -2)}`, color.slice(-2)]
+  }
+
+  return [color, '']
+}
+
+export const wrapperClassName = 'cm-css-color-picker-wrapper'
+
+class ColorPickerWidget extends WidgetType {
+  private readonly state: PickerState
+  private readonly color: string
+
+  constructor({ color, ...state }: WidgetOptions) {
+    super()
+    this.state = state
+    this.color = color
+  }
+
+  eq(other: ColorPickerWidget) {
+    return (
+      other.state.colorType === this.state.colorType &&
+      other.color === this.color &&
+      other.state.from === this.state.from &&
+      other.state.to === this.state.to &&
+      other.state.alpha === this.state.alpha
+    )
+  }
+
+  toDOM() {
+    const picker = document.createElement('input')
+    pickerState.set(picker, this.state)
+    picker.type = 'color'
+    picker.value = this.color
+
+    const wrapper = document.createElement('span')
+    wrapper.appendChild(picker)
+    wrapper.className = wrapperClassName
+
+    return wrapper
+  }
+
+  ignoreEvent() {
+    return false
+  }
+}
+
+export const colorPickerTheme = EditorView.baseTheme({
+  [`.${wrapperClassName}`]: {
+    display: 'inline-block',
+    outline: '1px solid #eee',
+    marginRight: '0.6ch',
+    height: '1em',
+    width: '1em',
+    transform: 'translateY(1px)',
+  },
+  [`.${wrapperClassName} input[type="color"]`]: {
+    cursor: 'pointer',
+    height: '100%',
+    width: '100%',
+    padding: 0,
+    border: 'none',
+    '&::-webkit-color-swatch-wrapper': {
+      padding: 0,
+    },
+    '&::-webkit-color-swatch': {
+      border: 'none',
+    },
+    '&::-moz-color-swatch': {
+      border: 'none',
+    },
+  },
+})
+
+interface IFactoryOptions {
+  discoverColors: typeof discoverColorsInKCL
+}
+
+export const makeColorPicker = (options: IFactoryOptions) =>
+  ViewPlugin.fromClass(
+    class ColorPickerViewPlugin {
+      decorations: DecorationSet
+
+      constructor(view: EditorView) {
+        this.decorations = colorPickersDecorations(view, options.discoverColors)
+      }
+
+      update(update: ViewUpdate) {
+        if (update.docChanged || update.viewportChanged) {
+          this.decorations = colorPickersDecorations(
+            update.view,
+            options.discoverColors
+          )
+        }
+      }
+    },
+    {
+      decorations: (v) => v.decorations,
+      eventHandlers: {
+        change: (e, view) => {
+          const target = e.target as HTMLInputElement
+          if (
+            target.nodeName !== 'INPUT' ||
+            !target.parentElement ||
+            !target.parentElement.classList.contains(wrapperClassName)
+          ) {
+            return false
+          }
+
+          const data = pickerState.get(target)!
+
+          let converted = '"' + target.value + data.alpha + '"'
+
+          view.dispatch({
+            changes: {
+              from: data.from,
+              to: data.to,
+              insert: converted,
+            },
+          })
+
+          return true
+        },
+      },
+    }
+  )
+
+export const colorPicker: Extension = [
+  makeColorPicker({ discoverColors: discoverColorsInKCL }),
+  colorPickerTheme,
+]