deeper mock cleanup

Author: labkey-martyp

labkey-ui-ehr/src/ParticipantHistory/APIWrapper.test.ts

@@ -11,9 +11,7 @@ const mockFilterCreate = jest.fn((field: string, value: boolean | string | strin
 
 // Mock @labkey/api Query.selectRows
 jest.mock('@labkey/api', () => ({
-    ...jest.requireActual('@labkey/api'),
     Query: {
-        ...jest.requireActual('@labkey/api').Query,
         selectRows: jest.fn(),
     },
     Filter: {

labkey-ui-ehr/src/ParticipantHistory/ParticipantReports.test.tsx

@@ -11,14 +11,11 @@ const mockFetchReports = jest.fn<Promise<FetchReportsResult>, []>();
 
 // Mock Ext4 global
 const mockExt4Container = {
-    report: null as any,
     filters: null as any,
     isDestroyed: false,
     add: jest.fn(),
     removeAll: jest.fn(),
     destroy: jest.fn(),
-    getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-    getQWPConfig: jest.fn(() => ({})),
 };
 
 (globalThis as any).Ext4 = {
@@ -872,7 +869,6 @@ describe('ParticipantReports', () => {
                 .spyOn(APIWrapperModule, 'getDefaultParticipantHistoryAPIWrapper')
                 .mockReturnValue({
                     fetchReports: defaultFetchReports,
-                    resolveAnimalIds: jest.fn(),
                 } as any);
 
             try {

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/JSReportWrapper.test.tsx

@@ -10,7 +10,6 @@ import { ExtReportTab, FILTER_TYPE_ID_SEARCH, JsReportConfig } from '../models';
 jest.mock('@labkey/api', () => ({
     ...jest.requireActual('@labkey/api'),
     Query: {
-        ...jest.requireActual('@labkey/api').Query,
         selectRows: jest.fn(),
     },
 }));
@@ -19,14 +18,9 @@ jest.mock('@labkey/api', () => ({
 let mockExt4Container: ExtReportTab;
 
 const createMockContainer = (): ExtReportTab => ({
-    report: null as any,
-    filters: null as any,
-    isDestroyed: false,
     add: jest.fn(),
     removeAll: jest.fn(),
     destroy: jest.fn(),
-    getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-    getQWPConfig: jest.fn(() => ({})),
 });
 
 (globalThis as any).Ext4 = {

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/OtherReportWrapper.test.tsx

@@ -4,16 +4,12 @@ import { render, waitFor } from '@testing-library/react';
 import { OtherReportWrapper } from './OtherReportWrapper';
 import { ExtReportTab, FILTER_TYPE_ID_SEARCH, OtherReportConfig } from '../models';
 
-const createMockContainer = (): ExtReportTab => ({
-    report: null as any,
-    filters: null as any,
-    isDestroyed: false,
-    add: jest.fn(),
-    removeAll: jest.fn(),
-    destroy: jest.fn(),
-    getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-    getQWPConfig: jest.fn(() => ({})),
-});
+const createMockContainer = (): ExtReportTab =>
+    ({
+        add: jest.fn(),
+        removeAll: jest.fn(),
+        destroy: jest.fn(),
+    } as unknown as ExtReportTab);
 
 (globalThis as any).Ext4 = {
     create: jest.fn(() => createMockContainer()),

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/QueryReportWrapper.test.tsx

@@ -9,14 +9,9 @@ import { defaultServerContext, renderWithServerContext } from '../../test/utils'
 let mockExt4Container: ExtReportTab;
 
 const createMockContainer = (): ExtReportTab => ({
-    report: null as any,
-    filters: null as any,
-    isDestroyed: false,
     add: jest.fn(),
     removeAll: jest.fn(),
     destroy: jest.fn(),
-    getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-    getQWPConfig: jest.fn(() => ({})),
 });
 
 (globalThis as any).Ext4 = {

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/TabbedReportPanel.test.tsx

@@ -15,15 +15,11 @@ import {
 } from '../models';
 import { defaultServerContext, renderWithServerContext } from '../../test/utils';
 
-// Mock @labkey/api Query.selectRows and Filter.create
+// Mock @labkey/api Filter.create
 jest.mock('@labkey/api', () => {
     const actual = jest.requireActual('@labkey/api');
     return {
         ...actual,
-        Query: {
-            ...actual.Query,
-            selectRows: jest.fn(),
-        },
         Filter: {
             ...actual.Filter,
             create: (field: string, value: string, type: any) => {
@@ -57,14 +53,9 @@ let capturedGetFilterArray: (() => FilterArray) | null = null;
 // Mock Ext4 global with Proxy to capture assigned methods
 const createMockExt4Container = () => {
     const container = {
-        report: null as any,
-        filters: null as any,
-        isDestroyed: false,
         add: jest.fn(),
         removeAll: jest.fn(),
         destroy: jest.fn(),
-        getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-        getQWPConfig: jest.fn(() => ({})),
     };
 
     // Use Proxy to capture when getFilterArray is assigned
@@ -83,13 +74,6 @@ const createMockExt4Container = () => {
     create: jest.fn(() => createMockExt4Container()),
 };
 
-// Mock LDK global for QueryReportWrapper
-(globalThis as any).LDK = {
-    Utils: {
-        getErrorCallback: jest.fn(() => jest.fn()),
-    },
-};
-
 // Mock LABKEY.WebPart for OtherReportWrapper
 (globalThis as any).LABKEY = {
     ...(globalThis as any).LABKEY,

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/useReportTab.test.tsx

@@ -51,16 +51,7 @@ let mockContainerInstances: any[] = [];
 // Factory to create mock containers that track method calls
 const createMockContainer = (): any => {
     const container = {
-        report: null as any,
-        filters: null as any,
-        isDestroyed: false,
-        add: jest.fn(),
-        removeAll: jest.fn(),
-        destroy: jest.fn(() => {
-            container.isDestroyed = true;
-        }),
-        getFilterArray: jest.fn(() => ({ removable: [], nonRemovable: [] })),
-        getQWPConfig: jest.fn(() => ({})),
+        destroy: jest.fn(),
     };
     mockContainerInstances.push(container);
     return container;
@@ -104,7 +95,6 @@ describe('useReportTab', () => {
 
     beforeEach(() => {
         jest.clearAllMocks();
-        mockFilterCreate.mockClear();
         mockContainerInstances = [];
     });