DEV stash

Author: cdcabrera

jest.setupTests.ts

@@ -1 +1,4 @@
 // Shared helpers for all Jest tests
+
+// Set NODE_ENV to test for all tests
+process.env.NODE_ENV = 'test';

src/server.ts

@@ -49,6 +49,29 @@ const runServer = async (options = OPTIONS, {
       running = false;
       console.log('PatternFly MCP server stopped');
       process.exit(0);
+      /*
+      try {
+        // Close the server first
+        await server?.close();
+
+        // Close the transport if it exists
+        if (transport) {
+          // StdioServerTransport doesn't have a close method, but we can set it to null
+          transport = null;
+        }
+
+        running = false;
+        console.log('PatternFly MCP server stopped');
+
+        // Only exit process if not in test environment
+        if (process.env.NODE_ENV !== 'test') {
+          process.exit(0);
+        }
+      } catch (error) {
+        console.error('Error stopping server:', error);
+        running = false;
+      }
+      */
     }
   };
 
@@ -72,7 +95,7 @@ const runServer = async (options = OPTIONS, {
       server?.registerTool(name, schema, callback);
     });
 
-    if (enableSigint) {
+    if (enableSigint && process.env.NODE_ENV !== 'test') {
       process.on('SIGINT', async () => stopServer());
     }
 

tests/cli.test.ts

@@ -4,17 +4,29 @@
  * Focuses on CLI-specific functionality and parsing behavior.
  */
 
+import { start, type ServerInstance } from '../src/index';
 import { OPTIONS, parseCliOptions, setOptions } from '../src/options';
 
 describe('CLI Functionality', () => {
   let originalArgv: string[];
+  let serverInstances: ServerInstance[] = [];
 
   beforeEach(() => {
     // Store original process.argv
     originalArgv = process.argv;
+    // Clear server instances array
+    serverInstances = [];
   });
 
-  afterEach(() => {
+  afterEach(async () => {
+    // Clean up all server instances
+    for (const server of serverInstances) {
+      if (server.isRunning()) {
+        await server.stop();
+      }
+    }
+    serverInstances = [];
+    
     // Restore original process.argv
     process.argv = originalArgv;
   });
@@ -28,9 +40,11 @@ describe('CLI Functionality', () => {
 
       expect(cliOptions.docsHost).toBe(true);
 
-      // Test setOptions() with CLI options
-      setOptions(cliOptions);
+      // Test start() with CLI options
+      const server = await start(cliOptions);
+      serverInstances.push(server);
       expect(OPTIONS.docsHost).toBe(true);
+      expect(server.isRunning()).toBe(true);
     });
 
     it('should handle CLI without --docs-host flag', async () => {
@@ -41,13 +55,11 @@ describe('CLI Functionality', () => {
 
       expect(cliOptions.docsHost).toBe(false);
 
-      // Test setOptions with CLI options
-      setOptions(cliOptions);
-      expect(OPTIONS.docsHost).toBe(false);
-
-      // Test setOptions() with CLI options
-      setOptions(cliOptions);
+      // Test start() with CLI options
+      const server = await start(cliOptions);
+      serverInstances.push(server);
       expect(OPTIONS.docsHost).toBe(false);
+      expect(server.isRunning()).toBe(true);
     });
 
     it('should handle CLI with other arguments', async () => {
@@ -58,35 +70,35 @@ describe('CLI Functionality', () => {
 
       expect(cliOptions.docsHost).toBe(false);
 
-      // Test setOptions with CLI options
-      setOptions(cliOptions);
-      expect(OPTIONS.docsHost).toBe(false);
-
-      // Test setOptions() with CLI options
-      setOptions(cliOptions);
+      // Test start() with CLI options
+      const server = await start(cliOptions);
+      serverInstances.push(server);
       expect(OPTIONS.docsHost).toBe(false);
+      expect(server.isRunning()).toBe(true);
     });
 
     it('should handle multiple CLI calls', async () => {
       // First CLI call with --docs-host
       process.argv = ['node', 'script.js', '--docs-host'];
       const cliOptions1 = parseCliOptions();
 
-      setOptions(cliOptions1);
-      setOptions(cliOptions1);
+      const server1 = await start(cliOptions1);
+      serverInstances.push(server1);
 
       expect(cliOptions1.docsHost).toBe(true);
       expect(OPTIONS.docsHost).toBe(true);
+      expect(server1.isRunning()).toBe(true);
 
       // Second CLI call without --docs-host
       process.argv = ['node', 'script.js'];
       const cliOptions2 = parseCliOptions();
 
-      setOptions(cliOptions2);
-      setOptions(cliOptions2);
+      const server2 = await start(cliOptions2);
+      serverInstances.push(server2);
 
       expect(cliOptions2.docsHost).toBe(false);
       expect(OPTIONS.docsHost).toBe(false);
+      expect(server2.isRunning()).toBe(true);
     });
   });
 });