gogcli-mcp 2.8.0 → 2.18.1

package/tests/tools/calendar.test.ts

@@ -1,26 +1,26 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerCalendarTools } from '../../src/tools/calendar.js';
 import * as runner from '../../src/runner.js';
-import { setupHandlers as setupHandlersBase, type ToolHandler } from '../helpers/test-harness.js';
+import { createTestHarness } from '@chrischall/mcp-utils/test';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => setupHandlersBase(registerCalendarTools);
+const setupHandlers = () => createTestHarness(registerCalendarTools);
 
 beforeEach(() => vi.clearAllMocks());
 
 describe('gog_calendar_events', () => {
   it('calls run with no filters', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"items":[]}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_events')!({});
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_events', {});
     expect(runner.run).toHaveBeenCalledWith(['calendar', 'events'], { account: undefined });
   });
 
   it('appends calendarId and filters when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_events')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_events', {
       calendarId: 'primary',
       from: '2026-01-01',
       to: '2026-01-31',
@@ -34,10 +34,30 @@ describe('gog_calendar_events', () => {
     );
   });
 
+  it('repeats --event-types for each requested type', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_events', { eventTypes: ['default', 'out-of-office'] });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['calendar', 'events', '--event-types=default', '--event-types=out-of-office'],
+      { account: undefined },
+    );
+  });
+
+  it('appends --timezone when provided', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_events', { timezone: 'America/New_York' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['calendar', 'events', '--timezone=America/New_York'],
+      { account: undefined },
+    );
+  });
+
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Events failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_events')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_events', {});
     expect(result.content[0].text).toBe('Error: Events failed');
   });
 });
