chore: migrate to the testserver.initialize

microsoft · Apr 3, 2024 · 740acc8 · 740acc8
1 parent a20fad9
commit 740acc8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/src/playwrightTestServer.ts b/src/playwrightTestServer.ts
@@ -213,8 +213,10 @@ export class PlaywrightTestServer {
         return;
       const address = await addressPromise;
       testServer = new TestServerConnection(address);
-      await testServer.connect();
-      await testServer.setSerializer({ serializer: require.resolve('./oopReporter') });
+      await testServer.initialize({
+        serializer: require.resolve('./oopReporter'),
+        closeOnDisconnect: true,
+      });
       if (token?.isCancellationRequested)
         return;
 
@@ -286,9 +288,11 @@ export class PlaywrightTestServer {
     if (!wsEndpoint)
       return null;
     const testServer = new TestServerConnection(wsEndpoint);
-    await testServer.connect();
-    await testServer.setInterceptStdio({ intercept: true });
-    await testServer.setSerializer({ serializer: require.resolve('./oopReporter') });
+    await testServer.initialize({
+      serializer: require.resolve('./oopReporter'),
+      interceptStdio: true,
+      closeOnDisconnect: true,
+    });
     return testServer;
   }
 

diff --git a/src/upstream/testServerConnection.ts b/src/upstream/testServerConnection.ts
@@ -66,10 +66,7 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     });
     const pingInterval = setInterval(() => this._sendMessage('ping').catch(() => {}), 30000);
     this._connectedPromise = new Promise<void>((f, r) => {
-      this._ws.addEventListener('open', () => {
-        f();
-        this._ws.send(JSON.stringify({ id: -1, method: 'ready' }));
-      });
+      this._ws.addEventListener('open', () => f());
       this._ws.addEventListener('error', r);
     });
     this._ws.addEventListener('close', () => {
@@ -78,10 +75,6 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     });
   }
 
-  connect() {
-    return this._connectedPromise;
-  }
-
   private async _sendMessage(method: string, params?: any): Promise<any> {
     const logForTest = (globalThis as any).__logForTest;
     logForTest?.({ method, params });
@@ -112,8 +105,8 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
       this._onLoadTraceRequestedEmitter.fire(params);
   }
 
-  async setSerializer(params: { serializer: string; }): Promise<void> {
-    await this._sendMessage('setSerializer', params);
+  async initialize(params: Parameters<TestServerInterface['initialize']>[0]): ReturnType<TestServerInterface['initialize']> {
+    await this._sendMessage('initialize', params);
   }
 
   async ping(params: Parameters<TestServerInterface['ping']>[0]): ReturnType<TestServerInterface['ping']> {
@@ -132,10 +125,6 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     this._sendMessageNoReply('watch', params);
   }
 
-  async watchTestDir(params: Parameters<TestServerInterface['watchTestDir']>[0]): ReturnType<TestServerInterface['watchTestDir']> {
-    await this._sendMessage('watchTestDir', params);
-  }
-
   async open(params: Parameters<TestServerInterface['open']>[0]): ReturnType<TestServerInterface['open']> {
     await this._sendMessage('open', params);
   }
@@ -192,10 +181,6 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     this._sendMessageNoReply('stopTests', params);
   }
 
-  async setInterceptStdio(params: Parameters<TestServerInterface['setInterceptStdio']>[0]): ReturnType<TestServerInterface['setInterceptStdio']> {
-    await this._sendMessage('setInterceptStdio', params);
-  }
-
   async closeGracefully(params: Parameters<TestServerInterface['closeGracefully']>[0]): ReturnType<TestServerInterface['closeGracefully']> {
     await this._sendMessage('closeGracefully', params);
   }

diff --git a/src/upstream/testServerInterface.ts b/src/upstream/testServerInterface.ts
@@ -21,16 +21,19 @@ import { JsonEvent } from './teleReceiver';
 export type ReportEntry = JsonEvent;
 
 export interface TestServerInterface {
-  setSerializer(params: { serializer: string }): Promise<void>;
+  initialize(params: {
+    serializer?: string,
+    closeOnDisconnect?: boolean,
+    interceptStdio?: boolean,
+    watchTestDirs?: boolean,
+  }): Promise<void>;
 
   ping(params: {}): Promise<void>;
 
   watch(params: {
     fileNames: string[];
   }): Promise<void>;
 
-  watchTestDir(params: {}): Promise<void>;
-
   open(params: { location: reporterTypes.Location }): Promise<void>;
 
   resizeTerminal(params: { cols: number, rows: number }): Promise<void>;
@@ -90,8 +93,6 @@ export interface TestServerInterface {
 
   stopTests(params: {}): Promise<void>;
 
-  setInterceptStdio(params: { intercept: boolean }): Promise<void>;
-
   closeGracefully(params: {}): Promise<void>;
 }