Fix failing tests

Author: cameroncooke

src/core/__tests__/resources.test.ts

@@ -1,14 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 
-import {
-  registerResources,
-  getAvailableResources,
-  supportsResources,
-  loadResources,
-  shouldExcludeTool,
-  getRedundantToolNames,
-} from '../resources.js';
+import { registerResources, getAvailableResources, loadResources } from '../resources.js';
 
 describe('resources', () => {
   let mockServer: McpServer;
@@ -35,10 +28,6 @@ describe('resources', () => {
   });
 
   describe('Exports', () => {
-    it('should export supportsResources function', () => {
-      expect(typeof supportsResources).toBe('function');
-    });
-
     it('should export registerResources function', () => {
       expect(typeof registerResources).toBe('function');
     });
@@ -52,12 +41,6 @@ describe('resources', () => {
     });
   });
 
-  describe('supportsResources', () => {
-    it('should return true for resource support', () => {
-      expect(supportsResources()).toBe(true);
-    });
-  });
-
   describe('loadResources', () => {
     it('should load resources from generated loaders', async () => {
       const resources = await loadResources();
@@ -128,37 +111,4 @@ describe('resources', () => {
       expect(resources.length).toBe(uniqueResources.length);
     });
   });
-
-  describe('tool filtering', () => {
-    describe('getRedundantToolNames', () => {
-      it('should return array of redundant tool names', () => {
-        const redundantTools = getRedundantToolNames();
-
-        expect(Array.isArray(redundantTools)).toBe(true);
-        expect(redundantTools).toContain('list_sims');
-      });
-    });
-
-    describe('shouldExcludeTool', () => {
-      it('should exclude redundant tools when resources are registered', () => {
-        expect(shouldExcludeTool('list_sims', true)).toBe(true);
-        expect(shouldExcludeTool('other_tool', true)).toBe(false);
-      });
-
-      it('should not exclude any tools when resources are not registered', () => {
-        expect(shouldExcludeTool('list_sims', false)).toBe(false);
-        expect(shouldExcludeTool('other_tool', false)).toBe(false);
-      });
-    });
-
-    describe('supportsResources', () => {
-      it('should return true by default for backward compatibility', () => {
-        expect(supportsResources()).toBe(true);
-      });
-
-      it('should return true when server is not provided', () => {
-        expect(supportsResources(undefined)).toBe(true);
-      });
-    });
-  });
 });

src/mcp/resources/__tests__/simulators.test.ts

@@ -43,10 +43,12 @@ describe('simulators resource', () => {
         }),
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].type).toBe('text');
       expect(result.contents[0].text).toContain('Available iOS Simulators:');
       expect(result.contents[0].text).toContain('iPhone 15 Pro');
       expect(result.contents[0].text).toContain('ABC123-DEF456-GHI789');
@@ -59,10 +61,12 @@ describe('simulators resource', () => {
         error: 'Command failed',
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].type).toBe('text');
       expect(result.contents[0].text).toContain('Failed to list simulators');
       expect(result.contents[0].text).toContain('Command failed');
     });
@@ -73,20 +77,24 @@ describe('simulators resource', () => {
         output: 'invalid json',
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].type).toBe('text');
       expect(result.contents[0].text).toBe('invalid json');
     });
 
     it('should handle spawn errors', async () => {
       const mockExecutor = createMockExecutor(new Error('spawn xcrun ENOENT'));
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].type).toBe('text');
       expect(result.contents[0].text).toContain('Failed to list simulators');
       expect(result.contents[0].text).toContain('spawn xcrun ENOENT');
     });
@@ -97,10 +105,12 @@ describe('simulators resource', () => {
         output: JSON.stringify({ devices: {} }),
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents).toHaveLength(1);
-      expect(result.contents[0].type).toBe('text');
       expect(result.contents[0].text).toContain('Available iOS Simulators:');
     });
 
@@ -121,7 +131,10 @@ describe('simulators resource', () => {
         }),
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents[0].text).toContain('[Booted]');
     });
@@ -149,7 +162,10 @@ describe('simulators resource', () => {
         }),
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents[0].text).toContain('iPhone 15 Pro');
       expect(result.contents[0].text).not.toContain('iPhone 14');
@@ -172,7 +188,10 @@ describe('simulators resource', () => {
         }),
       });
 
-      const result = await simulatorsResource.handler(mockExecutor);
+      const result = await simulatorsResource.handler(
+        new URL('xcodebuildmcp://simulators'),
+        mockExecutor,
+      );
 
       expect(result.contents[0].text).toContain('Next Steps:');
       expect(result.contents[0].text).toContain('boot_sim');