@@ -45,15 +65,25 @@ describe('gog_calendar_events', () => {
 describe('gog_calendar_get', () => {
   it('calls run with calendarId and eventId', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"id":"evt1"}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_get')!({ calendarId: 'primary', eventId: 'evt1' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_get', { calendarId: 'primary', eventId: 'evt1' });
     expect(runner.run).toHaveBeenCalledWith(['calendar', 'event', 'primary', 'evt1'], { account: undefined });
   });
 
+  it('appends --timezone when provided', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"id":"evt1"}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_get', { calendarId: 'primary', eventId: 'evt1', timezone: 'local' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['calendar', 'event', 'primary', 'evt1', '--timezone=local'],
+      { account: undefined },
+    );
+  });
+
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_get')!({ calendarId: 'primary', eventId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_get', { calendarId: 'primary', eventId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
@@ -61,8 +91,8 @@ describe('gog_calendar_get', () => {
 describe('gog_calendar_create', () => {
   it('calls run with required args', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"id":"evt2"}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_create')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_create', {
       calendarId: 'primary',
       summary: 'Standup',
       from: '2026-04-14T09:00:00Z',
@@ -76,8 +106,8 @@ describe('gog_calendar_create', () => {
 
   it('appends optional flags when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_create')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_create', {
       calendarId: 'primary',
       summary: 'All-day',
       from: '2026-04-14',
@@ -86,12 +116,14 @@ describe('gog_calendar_create', () => {
       location: 'NYC',
       attendees: 'a@b.com,c@d.com',
       allDay: true,
+      timezone: 'America/New_York',
     });
     expect(runner.run).toHaveBeenCalledWith(
       [
         'calendar', 'create', 'primary',
         '--summary=All-day', '--from=2026-04-14', '--to=2026-04-15',
         '--description=Desc', '--location=NYC', '--attendees=a@b.com,c@d.com', '--all-day',
+        '--timezone=America/New_York',
       ],
       { account: undefined },
     );
@@ -102,8 +134,8 @@ describe('gog_calendar_create', () => {
   // OAuth clients).
   it('passes --with-zoom when withZoom is true', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_create')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_create', {
       calendarId: 'primary',
       summary: 'Sync',
       from: '2026-04-14T09:00:00Z',
@@ -122,8 +154,8 @@ describe('gog_calendar_create', () => {
 
   it('omits --with-zoom when false', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_create')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_create', {
       calendarId: 'primary', summary: 's', from: 'f', to: 't', withZoom: false,
     });
     expect(runner.run).toHaveBeenCalledWith(
@@ -134,8 +166,8 @@ describe('gog_calendar_create', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Create failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_create')!({ calendarId: 'p', summary: 's', from: 'f', to: 't' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_create', { calendarId: 'p', summary: 's', from: 'f', to: 't' });
     expect(result.content[0].text).toBe('Error: Create failed');
   });
 });
@@ -143,8 +175,8 @@ describe('gog_calendar_create', () => {
 describe('gog_calendar_update', () => {
   it('calls run with only provided fields', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_update')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary',
       eventId: 'evt1',
       summary: 'New Title',
@@ -158,15 +190,15 @@ describe('gog_calendar_update', () => {
   // gog 0.24.0
   it('passes repeatable --attachment values, and an empty string to clear', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_update')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary', eventId: 'evt1', attachments: ['https://drive.google.com/file/d/a', 'https://x.test/b.pdf'],
     });
     expect(runner.run).toHaveBeenCalledWith(
       ['calendar', 'update', 'primary', 'evt1', '--attachment=https://drive.google.com/file/d/a', '--attachment=https://x.test/b.pdf'],
       { account: undefined },
     );
-    await handlers.get('gog_calendar_update')!({ calendarId: 'primary', eventId: 'evt1', attachments: [''] });
+    await harness.callTool('gog_calendar_update', { calendarId: 'primary', eventId: 'evt1', attachments: [''] });
     expect(runner.run).toHaveBeenCalledWith(
       ['calendar', 'update', 'primary', 'evt1', '--attachment='],
       { account: undefined },
@@ -175,8 +207,8 @@ describe('gog_calendar_update', () => {
 
   it('passes all optional fields when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_update')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary',
       eventId: 'evt1',
       summary: 'New',
@@ -196,11 +228,29 @@ describe('gog_calendar_update', () => {
     );
   });
 
+  // gog 0.31.1: --add-attendee preserves existing attendees; --attendees replaces all.
+  it('passes --add-attendee with modifiers without touching --attendees', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
+      calendarId: 'primary',
+      eventId: 'evt1',
+      addAttendees: 'room@resource.calendar.google.com;resource,x@y.com;optional',
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      [
+        'calendar', 'update', 'primary', 'evt1',
+        '--add-attendee=room@resource.calendar.google.com;resource,x@y.com;optional',
+      ],
+      { account: undefined },
+    );
+  });
+
   // gog 0.18.0 Zoom flags: with-zoom adds, regenerate-zoom replaces, remove-zoom strips.
   it('passes --with-zoom / --regenerate-zoom / --remove-zoom independently', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_update')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary', eventId: 'evt1', withZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
@@ -210,7 +260,7 @@ describe('gog_calendar_update', () => {
 
     vi.clearAllMocks();
     vi.mocked(runner.run).mockResolvedValue('{}');
-    await handlers.get('gog_calendar_update')!({
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary', eventId: 'evt1', regenerateZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
@@ -220,7 +270,7 @@ describe('gog_calendar_update', () => {
 
     vi.clearAllMocks();
     vi.mocked(runner.run).mockResolvedValue('{}');
-    await handlers.get('gog_calendar_update')!({
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary', eventId: 'evt1', removeZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
@@ -229,10 +279,23 @@ describe('gog_calendar_update', () => {
     );
   });
 
+  // gog 0.34.x (#926): remove-meet clears an event's Google Meet conference data.
+  it('passes --remove-meet', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
+      calendarId: 'primary', eventId: 'evt1', removeMeet: true,
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['calendar', 'update', 'primary', 'evt1', '--remove-meet'],
+      { account: undefined },
+    );
+  });
+
   it('omits zoom flags when all false', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_update')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_update', {
       calendarId: 'primary', eventId: 'evt1',
       withZoom: false, regenerateZoom: false, removeZoom: false,
     });
@@ -244,8 +307,8 @@ describe('gog_calendar_update', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Update failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_update')!({ calendarId: 'p', eventId: 'e' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_update', { calendarId: 'p', eventId: 'e' });
     expect(result.content[0].text).toBe('Error: Update failed');
   });
 });
@@ -253,15 +316,15 @@ describe('gog_calendar_update', () => {
 describe('gog_calendar_delete', () => {
   it('calls run with calendarId and eventId', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_delete')!({ calendarId: 'primary', eventId: 'evt1' });
-    expect(runner.run).toHaveBeenCalledWith(['calendar', 'delete', 'primary', 'evt1'], { account: undefined });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_delete', { calendarId: 'primary', eventId: 'evt1' });
+    expect(runner.run).toHaveBeenCalledWith(['calendar', 'delete', 'primary', 'evt1', '--force'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Delete failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_delete')!({ calendarId: 'p', eventId: 'e' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_delete', { calendarId: 'p', eventId: 'e' });
     expect(result.content[0].text).toBe('Error: Delete failed');
   });
 });
@@ -269,8 +332,8 @@ describe('gog_calendar_delete', () => {
 describe('gog_calendar_respond', () => {
   it('calls run with status', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_respond')!({ calendarId: 'primary', eventId: 'evt1', status: 'accepted' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_respond', { calendarId: 'primary', eventId: 'evt1', status: 'accepted' });
     expect(runner.run).toHaveBeenCalledWith(
       ['calendar', 'respond', 'primary', 'evt1', '--status=accepted'],
       { account: undefined },
@@ -279,8 +342,8 @@ describe('gog_calendar_respond', () => {
 
   it('appends comment when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_respond')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_respond', {
       calendarId: 'primary',
       eventId: 'evt1',
       status: 'declined',
@@ -294,8 +357,8 @@ describe('gog_calendar_respond', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Respond failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_respond')!({ calendarId: 'p', eventId: 'e', status: 'accepted' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_respond', { calendarId: 'p', eventId: 'e', status: 'accepted' });
     expect(result.content[0].text).toBe('Error: Respond failed');
   });
 });
@@ -303,15 +366,15 @@ describe('gog_calendar_respond', () => {
 describe('gog_calendar_run', () => {
   it('passes subcommand and args to runner', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_calendar_run')!({ subcommand: 'calendars', args: [] });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_calendar_run', { subcommand: 'calendars', args: [] });
     expect(runner.run).toHaveBeenCalledWith(['calendar', 'calendars'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Run failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_calendar_run')!({ subcommand: 'freebusy', args: [] });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_calendar_run', { subcommand: 'freebusy', args: [] });
     expect(result.content[0].text).toBe('Error: Run failed');
   });
 });