chore: adding a skipLocalEngine tag

2025-02-07 11:00:03 -06:00
parent b2fea24fc4
commit 1469c685c0
5 changed files with 110 additions and 105 deletions
--- a/e2e/playwright/desktop-export.spec.ts
+++ b/e2e/playwright/desktop-export.spec.ts
@ -9,7 +9,7 @@ import fsp from 'fs/promises'

 test(
  'export works on the first try',
-  { tag: '@electron' },
+  { tag: ['@electron', '@skipLocalEngine'] },
  async ({ page, context, scene }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = path.join(dir, 'bracket')
--- a/e2e/playwright/projects.spec.ts
+++ b/e2e/playwright/projects.spec.ts
@ -455,7 +455,7 @@ test.describe('Can export from electron app', () => {
  for (const method of exportMethods) {
    test(
      `Can export using ${method}`,
-      { tag: '@electron' },
+      { tag: ['@electron', '@skipLocalEngine'] },
      async ({ context, page }, testInfo) => {
        await context.folderSetupFn(async (dir) => {
          const bracketDir = path.join(dir, 'bracket')
--- a/e2e/playwright/regression-tests.spec.ts
+++ b/e2e/playwright/regression-tests.spec.ts
@ -251,7 +251,7 @@ extrude001 = extrude(sketch001, length = 50)
      |> yLineTo(0, %)
      |> close()
      |>
-  
+
    example = extrude(exampleSketch, length = 5)
    shell({ faces: ['end'], thickness: 0.25 }, exampleSketch)`
        )
@ -306,113 +306,113 @@ extrude001 = extrude(sketch001, length = 50)
      |> angledLine({ angle: 50, length: 45 }, %)
      |> yLineTo(0, %)
      |> close()
-  
+
      thing: "blah"`)

      await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
    }
  )

-  test('when engine fails export we handle the failure and alert the user', async ({
-    scene,
-    page,
-    homePage,
-  }) => {
-    const u = await getUtils(page)
-    await page.addInitScript(
-      async ({ code }) => {
-        localStorage.setItem('persistCode', code)
-        ;(window as any).playwrightSkipFilePicker = true
-      },
-      { code: TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR }
-    )
+  test(
+    'when engine fails export we handle the failure and alert the user',
+    { tag: '@skipLocalEngine' },
+    async ({ scene, page, homePage }) => {
+      const u = await getUtils(page)
+      await page.addInitScript(
+        async ({ code }) => {
+          localStorage.setItem('persistCode', code)
+          ;(window as any).playwrightSkipFilePicker = true
+        },
+        { code: TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR }
+      )

-    await page.setBodyDimensions({ width: 1000, height: 500 })
+      await page.setBodyDimensions({ width: 1000, height: 500 })

-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+      await homePage.goToModelingScene()
+      await u.waitForPageLoad()

-    // wait for execution done
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
+      // wait for execution done
+      await u.openDebugPanel()
+      await u.expectCmdLog('[data-message-type="execution-done"]')
+      await u.closeDebugPanel()

-    // expect zero errors in guter
-    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
+      // expect zero errors in guter
+      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()

-    // export the model
-    const exportButton = page.getByTestId('export-pane-button')
-    await expect(exportButton).toBeVisible()
+      // export the model
+      const exportButton = page.getByTestId('export-pane-button')
+      await expect(exportButton).toBeVisible()

-    // Click the export button
-    await exportButton.click()
+      // Click the export button
+      await exportButton.click()

-    // Click the stl.
-    const stlOption = page.getByText('glTF')
-    await expect(stlOption).toBeVisible()
+      // Click the stl.
+      const stlOption = page.getByText('glTF')
+      await expect(stlOption).toBeVisible()

-    await page.keyboard.press('Enter')
+      await page.keyboard.press('Enter')

-    // Click the checkbox
-    const submitButton = page.getByText('Confirm Export')
-    await expect(submitButton).toBeVisible()
+      // Click the checkbox
+      const submitButton = page.getByText('Confirm Export')
+      await expect(submitButton).toBeVisible()

-    await page.keyboard.press('Enter')
+      await page.keyboard.press('Enter')

-    // Find the toast.
-    // Look out for the toast message
-    const exportingToastMessage = page.getByText(`Exporting...`)
-    const errorToastMessage = page.getByText(`Error while exporting`)
+      // Find the toast.
+      // Look out for the toast message
+      const exportingToastMessage = page.getByText(`Exporting...`)
+      const errorToastMessage = page.getByText(`Error while exporting`)

-    const engineErrorToastMessage = page.getByText(`Nothing to export`)
-    await expect(engineErrorToastMessage).toBeVisible()
+      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      await expect(engineErrorToastMessage).toBeVisible()

-    // Make sure the exporting toast is gone
-    await expect(exportingToastMessage).not.toBeVisible()
+      // Make sure the exporting toast is gone
+      await expect(exportingToastMessage).not.toBeVisible()

-    // Click the code editor
-    await page.locator('.cm-content').click()
+      // Click the code editor
+      await page.locator('.cm-content').click()

-    await page.waitForTimeout(2000)
+      await page.waitForTimeout(2000)

-    // Expect the toast to be gone
-    await expect(errorToastMessage).not.toBeVisible()
-    await expect(engineErrorToastMessage).not.toBeVisible()
+      // Expect the toast to be gone
+      await expect(errorToastMessage).not.toBeVisible()
+      await expect(engineErrorToastMessage).not.toBeVisible()

-    // Now add in code that works.
-    await page.locator('.cm-content').fill(bracket)
-    await page.keyboard.press('End')
-    await page.keyboard.press('Enter')
+      // Now add in code that works.
+      await page.locator('.cm-content').fill(bracket)
+      await page.keyboard.press('End')
+      await page.keyboard.press('Enter')

-    await scene.waitForExecutionDone()
+      await scene.waitForExecutionDone()

-    // Now try exporting
+      // Now try exporting

-    // Click the export button
-    await exportButton.click()
+      // Click the export button
+      await exportButton.click()

-    // Click the stl.
-    await expect(stlOption).toBeVisible()
+      // Click the stl.
+      await expect(stlOption).toBeVisible()

-    await page.keyboard.press('Enter')
+      await page.keyboard.press('Enter')

-    // Click the checkbox
-    await expect(submitButton).toBeVisible()
+      // Click the checkbox
+      await expect(submitButton).toBeVisible()

-    await page.keyboard.press('Enter')
+      await page.keyboard.press('Enter')

-    // Find the toast.
-    // Look out for the toast message
-    await expect(exportingToastMessage).toBeVisible()
+      // Find the toast.
+      // Look out for the toast message
+      await expect(exportingToastMessage).toBeVisible()

-    // Expect it to succeed.
-    await expect(exportingToastMessage).not.toBeVisible({ timeout: 15_000 })
-    await expect(errorToastMessage).not.toBeVisible()
-    await expect(engineErrorToastMessage).not.toBeVisible()
+      // Expect it to succeed.
+      await expect(exportingToastMessage).not.toBeVisible({ timeout: 15_000 })
+      await expect(errorToastMessage).not.toBeVisible()
+      await expect(engineErrorToastMessage).not.toBeVisible()

-    const successToastMessage = page.getByText(`Exported successfully`)
-    await expect(successToastMessage).toBeVisible()
-  })
+      const successToastMessage = page.getByText(`Exported successfully`)
+      await expect(successToastMessage).toBeVisible()
+    }
+  )
  test(
    'ensure you can not export while an export is already going',
    { tag: ['@skipLinux', '@skipWin'] },
--- a/e2e/playwright/various.spec.ts
+++ b/e2e/playwright/various.spec.ts
@ -32,15 +32,18 @@ test.fixme('Units menu', async ({ page, homePage }) => {
  await expect(unitsMenuButton).toContainText('mm')
 })

-test('Successful export shows a success toast', async ({ page, homePage }) => {
-  // FYI this test doesn't work with only engine running locally
-  // And you will need to have the KittyCAD CLI installed
-  const u = await getUtils(page)
-  await page.addInitScript(async () => {
-    ;(window as any).playwrightSkipFilePicker = true
-    localStorage.setItem(
-      'persistCode',
-      `topAng = 25
+test(
+  'Successful export shows a success toast',
+  { tag: '@skipLocalEngine' },
+  async ({ page, homePage }) => {
+    // FYI this test doesn't work with only engine running locally
+    // And you will need to have the KittyCAD CLI installed
+    const u = await getUtils(page)
+    await page.addInitScript(async () => {
+      ;(window as any).playwrightSkipFilePicker = true
+      localStorage.setItem(
+        'persistCode',
+        `topAng = 25
 bottomAng = 35
 baseLen = 3.5
 baseHeight = 1
@ -78,26 +81,27 @@ part001 = startSketchOn('-XZ')
 |> xLineTo(ZERO, %)
 |> close()
 |> extrude(length = 4)`
+      )
+    })
+    await page.setBodyDimensions({ width: 1200, height: 500 })
+
+    await homePage.goToModelingScene()
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.waitForCmdReceive('extrude')
+    await page.waitForTimeout(1000)
+    await u.clearAndCloseDebugPanel()
+
+    await doExport(
+      {
+        type: 'gltf',
+        storage: 'embedded',
+        presentation: 'pretty',
+      },
+      page
    )
-  })
-  await page.setBodyDimensions({ width: 1200, height: 500 })
-
-  await homePage.goToModelingScene()
-  await u.openDebugPanel()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.waitForCmdReceive('extrude')
-  await page.waitForTimeout(1000)
-  await u.clearAndCloseDebugPanel()
-
-  await doExport(
-    {
-      type: 'gltf',
-      storage: 'embedded',
-      presentation: 'pretty',
-    },
-    page
-  )
-})
+  }
+)

 test('Paste should not work unless an input is focused', async ({
  page,
--- a/package.json
+++ b/package.json
@ -120,6 +120,7 @@
    "test:playwright:electron:windows:local": "yarn tronb:vite:dev && set NODE_ENV='development' && playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\"",
    "test:playwright:electron:macos:local": "yarn tronb:vite:dev && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
    "test:playwright:electron:ubuntu:local": "yarn tronb:vite:dev && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
+    "test:playwright:electron:ubuntu:engine:local": "yarn tronb:vite:dev && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot|@skipLocalEngine'",
    "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"
  },