temp

Author: benfdking

.github/workflows/pr.yaml

@@ -53,6 +53,7 @@ jobs:
         run: pnpm exec playwright install
       - name: Run e2e tests
         working-directory: ./vscode/extension
+        timeout-minutes: 90
         run: |
           source ../../.venv/bin/activate
           pnpm run test:e2e

.prettierignore

@@ -20,6 +20,9 @@ vscode/extension/out
 vscode/extension/src_react
 vscode/extension/tsconfig.tsbuildinfo
 vscode/extension/.vscode-test/
+vscode/extension/playwright-report/
+vscode/extension/test-results/
+vscode/extension/.test_setup
 
 sqlmesh
 docs

vscode/extension/.gitignore

@@ -2,6 +2,7 @@ node_modules
 dist
 out
 .vscode-test
+.test_setup
 *.vsix
 LICENSE
 src_react

vscode/extension/playwright-report/data/d1bd5716a9941b5f96b111fba2ae078910e318b2.webm

@@ -3,9 +3,11 @@ import { defineConfig } from '@playwright/test'
 export default defineConfig({
   testDir: 'tests',
   timeout: 60_000,
-  retries: process.env.CI ? 1 : 0,
+  // TODO: When stable, allow retries in CI
+  retries: process.env.CI ? 0 : 0,
   workers: 1,
   reporter: [['html', { outputFolder: 'playwright-report' }], ['list']],
+  globalSetup: './tests/global-setup.ts',
   projects: [
     {
       name: 'electron-vscode',

vscode/extension/playwright-report/index.html

@@ -92,8 +92,9 @@ test('working project, then broken through adding double model, then refixed', a
       .locator('a')
       .click()
     // Save to refresh the context
-    await page.keyboard.press('Control+S')
-    await page.keyboard.press('Meta+S')
+    await page.keyboard.press(
+      process.platform === 'darwin' ? 'Meta+S' : 'Control+S',
+    )
 
     // Wait for the error to appear
     // TODO: Selector doesn't work in the linage view
@@ -103,8 +104,9 @@ test('working project, then broken through adding double model, then refixed', a
     await fs.remove(path.join(tempDir, 'models', 'customers_duplicated.sql'))
 
     // Save again to refresh the context
-    await page.keyboard.press('Control+S')
-    await page.keyboard.press('Meta+S')
+    await page.keyboard.press(
+      process.platform === 'darwin' ? 'Meta+S' : 'Control+S',
+    )
 
     // Wait for the error to go away and context to reload
     // TODO: Selector doesn't work in the linage view

vscode/extension/playwright.config.ts

@@ -0,0 +1,55 @@
+import { execSync } from 'child_process'
+import path from 'path'
+import fs from 'fs-extra'
+
+async function globalSetup() {
+  console.log('Setting up extension for Playwright tests...')
+
+  const extensionDir = path.join(__dirname, '..')
+  const testSetupDir = path.join(extensionDir, '.test_setup')
+  const extensionsDir = path.join(testSetupDir, 'extensions')
+
+  // Clean up any existing test setup directory
+  await fs.remove(testSetupDir)
+  await fs.ensureDir(extensionsDir)
+
+  // Get the extension version from package.json
+  const packageJson = JSON.parse(
+    fs.readFileSync(path.join(extensionDir, 'package.json'), 'utf-8'),
+  )
+  const version = packageJson.version
+  const extensionName = packageJson.name || 'sqlmesh'
+
+  // Look for the specific version .vsix file
+  const vsixFileName = `${extensionName}-${version}.vsix`
+  const vsixPath = path.join(extensionDir, vsixFileName)
+
+  if (!fs.existsSync(vsixPath)) {
+    throw new Error(
+      `Extension file ${vsixFileName} not found. Run "pnpm run vscode:package" first.`,
+    )
+  }
+
+  console.log(`Installing extension: ${vsixFileName}`)
+
+  // Create a temporary user data directory for the installation
+  const tempUserDataDir = await fs.mkdtemp(
+    path.join(require('os').tmpdir(), 'vscode-test-install-user-data-'),
+  )
+
+  try {
+    execSync(
+      `pnpm run code-server --user-data-dir "${tempUserDataDir}" --extensions-dir "${extensionsDir}" --install-extension "${vsixPath}"`,
+      {
+        stdio: 'inherit',
+        cwd: extensionDir,
+      },
+    )
+    console.log('Extension installed successfully to .test_setup/extensions')
+  } finally {
+    // Clean up temporary user data directory
+    await fs.remove(tempUserDataDir)
+  }
+}
+
+export default globalSetup

vscode/extension/tests/broken_project.spec.ts

@@ -84,7 +84,7 @@ test('Go to definition for model', async ({ page }) => {
       .locator('text=sushi.waiter_revenue_by_day')
       .first()
       .click({
-        modifiers: ['Meta'],
+        modifiers: [process.platform === 'darwin' ? 'Meta' : 'Control'],
       })
     await expect(
       page.locator('text=SUM(oi.quantity * i.price)::DOUBLE AS revenue'),

vscode/extension/tests/global-setup.ts

@@ -10,6 +10,23 @@ export interface CodeServerContext {
   defaultPythonInterpreter: string
 }
 
+/**
+ * Get the path to the extensions directory set up by global setup
+ * @returns The extensions directory path
+ */
+function getExtensionsDir(): string {
+  const extensionDir = path.join(__dirname, '..')
+  const extensionsDir = path.join(extensionDir, '.test_setup', 'extensions')
+
+  if (!fs.existsSync(extensionsDir)) {
+    throw new Error(
+      `Extensions directory not found at ${extensionsDir}. Make sure global setup has run.`,
+    )
+  }
+
+  return extensionsDir
+}
+
 /**
  * @param tempDir - The temporary directory to use for the code-server instance
  * @param placeFileWithPythonInterpreter - Whether to place a vscode/settings.json file in the temp directory that points to the python interpreter of the environmen the test is running in.
@@ -22,6 +39,9 @@ export async function startCodeServer({
   tempDir: string
   placeFileWithPythonInterpreter?: boolean
 }): Promise<CodeServerContext> {
+  // Get the extensions directory set up by global setup
+  const extensionsDir = getExtensionsDir()
+
   // Find an available port
   const codeServerPort = Math.floor(Math.random() * 10000) + 50000
   const defaultPythonInterpreter = path.join(
@@ -60,38 +80,7 @@ export async function startCodeServer({
     )
   }
 
-  // Get the extension version from package.json
-  const extensionDir = path.join(__dirname, '..')
-  const packageJson = JSON.parse(
-    fs.readFileSync(path.join(extensionDir, 'package.json'), 'utf-8'),
-  )
-  const version = packageJson.version
-  const extensionName = packageJson.name || 'sqlmesh'
-
-  // Look for the specific version .vsix file
-  const vsixFileName = `${extensionName}-${version}.vsix`
-  const vsixPath = path.join(extensionDir, vsixFileName)
-
-  if (!fs.existsSync(vsixPath)) {
-    throw new Error(
-      `Extension file ${vsixFileName} not found. Run "pnpm run vscode:package" first.`,
-    )
-  }
-
-  console.log(`Using extension: ${vsixFileName}`)
-
-  // Install the extension first
-  const extensionsDir = path.join(tempDir, 'extensions')
-  console.log('Installing extension...')
-  execSync(
-    `pnpm run code-server --user-data-dir "${userDataDir}" --extensions-dir "${extensionsDir}" --install-extension "${vsixPath}"`,
-    {
-      stdio: 'inherit',
-      cwd: path.join(__dirname, '..'),
-    },
-  )
-
-  // Start code-server instance
+  // Start code-server instance using the shared extensions directory
   const codeServerProcess = spawn(
     'pnpm',
     [