From 136c039896c75ff3b67b0e9e8453b49f2fbbc3f0 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:22:35 -0700 Subject: [PATCH] test: import Activity functions directly in eight suites (#26237) --- ...tivityPrototypePage.filter-focus-shortcut.test.ts | 2 +- .../activity/ActivityPrototypePage.test.ts | 12 +++++++----- .../ActivityPrototypePage.thread-grouping.test.ts | 11 ++++------- .../activity/ActivityThreadOptionsMenu.test.tsx | 2 +- ...activity-portal-readiness-decay.react185.test.tsx | 2 +- .../activity-portal-readiness-loop.react185.test.tsx | 2 +- ...al-readiness-subscription-churn.react185.test.tsx | 2 +- .../activity/activity-status-group-header.test.ts | 8 +++----- 8 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts index da8fe2e2df2..6a4f2c64d68 100644 --- a/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts +++ b/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts @@ -3,7 +3,7 @@ import { handleActivityFilterFocusShortcut, isActivityFilterFocusShortcut, shouldIgnoreActivityFilterFocusShortcutTarget -} from './ActivityPrototypePage' +} from './activity-filter-focus-shortcut' describe('activity filter focus shortcut', () => { it('matches Cmd+F on Mac and Ctrl+F elsewhere without extra modifiers', () => { diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.test.ts index 2a960cb464e..9f6587be094 100644 --- a/src/renderer/src/components/activity/ActivityPrototypePage.test.ts +++ b/src/renderer/src/components/activity/ActivityPrototypePage.test.ts @@ -8,13 +8,16 @@ import { makePaneKey } from '../../../../shared/stable-pane-id' import type { TerminalTab } from '../../../../shared/terminal-tab-types' import { ACTIVITY_SEARCH_QUERY_MAX_BYTES, - activityThreadResponseRenderPreview, activityThreadMatchesSearchQuery, - buildActivityEvents, - buildAgentPaneThreads, buildActivityThreadGroups, isActivitySearchQueryTooLarge -} from './ActivityPrototypePage' +} from './activity-thread-grouping' +import { + activityThreadResponseRenderPreview, + activityThreadStatusId +} from './activity-thread-presentation' +import { buildActivityEvents } from './activity-event-builder' +import { buildAgentPaneThreads } from './activity-thread-builder' import { makeActivityResult, makeRepo, @@ -29,7 +32,6 @@ import { PANE_KEY_2, PANE_KEY_3 } from './ActivityPrototypePage-test-fixtures' -import { activityThreadStatusId } from './activity-thread-presentation' describe('buildActivityEvents', () => { it('keeps every pane visible before applying the global activity cap', () => { diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts index 42f45f1683d..9a53c4ada07 100644 --- a/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts +++ b/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts @@ -4,13 +4,10 @@ import { describe, expect, it } from 'vitest' import type { AgentStatusEntry } from '../../../../shared/agent-status-types' import { formatAgentTypeLabel } from '@/lib/agent-status' import { TooltipProvider } from '@/components/ui/tooltip' -import { - buildActivityThreadGroups, - buildActivityEvents, - buildAgentPaneThreads, - getActivityThreadGroup, - ThreadAgentStateIndicator -} from './ActivityPrototypePage' +import { buildActivityThreadGroups, getActivityThreadGroup } from './activity-thread-grouping' +import { buildActivityEvents } from './activity-event-builder' +import { buildAgentPaneThreads } from './activity-thread-builder' +import { ThreadAgentStateIndicator } from './activity-thread-controls' import { makeActivityResult, makeRepo, diff --git a/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx b/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx index c5cedcb2443..544101f7ff2 100644 --- a/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx +++ b/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx @@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { TooltipProvider } from '@/components/ui/tooltip' import { useAppStore } from '@/store' -import { ActivityThreadOptionsMenu } from './ActivityPrototypePage' +import { ActivityThreadOptionsMenu } from './activity-thread-controls' import type { ActivityGroupBy } from './activity-thread-types' import { makeRepo } from './ActivityPrototypePage-test-fixtures' diff --git a/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx index f9a6581d608..50e2383aa63 100644 --- a/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx +++ b/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx @@ -2,7 +2,7 @@ import { act } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { useActivityTerminalPortalStatus } from './ActivityPrototypePage' +import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status' import { ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS, ACTIVITY_PORTAL_READINESS_MAX_FLIPS diff --git a/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx index 2389e753bb3..209dece6a78 100644 --- a/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx +++ b/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true -import { useActivityTerminalPortalStatus } from './ActivityPrototypePage' +import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status' import { findActivityTerminalPortal, type ActivityTerminalPortalTarget diff --git a/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx index d8b9c3caff4..135b784887a 100644 --- a/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx +++ b/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx @@ -3,7 +3,7 @@ import { act, useState } from 'react' import { flushSync } from 'react-dom' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { useActivityTerminalPortalStatus } from './ActivityPrototypePage' +import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status' import { ACTIVITY_PORTAL_READINESS_MAX_FLIPS } from './activity-portal-readiness-oscillation' ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true diff --git a/src/renderer/src/components/activity/activity-status-group-header.test.ts b/src/renderer/src/components/activity/activity-status-group-header.test.ts index cbcf468b900..5c60c422fe9 100644 --- a/src/renderer/src/components/activity/activity-status-group-header.test.ts +++ b/src/renderer/src/components/activity/activity-status-group-header.test.ts @@ -1,10 +1,8 @@ import { describe, expect, it } from 'vitest' import type { AgentStatusEntry } from '../../../../shared/agent-status-types' -import { - buildActivityEvents, - buildActivityThreadGroups, - buildAgentPaneThreads -} from './ActivityPrototypePage' +import { buildActivityEvents } from './activity-event-builder' +import { buildActivityThreadGroups } from './activity-thread-grouping' +import { buildAgentPaneThreads } from './activity-thread-builder' import { makeRepo, makeTabWithIds,