Skip to content

Commit 22a0136

Browse files
committed
Revert "fix: centralise mock test"
1 parent b40e280 commit 22a0136

61 files changed

Lines changed: 195 additions & 80 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@ module.exports = {
4040
'\\.(lottie)$': '<rootDir>/__mocks__/fileMock.ts',
4141
'^group-ib-fp$': '<rootDir>/__mocks__/group-ib-fp.ts',
4242
'^parse-imports-exports$': '<rootDir>/node_modules/parse-imports-exports/index.cjs',
43-
'^@testUtils/(.*)$': '<rootDir>/tests/utils/$1',
4443
},
4544
};

jest/setup.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,3 @@ jest.mock('@src/hooks/useDomainDocumentTitle', () => ({
375375
__esModule: true,
376376
default: jest.fn(),
377377
}));
378-
379-
// Base Navigation mock used by ScreenWrapper and many components.
380-
// Test files with custom Navigation needs can spread the base and add overrides:
381-
// jest.mock('@libs/Navigation/Navigation', () => ({
382-
// ...require('@testUtils/createNavigationMock').default,
383-
// customProp: jest.fn(),
384-
// }));
385-
jest.mock('@libs/Navigation/Navigation', () => require('@testUtils/createNavigationMock').default);

tests/actions/ReportTest.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ jest.mock('@libs/Sound', () => ({
116116
jest.mock('@hooks/useCardFeedsForDisplay', () => jest.fn(() => ({defaultCardFeed: null, cardFeedsByPolicy: {}})));
117117

118118
jest.mock('@libs/Navigation/Navigation', () => ({
119-
...require('@testUtils/createNavigationMock').default,
120119
navigate: jest.fn(),
121120
getActiveRoute: jest.fn().mockReturnValue(''),
121+
getActiveRouteWithoutParams: jest.fn(() => ''),
122122
dismissModalWithReport: jest.fn(),
123123
dismissModal: jest.fn(),
124124
dismissToSuperWideRHP: jest.fn(),
125+
isNavigationReady: jest.fn(() => Promise.resolve()),
125126
isActiveRoute: jest.fn(() => false),
126127
getTopmostReportId: jest.fn(() => undefined),
127128
getTopmostSuperWideRHPReportID: jest.fn(() => undefined),

tests/navigation/LinkedActionNotFoundGuardTest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const mockIsNavigationReady = jest.fn(() => Promise.resolve());
1818
jest.mock('@libs/Navigation/Navigation', () => ({
1919
__esModule: true,
2020
default: {
21-
...require('@testUtils/createNavigationMock').default,
2221
setParams: (...args: unknown[]) => mockSetParams(...args),
22+
getActiveRouteWithoutParams: jest.fn(() => ''),
2323
isNavigationReady: () => mockIsNavigationReady(),
2424
},
2525
}));

tests/perf-test/SearchRouter.perf-test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ jest.mock('@src/libs/API', () => ({
3939
}));
4040

4141
jest.mock('@src/libs/Navigation/Navigation', () => ({
42-
...require('@testUtils/createNavigationMock').default,
4342
dismissModalWithReport: jest.fn(),
4443
getTopmostReportId: jest.fn(),
44+
isNavigationReady: jest.fn(() => Promise.resolve()),
4545
isDisplayedInModal: jest.fn(() => false),
46+
getActiveRouteWithoutParams: jest.fn(() => ''),
4647
}));
4748

4849
jest.mock('@src/hooks/useRootNavigationState', () => ({

tests/perf-test/SidebarLinks.perf-test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatch
1111

1212
jest.mock('@libs/Permissions');
1313
jest.mock('../../src/libs/Navigation/Navigation', () => ({
14-
...require('@testUtils/createNavigationMock').default,
14+
navigate: jest.fn(),
1515
isActiveRoute: jest.fn(),
1616
getTopmostReportId: jest.fn(),
17+
getActiveRoute: jest.fn(),
1718
getTopmostReportActionId: jest.fn(),
19+
isNavigationReady: jest.fn(() => Promise.resolve()),
1820
isDisplayedInModal: jest.fn(() => false),
21+
getActiveRouteWithoutParams: jest.fn(() => ''),
1922
}));
2023
jest.mock('../../src/libs/Navigation/navigationRef', () => ({
2124
getState: () => ({

tests/perf-test/useAdvancedSearchFilters.perf-test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jest.mock('@src/libs/API', () => ({
2727
}));
2828

2929
jest.mock('@src/libs/Navigation/Navigation', () => ({
30-
...require('@testUtils/createNavigationMock').default,
3130
dismissModalWithReport: jest.fn(),
3231
getTopmostReportId: jest.fn(),
32+
isNavigationReady: jest.fn(() => Promise.resolve()),
3333
isDisplayedInModal: jest.fn(() => false),
34+
getActiveRouteWithoutParams: jest.fn(() => ''),
3435
}));
3536

3637
jest.mock('@hooks/useExportedToFilterOptions', () => ({

tests/ui/AssignCardFeed.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ jest.mock('react-native-plaid-link-sdk', () => ({
8181
}));
8282

8383
jest.mock('@libs/Navigation/Navigation', () => ({
84-
...require('@testUtils/createNavigationMock').default,
8584
navigate: jest.fn(),
85+
getActiveRouteWithoutParams: jest.fn(() => ''),
86+
isNavigationReady: jest.fn(() => Promise.resolve()),
8687
goBack: jest.fn(),
8788
setNavigationActionToMicrotaskQueue: jest.fn((callback: () => void) => callback?.()),
8889
dismissModal: jest.fn(),

tests/ui/AuthScreensInitHandlerTest.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ jest.mock('@libs/PusherConnectionManager', () => ({
4040
jest.mock('@libs/Navigation/Navigation', () => ({
4141
__esModule: true,
4242
default: {
43-
...require('@testUtils/createNavigationMock').default,
4443
isActiveRoute: jest.fn(() => false),
4544
navigate: jest.fn(),
45+
getActiveRouteWithoutParams: jest.fn(() => ''),
46+
isNavigationReady: jest.fn(() => Promise.resolve()),
4647
setNavigationActionToMicrotaskQueue: jest.fn(() => Promise.resolve()),
4748
},
4849
}));

tests/ui/CategoryListItemHeaderTest.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ import ONYXKEYS from '@src/ONYXKEYS';
1515
import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
1616

1717
jest.mock('@components/ConfirmedRoute.tsx');
18+
jest.mock('@libs/Navigation/Navigation', () => ({
19+
getActiveRouteWithoutParams: jest.fn(() => ''),
20+
isNavigationReady: jest.fn(() => Promise.resolve()),
21+
navigate: jest.fn(),
22+
getActiveRoute: jest.fn(() => ''),
23+
}));
1824

1925
// Mock useResponsiveLayout to control screen size in tests
2026
jest.mock('@hooks/useResponsiveLayout', () => jest.fn());

0 commit comments

Comments
 (0)