don't use base fixture

e2e/playwright/basic-sketch.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect, Page } from '@playwright/test'
-import { expect, Page } from '@playwright/test'
 import {
   getUtils,
   TEST_COLORS,

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { getUtils, setup, tearDown } from './test-utils'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import { uuidv4 } from 'lib/utils'

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 import { bracket } from 'lib/exampleKcl'

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { getUtils, setup, tearDown } from './test-utils'
 
 test.beforeEach(async ({ context, page }) => {

e2e/playwright/editor-tests.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { uuidv4 } from 'lib/utils'
 import { getUtils, setup, tearDown } from './test-utils'
 

e2e/playwright/lib/base-fixture.ts

@@ -1,48 +0,0 @@
-import * as fs from 'fs'
-import * as path from 'path'
-import * as crypto from 'crypto'
-import { test as baseTest } from '@playwright/test'
-
-const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output')
-
-export function generateUUID(): string {
-  return crypto.randomBytes(16).toString('hex')
-}
-
-export const test = baseTest.extend({
-  context: async ({ context }, use) => {
-    await context.addInitScript(() =>
-      window.addEventListener('beforeunload', () =>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (window as any).collectIstanbulCoverage(
-          JSON.stringify((window as any).__coverage__)
-        )
-      )
-    )
-    await fs.promises.mkdir(istanbulCLIOutput, { recursive: true })
-    await context.exposeFunction(
-      'collectIstanbulCoverage',
-      (coverageJSON: string) => {
-        if (coverageJSON)
-          fs.writeFileSync(
-            path.join(
-              istanbulCLIOutput,
-              `playwright_coverage_${generateUUID()}.json`
-            ),
-            coverageJSON
-          )
-      }
-    )
-    await use(context)
-    for (const page of context.pages()) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await page.evaluate(() =>
-        (window as any).collectIstanbulCoverage(
-          JSON.stringify((window as any).__coverage__)
-        )
-      )
-    }
-  },
-})
-
-export const expect = test.expect

e2e/playwright/onboarding-tests.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 import { bracket } from 'lib/exampleKcl'

e2e/playwright/regression-tests.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 

e2e/playwright/sketch-tests.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect, Page } from '@playwright/test'
-import { expect, Page } from '@playwright/test'
 
 import {
   getMovementUtils,

e2e/playwright/snapshot-tests.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { secrets } from './secrets'
 import { Paths, doExport, getUtils } from './test-utils'
 import { Models } from '@kittycad/lib'

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { commonPoints, getUtils, setup, tearDown } from './test-utils'
 

e2e/playwright/test-utils.ts

@@ -8,6 +8,8 @@ import {
 import { EngineCommand } from 'lang/std/artifactGraph'
 import os from 'os'
 import fsp from 'fs/promises'
+import * as fs from 'fs'
+import * as path from 'path'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
 import { Protocol } from 'playwright-core/types/protocol'
@@ -17,6 +19,7 @@ import waitOn from 'wait-on'
 import { secrets } from './secrets'
 import { TEST_SETTINGS_KEY, TEST_SETTINGS } from './storageStates'
 import * as TOML from '@iarna/toml'
+import { uuidv4 } from 'lib/utils'
 
 type TestColor = [number, number, number]
 export const TEST_COLORS = {
@@ -601,6 +604,16 @@ export async function tearDown(page: Page, testInfo: TestInfo) {
     uploadThroughput: -1,
   })
 
+  if (process.env.GENERATE_PLAYWRIGHT_COVERAGE) {
+    for (const activePage of page.context().pages()) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      await activePage.evaluate(() =>
+        (window as any).collectIstanbulCoverage(
+          JSON.stringify((window as any).__coverage__)
+        )
+      )
+    }
+  }
   // 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)
@@ -626,6 +639,34 @@ export async function setup(context: BrowserContext, page: Page) {
       settings: TOML.stringify({ settings: TEST_SETTINGS }),
     }
   )
+
+  if (process.env.GENERATE_PLAYWRIGHT_COVERAGE) {
+    await context.addInitScript(() =>
+      window.addEventListener('beforeunload', () =>
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (window as any).collectIstanbulCoverage(
+          JSON.stringify((window as any).__coverage__)
+        )
+      )
+    )
+    const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output')
+    await fsp.mkdir(istanbulCLIOutput, { recursive: true })
+    await context.exposeFunction(
+      'collectIstanbulCoverage',
+      (coverageJSON: string) => {
+        if (coverageJSON) {
+          fs.writeFileSync(
+            path.join(
+              istanbulCLIOutput,
+              `playwright_coverage_${uuidv4()}.json`
+            ),
+            coverageJSON
+          )
+        }
+      }
+    )
+  }
+
   // kill animations, speeds up tests and reduced flakiness
   await page.emulateMedia({ reducedMotion: 'reduce' })
 }

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import { uuidv4 } from 'lib/utils'
 import { getUtils, setup, tearDown } from './test-utils'

e2e/playwright/testing-constraints.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown, TEST_COLORS } from './test-utils'
 import { XOR } from 'lib/utils'

e2e/playwright/testing-gizmo.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 import { uuidv4 } from 'lib/utils'

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

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect, Page } from '@playwright/test'
-import { expect, Page } from '@playwright/test'
 
 import { deg, getUtils, setup, tearDown, wiggleMove } from './test-utils'
 import { LineInputsType } from 'lang/std/sketchcombos'

e2e/playwright/testing-selections.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import { commonPoints, getUtils, setup, tearDown } from './test-utils'
 import { Coords2d } from 'lang/std/sketch'

e2e/playwright/testing-settings.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { getUtils, setup, tearDown } from './test-utils'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { TEST_SETTINGS_KEY, TEST_SETTINGS_CORRUPTED } from './storageStates'

e2e/playwright/various.spec.ts

@@ -1,5 +1,4 @@
-import { test } from './lib/base-fixture'
+import { test, expect } from '@playwright/test'
-import { expect } from '@playwright/test'
 
 import {
   doExport,