From bb1a4d58c8a31486a283f15bfc7aded84011a04e Mon Sep 17 00:00:00 2001 From: Monil Bhavsar Date: Tue, 4 Nov 2025 13:15:11 +0530 Subject: [PATCH 1/2] Render navigation container once --- tests/navigation/isActiveRouteTests.tsx | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/navigation/isActiveRouteTests.tsx b/tests/navigation/isActiveRouteTests.tsx index 125fd2c2bf15..4a303d638311 100644 --- a/tests/navigation/isActiveRouteTests.tsx +++ b/tests/navigation/isActiveRouteTests.tsx @@ -23,18 +23,9 @@ describe('Navigation', () => { mockedGetIsNarrowLayout.mockReturnValue(true); mockedUseResponsiveLayout.mockReturnValue({...CONST.NAVIGATION_TESTS.DEFAULT_USE_RESPONSIVE_LAYOUT_VALUE, shouldUseNarrowLayout: true}); }); - // given current active route is "/settings/profile?backTo=settings%2profile" - test.each([ - ['settings/profile' as Route, true], - ['settings/profile/' as Route, true], - ['settings/profile?param=1' as Route, true], - ['settings/profile/display-name' as Route, false], - ['settings/profile/display-name/' as Route, false], - ['settings/preferences' as Route, false], - ['report' as Route, false], - ['report/123/' as Route, false], - ['report/123' as Route, false], - ])('isActiveRoute("%s") should return %s', (routeToCheck, expectedResult) => { + + it('Should correctly identify active routes', () => { + // Given current active route is "/settings/profile?backTo=settings%2profile" render( { }} />, ); - const result = Navigation.isActiveRoute(routeToCheck); - expect(result).toBe(expectedResult); + + expect(Navigation.isActiveRoute('settings/profile' as Route)).toBe(true); + expect(Navigation.isActiveRoute('settings/profile/' as Route)).toBe(true); + expect(Navigation.isActiveRoute('settings/profile?param=1' as Route)).toBe(true); + expect(Navigation.isActiveRoute('settings/profile/display-name' as Route)).toBe(false); + expect(Navigation.isActiveRoute('settings/profile/display-name/' as Route)).toBe(false); + expect(Navigation.isActiveRoute('settings/preferences' as Route)).toBe(false); + expect(Navigation.isActiveRoute('settings/preferences/' as Route)).toBe(false); + expect(Navigation.isActiveRoute('report' as Route)).toBe(false); + expect(Navigation.isActiveRoute('report/123/' as Route)).toBe(false); + expect(Navigation.isActiveRoute('report/123' as Route)).toBe(false); }); }); From 8067d7108db6851b2550c46c3662d64349a11dcc Mon Sep 17 00:00:00 2001 From: Monil Bhavsar Date: Tue, 4 Nov 2025 13:23:11 +0530 Subject: [PATCH 2/2] Fix lint --- tests/navigation/isActiveRouteTests.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/navigation/isActiveRouteTests.tsx b/tests/navigation/isActiveRouteTests.tsx index 4a303d638311..fc13b7c7f2f0 100644 --- a/tests/navigation/isActiveRouteTests.tsx +++ b/tests/navigation/isActiveRouteTests.tsx @@ -1,4 +1,4 @@ -import {describe, expect, test} from '@jest/globals'; +import {describe, expect} from '@jest/globals'; import {render} from '@testing-library/react-native'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import getIsNarrowLayout from '@libs/getIsNarrowLayout';