chore: add existing connection log to tests

src/extension.ts

@@ -392,15 +392,19 @@ export class Extension implements RunHooks {
       }
     }
 
+    const items: vscodeTypes.TestItem[] = include ? [...include] : [];
     try {
       for (const model of this._models.enabledModels()) {
+        const result = model.narrowDownLocations(items);
+        if (!result.testIds && !result.locations)
+          continue;
         let globalSetupResult: reporterTypes.FullResult['status'] = 'passed';
         if (model.canRunGlobalHooks('setup')) {
-          const testListener = this._errorReportingListener(this._testRun);
+          const testListener = this._errorReportingListener(this._testRun, testItemForGlobalErrors);
           globalSetupResult = await model.runGlobalHooks('setup', testListener);
         }
         if (globalSetupResult === 'passed')
-          await this._runTest(this._testRun, include ? [...include] : [], testItemForGlobalErrors, new Set(), model, mode === 'debug', enqueuedTests.length === 1);
+          await this._runTest(this._testRun, items, testItemForGlobalErrors, new Set(), model, mode === 'debug', enqueuedTests.length === 1);
       }
     } finally {
       this._activeSteps.clear();

src/playwrightTestServer.ts

@@ -26,8 +26,6 @@ import { escapeRegex, pathSeparator } from './utils';
 import { debugSessionName } from './debugSessionName';
 import type { TestModel } from './testModel';
 import { TestServerInterface } from './upstream/testServerInterface';
-import { upstreamTreeItem } from './testTree';
-import { collectTestIds } from './upstream/testTree';
 
 export class PlaywrightTestServer {
   private _vscode: vscodeTypes.VSCode;
@@ -142,7 +140,7 @@ export class PlaywrightTestServer {
     if (!testServer)
       return;
 
-    const { locations, testIds } = this._narrowDownLocations(items);
+    const { locations, testIds } = this._model.narrowDownLocations(items);
     if (!locations && !testIds)
       return;
 
@@ -220,7 +218,7 @@ export class PlaywrightTestServer {
       if (token?.isCancellationRequested)
         return;
 
-      const { locations, testIds } = this._narrowDownLocations(items);
+      const { locations, testIds } = this._model.narrowDownLocations(items);
       if (!locations && !testIds)
         return;
 
@@ -247,7 +245,7 @@ export class PlaywrightTestServer {
       await testEndPromise;
     } finally {
       disposable?.dispose();
-      testServer?.closeGracefully({});
+      testServer?.close();
       await this._options.runHooks.onDidRunTests(true);
     }
   }
@@ -319,27 +317,7 @@ export class PlaywrightTestServer {
     const testServer = this._testServerPromise;
     this._testServerPromise = undefined;
     if (testServer)
-      testServer.then(server => server?.closeGracefully({}));
-  }
-
-  private _narrowDownLocations(items: vscodeTypes.TestItem[]): { locations: string[] | null, testIds?: string[] } {
-    if (!items.length)
-      return { locations: [] };
-    const locations = new Set<string>();
-    const testIds: string[] = [];
-    for (const item of items) {
-      const treeItem = upstreamTreeItem(item);
-      if (treeItem.kind === 'group' && (treeItem.subKind === 'folder' || treeItem.subKind === 'file')) {
-        for (const file of this._model.enabledFiles()) {
-          if (file === treeItem.location.file || file.startsWith(treeItem.location.file))
-            locations.add(treeItem.location.file);
-        }
-      } else {
-        testIds.push(...collectTestIds(treeItem));
-      }
-    }
-
-    return { locations: locations.size ? [...locations] : null, testIds: testIds.length ? testIds : undefined };
+      testServer.then(server => server?.close());
   }
 }
 

src/testModel.ts

@@ -27,6 +27,8 @@ import { MultiMap } from './multimap';
 import { PlaywrightTestServer } from './playwrightTestServer';
 import type { PlaywrightTestRunOptions, RunHooks, TestConfig } from './playwrightTestTypes';
 import { PlaywrightTestCLI } from './playwrightTestCLI';
+import { upstreamTreeItem } from './testTree';
+import { collectTestIds } from './upstream/testTree';
 
 export type TestEntry = reporterTypes.TestCase | reporterTypes.Suite;
 
@@ -508,6 +510,26 @@ export class TestModel {
       }
     }
   }
+
+  narrowDownLocations(items: vscodeTypes.TestItem[]): { locations: string[] | null, testIds?: string[] } {
+    if (!items.length)
+      return { locations: [] };
+    const locations = new Set<string>();
+    const testIds: string[] = [];
+    for (const item of items) {
+      const treeItem = upstreamTreeItem(item);
+      if (treeItem.kind === 'group' && (treeItem.subKind === 'folder' || treeItem.subKind === 'file')) {
+        for (const file of this.enabledFiles()) {
+          if (file === treeItem.location.file || file.startsWith(treeItem.location.file))
+            locations.add(treeItem.location.file);
+        }
+      } else {
+        testIds.push(...collectTestIds(treeItem));
+      }
+    }
+
+    return { locations: locations.size ? [...locations] : null, testIds: testIds.length ? testIds : undefined };
+  }
 }
 
 export class TestModelCollection extends DisposableBase {

src/upstream/testServerConnection.ts

@@ -184,4 +184,11 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
   async closeGracefully(params: Parameters<TestServerInterface['closeGracefully']>[0]): ReturnType<TestServerInterface['closeGracefully']> {
     await this._sendMessage('closeGracefully', params);
   }
+
+  close() {
+    try {
+      this._ws.close();
+    } catch {
+    }
+  }
 }

