11import type { Server as HttpServer } from 'node:http' ;
22
33import type { Express } from 'express' ;
4- import { afterEach , beforeEach , describe , expect , it } from 'vitest' ;
4+ import { afterAll , beforeAll , beforeEach , describe , expect , it } from 'vitest' ;
55
66import log from '@apify/log' ;
77
@@ -19,9 +19,8 @@ describe('Actors MCP Server SSE', {
1919 let httpServer : HttpServer ;
2020 const testPort = 50000 ;
2121 const testHost = `http://localhost:${ testPort } ` ;
22- const serverStartWaitTimeMillis = 100 ;
2322
24- beforeEach ( async ( ) => {
23+ beforeAll ( async ( ) => {
2524 server = new ActorsMcpServer ( {
2625 enableDefaultActors : false ,
2726 } ) ;
@@ -32,15 +31,16 @@ describe('Actors MCP Server SSE', {
3231
3332 // Start test server
3433 await new Promise < void > ( ( resolve ) => {
35- httpServer = app . listen ( testPort , ( ) => {
36- // Wait for the server to be fully initialized
37- // TODO: figure out why this is needed
38- setTimeout ( ( ) => resolve ( ) , serverStartWaitTimeMillis ) ;
39- } ) ;
34+ httpServer = app . listen ( testPort , ( ) => resolve ( ) ) ;
4035 } ) ;
4136 } ) ;
4237
43- afterEach ( async ( ) => {
38+ beforeEach ( async ( ) => {
39+ // Reset the MCP server state before each test
40+ await server . reset ( ) ;
41+ } ) ;
42+
43+ afterAll ( async ( ) => {
4444 await server . close ( ) ;
4545 await new Promise < void > ( ( resolve ) => {
4646 httpServer . close ( ( ) => resolve ( ) ) ;
@@ -216,7 +216,7 @@ describe('Actors MCP Server Streamable HTTP', {
216216 const testPort = 50001 ;
217217 const testHost = `http://localhost:${ testPort } ` ;
218218
219- beforeEach ( async ( ) => {
219+ beforeAll ( async ( ) => {
220220 server = new ActorsMcpServer ( {
221221 enableDefaultActors : false ,
222222 } ) ;
@@ -234,7 +234,12 @@ describe('Actors MCP Server Streamable HTTP', {
234234 await new Promise < void > ( ( resolve ) => { setTimeout ( resolve , 1000 ) ; } ) ;
235235 } ) ;
236236
237- afterEach ( async ( ) => {
237+ beforeEach ( async ( ) => {
238+ // Reset the MCP server state before each test
239+ await server . reset ( ) ;
240+ } ) ;
241+
242+ afterAll ( async ( ) => {
238243 await new Promise < void > ( ( resolve ) => {
239244 httpServer . close ( ( ) => resolve ( ) ) ;
240245 } ) ;
0 commit comments