Skip to content

Commit b03bbd6

Browse files
authored
Merge pull request Expensify#74164 from Expensify/monil-fixIsActiveRouteTest
[No QA] Fix isActiveRoute flaky test
2 parents 52b7390 + 8067d71 commit b03bbd6

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

tests/navigation/isActiveRouteTests.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {describe, expect, test} from '@jest/globals';
1+
import {describe, expect} from '@jest/globals';
22
import {render} from '@testing-library/react-native';
33
import useResponsiveLayout from '@hooks/useResponsiveLayout';
44
import getIsNarrowLayout from '@libs/getIsNarrowLayout';
@@ -23,18 +23,9 @@ describe('Navigation', () => {
2323
mockedGetIsNarrowLayout.mockReturnValue(true);
2424
mockedUseResponsiveLayout.mockReturnValue({...CONST.NAVIGATION_TESTS.DEFAULT_USE_RESPONSIVE_LAYOUT_VALUE, shouldUseNarrowLayout: true});
2525
});
26-
// given current active route is "/settings/profile?backTo=settings%2profile"
27-
test.each([
28-
['settings/profile' as Route, true],
29-
['settings/profile/' as Route, true],
30-
['settings/profile?param=1' as Route, true],
31-
['settings/profile/display-name' as Route, false],
32-
['settings/profile/display-name/' as Route, false],
33-
['settings/preferences' as Route, false],
34-
['report' as Route, false],
35-
['report/123/' as Route, false],
36-
['report/123' as Route, false],
37-
])('isActiveRoute("%s") should return %s', (routeToCheck, expectedResult) => {
26+
27+
it('Should correctly identify active routes', () => {
28+
// Given current active route is "/settings/profile?backTo=settings%2profile"
3829
render(
3930
<TestNavigationContainer
4031
initialState={{
@@ -61,7 +52,16 @@ describe('Navigation', () => {
6152
}}
6253
/>,
6354
);
64-
const result = Navigation.isActiveRoute(routeToCheck);
65-
expect(result).toBe(expectedResult);
55+
56+
expect(Navigation.isActiveRoute('settings/profile' as Route)).toBe(true);
57+
expect(Navigation.isActiveRoute('settings/profile/' as Route)).toBe(true);
58+
expect(Navigation.isActiveRoute('settings/profile?param=1' as Route)).toBe(true);
59+
expect(Navigation.isActiveRoute('settings/profile/display-name' as Route)).toBe(false);
60+
expect(Navigation.isActiveRoute('settings/profile/display-name/' as Route)).toBe(false);
61+
expect(Navigation.isActiveRoute('settings/preferences' as Route)).toBe(false);
62+
expect(Navigation.isActiveRoute('settings/preferences/' as Route)).toBe(false);
63+
expect(Navigation.isActiveRoute('report' as Route)).toBe(false);
64+
expect(Navigation.isActiveRoute('report/123/' as Route)).toBe(false);
65+
expect(Navigation.isActiveRoute('report/123' as Route)).toBe(false);
6666
});
6767
});

0 commit comments

Comments
 (0)