tests/debug-tests.spec.ts

@@ -16,6 +16,7 @@
 
 import { expect, test } from './utils';
 import { TestRun } from './mock/vscode';
+import path from 'path';
 
 test('should debug all tests', async ({ activate }) => {
   const { vscode } = await activate({
@@ -46,6 +47,17 @@ test('should debug all tests', async ({ activate }) => {
     > playwright list-files -c playwright.config.js
     > debug -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'runGlobalSetup', params: {} },
+    {
+      method: 'runTests',
+      params: expect.objectContaining({
+        locations: [],
+        testIds: undefined
+      })
+    },
+  ]);
 });
 
 test('should debug one test', async ({ activate }) => {
@@ -74,6 +86,23 @@ test('should debug one test', async ({ activate }) => {
     > playwright test -c playwright.config.js --list --reporter=null tests/test.spec.ts
     > debug -c playwright.config.js tests/test.spec.ts:3
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    {
+      method: 'listTests',
+      params: expect.objectContaining({
+        locations: [expect.stringContaining(`tests${path.sep}test\\.spec\\.ts`)]
+      })
+    },
+    { method: 'runGlobalSetup', params: {} },
+    {
+      method: 'runTests',
+      params: expect.objectContaining({
+        locations: undefined,
+        testIds: [expect.any(String)]
+      })
+    },
+  ]);
 });
 
 test('should debug error', async ({ activate }, testInfo) => {

tests/decorations.spec.ts

@@ -15,6 +15,7 @@
  */
 
 import { expect, test } from './utils';
+import path from 'path';
 
 test('should highlight steps while running', async ({ activate }) => {
   const { vscode, testController } = await activate({
@@ -68,4 +69,21 @@ test('should highlight steps while running', async ({ activate }) => {
     > playwright test -c playwright.config.js --list --reporter=null tests/test.spec.ts
     > playwright test -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    {
+      method: 'listTests',
+      params: expect.objectContaining({
+        locations: [expect.stringContaining(`tests${path.sep}test\\.spec\\.ts`)]
+      })
+    },
+    { method: 'runGlobalSetup', params: {} },
+    {
+      method: 'runTests',
+      params: expect.objectContaining({
+        locations: [],
+        testIds: undefined
+      })
+    },
+  ]);
 });

tests/global-errors.spec.ts

@@ -73,6 +73,17 @@ test('should report error in global setup (implicit)', async ({ activate, useTes
     > playwright list-files -c playwright.config.js
     > playwright test -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'runGlobalSetup', params: {} },
+    {
+      method: 'runTests',
+      params: expect.objectContaining({
+        locations: [],
+        testIds: undefined
+      })
+    },
+  ]);
 });
 
 test('should report error in global setup (explicit)', async ({ activate, useTestServer }) => {
@@ -101,4 +112,8 @@ test('should report error in global setup (explicit)', async ({ activate, useTes
     > playwright list-files -c playwright.config.js
     > playwright test -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'runGlobalSetup', params: {} },
+  ]);
 });

tests/list-files.spec.ts

@@ -32,6 +32,9 @@ test('should list files', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should list files top level if no testDir', async ({ activate }, testInfo) => {
@@ -49,6 +52,9 @@ test('should list files top level if no testDir', async ({ activate }, testInfo)
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should list only test files', async ({ activate }) => {
@@ -94,6 +100,9 @@ test('should list folders', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should pick new files', async ({ activate }) => {
@@ -110,6 +119,9 @@ test('should pick new files', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 
   await Promise.all([
     new Promise(f => testController.onDidChangeTestItem(f)),
@@ -126,6 +138,10 @@ test('should pick new files', async ({ activate }) => {
     > playwright list-files -c playwright.config.js
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should not pick non-test files', async ({ activate }) => {
@@ -189,6 +205,9 @@ test('should remove deleted files', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 
   await Promise.all([
     new Promise(f => testController.onDidChangeTestItem(f)),
@@ -205,6 +224,10 @@ test('should remove deleted files', async ({ activate }) => {
     > playwright list-files -c playwright.config.js
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should do nothing for not loaded changed file', async ({ activate }) => {
@@ -256,6 +279,9 @@ test('should support multiple projects', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should switch between multiple projects with filter', async ({ activate }) => {
@@ -288,6 +314,9 @@ test('should switch between multiple projects with filter', async ({ activate })
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 
   await expect(vscode).toHaveProjectTree(`
     config: playwright.config.js
@@ -311,6 +340,9 @@ test('should switch between multiple projects with filter', async ({ activate })
   await expect(vscode).toHaveExecLog(`
     > playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should list files in relative folder', async ({ activate }) => {
@@ -328,6 +360,9 @@ test('should list files in relative folder', async ({ activate }) => {
   await expect(vscode).toHaveExecLog(`
     foo/bar> playwright list-files -c playwright.config.js
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} }
+  ]);
 });
 
 test('should list files in multi-folder workspace with project switching', async ({ activate }, testInfo) => {
@@ -386,6 +421,10 @@ test('should ignore errors when listing files', async ({ activate }) => {
     > playwright list-files -c playwright.config.js
     > playwright list-files -c playwright.config.ts
   `);
+  await expect(vscode).toHaveConnectionLog([
+    { method: 'listFiles', params: {} },
+    { method: 'listFiles', params: {} }
+  ]);
 
   await new Promise(f => setTimeout(f, 2000));
   await expect.poll(() => vscode.languages.getDiagnostics()).toEqual([