From 12c49f5c51dfab49e9aac080a7c108b1b23df8fa Mon Sep 17 00:00:00 2001 From: Maria Hutt Date: Fri, 13 Jun 2025 12:05:18 -0700 Subject: [PATCH] refactor(many): remove `exact` from test pages --- packages/react-router/test/base/src/App.tsx | 2 +- .../pages/dynamic-routes/DynamicRoutes.tsx | 7 +++---- .../src/pages/dynamic-tabs/DynamicTabs.tsx | 3 +-- .../src/pages/muiltiple-tabs/MultipleTabs.tsx | 21 +++++++------------ .../src/pages/nested-outlet/NestedOutlet.tsx | 5 ++--- .../src/pages/nested-outlet/NestedOutlet2.tsx | 5 ++--- .../test/base/src/pages/refs/Refs.tsx | 6 +++--- .../base/src/pages/replace-action/Replace.tsx | 8 +++---- .../test/base/src/pages/routing/Routing.tsx | 2 +- .../test/base/src/pages/routing/Tabs.tsx | 12 +++++------ .../pages/swipe-to-go-back/SwipToGoBack.tsx | 2 +- .../base/src/pages/tab-context/TabContext.tsx | 6 +++--- .../test/base/src/pages/tabs/Tabs.tsx | 10 ++++----- .../base/src/pages/tabs/TabsSecondary.tsx | 6 +++--- 14 files changed, 42 insertions(+), 53 deletions(-) diff --git a/packages/react-router/test/base/src/App.tsx b/packages/react-router/test/base/src/App.tsx index cb2a4c7845..7a7003e865 100644 --- a/packages/react-router/test/base/src/App.tsx +++ b/packages/react-router/test/base/src/App.tsx @@ -46,7 +46,7 @@ const App: React.FC = () => { - } exact /> + } /> } /> } /> } /> diff --git a/packages/react-router/test/base/src/pages/dynamic-routes/DynamicRoutes.tsx b/packages/react-router/test/base/src/pages/dynamic-routes/DynamicRoutes.tsx index 1d63be0b0f..40e1795d20 100644 --- a/packages/react-router/test/base/src/pages/dynamic-routes/DynamicRoutes.tsx +++ b/packages/react-router/test/base/src/pages/dynamic-routes/DynamicRoutes.tsx @@ -16,13 +16,12 @@ const DynamicRoutes: React.FC = () => { key="sldjflsdj" path="/dynamic-routes/home" render={() => } - exact={true} />, ]); const addRoute = () => { const newRoute = ( - } exact={true} /> + } /> ); setRoutes([...routes, newRoute]); }; @@ -30,8 +29,8 @@ const DynamicRoutes: React.FC = () => { return ( {routes} - {/* } /> */} - } /> + {/* } /> */} + } /> } /> ); diff --git a/packages/react-router/test/base/src/pages/dynamic-tabs/DynamicTabs.tsx b/packages/react-router/test/base/src/pages/dynamic-tabs/DynamicTabs.tsx index c77a014054..bc838a311b 100644 --- a/packages/react-router/test/base/src/pages/dynamic-tabs/DynamicTabs.tsx +++ b/packages/react-router/test/base/src/pages/dynamic-tabs/DynamicTabs.tsx @@ -40,12 +40,11 @@ const DynamicTabs: React.FC = () => { - + {render2ndTabRoute()} } - exact={true} /> } /> diff --git a/packages/react-router/test/base/src/pages/muiltiple-tabs/MultipleTabs.tsx b/packages/react-router/test/base/src/pages/muiltiple-tabs/MultipleTabs.tsx index 6912fc97f9..34530f24ca 100644 --- a/packages/react-router/test/base/src/pages/muiltiple-tabs/MultipleTabs.tsx +++ b/packages/react-router/test/base/src/pages/muiltiple-tabs/MultipleTabs.tsx @@ -26,23 +26,20 @@ const MultipleTabs: React.FC = () => { { return ; }} - exact={false} /> { return ; }} - exact={false} /> } - exact={true} /> @@ -69,11 +66,10 @@ const Tab1: React.FC = () => { } - exact={true} /> - {/* */} - } exact={true} /> - } exact={true} /> + {/* */} + } /> + } /> ); @@ -96,11 +92,10 @@ const Tab2: React.FC = () => { } - exact={true} /> - {/* */} - } exact={true} /> - } exact={true} /> + {/* */} + } /> + } /> ); diff --git a/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet.tsx b/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet.tsx index 2d211d9aef..c351ee585e 100644 --- a/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet.tsx +++ b/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet.tsx @@ -48,10 +48,9 @@ const SecondPage: React.FC = () => { } /> - } exact={true} /> + } /> ); }; @@ -81,7 +80,7 @@ const FirstPage: React.FC = () => { const NestedOutlet: React.FC = () => ( - } exact={true} /> + } /> } /> ); diff --git a/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet2.tsx b/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet2.tsx index bdac443aa8..b2986b6c77 100644 --- a/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet2.tsx +++ b/packages/react-router/test/base/src/pages/nested-outlet/NestedOutlet2.tsx @@ -17,7 +17,7 @@ import { const ListPage: React.FC = ({ match }) => { return ( - } /> + } /> } /> ); @@ -70,7 +70,7 @@ const Item: React.FC> = ({ match }) => { const HomePage: React.FC = ({ match }) => { return ( - } /> + } /> } /> ); @@ -127,7 +127,6 @@ const NestedOutlet2: React.FC = () => ( } - exact={true} /> ); diff --git a/packages/react-router/test/base/src/pages/refs/Refs.tsx b/packages/react-router/test/base/src/pages/refs/Refs.tsx index 444086e296..4385fe8281 100644 --- a/packages/react-router/test/base/src/pages/refs/Refs.tsx +++ b/packages/react-router/test/base/src/pages/refs/Refs.tsx @@ -14,9 +14,9 @@ interface RefsProps {} const Refs: React.FC = () => { return ( - {/* } /> */} - } /> - } /> + {/* } /> */} + } /> + } /> ); }; diff --git a/packages/react-router/test/base/src/pages/replace-action/Replace.tsx b/packages/react-router/test/base/src/pages/replace-action/Replace.tsx index d622d8b24a..3c386699c0 100644 --- a/packages/react-router/test/base/src/pages/replace-action/Replace.tsx +++ b/packages/react-router/test/base/src/pages/replace-action/Replace.tsx @@ -17,10 +17,10 @@ interface TopPageProps {} const ReplaceAction: React.FC = () => { return ( - } exact /> - } exact /> - } exact /> - } /> + } /> + } /> + } /> + } /> ); }; diff --git a/packages/react-router/test/base/src/pages/routing/Routing.tsx b/packages/react-router/test/base/src/pages/routing/Routing.tsx index 6f115a1f8b..83b3d76bed 100644 --- a/packages/react-router/test/base/src/pages/routing/Routing.tsx +++ b/packages/react-router/test/base/src/pages/routing/Routing.tsx @@ -22,7 +22,7 @@ const Routing: React.FC = () => { } /> {/* } /> */} - } exact replace /> + } replace /> } /> {/* { return ( diff --git a/packages/react-router/test/base/src/pages/routing/Tabs.tsx b/packages/react-router/test/base/src/pages/routing/Tabs.tsx index 36a9ee8234..c8e84c97e6 100644 --- a/packages/react-router/test/base/src/pages/routing/Tabs.tsx +++ b/packages/react-router/test/base/src/pages/routing/Tabs.tsx @@ -14,23 +14,21 @@ const Tabs: React.FC = () => { return ( - } exact /> - } exact={true} /> + } /> + } /> {/* { return
- }} exact={true} /> */} - } exact={true} /> - } exact={true} /> + }} /> */} + } /> + } /> } /> } - exact={true} /> } - exact={true} /> {/* } />} /> */} diff --git a/packages/react-router/test/base/src/pages/swipe-to-go-back/SwipToGoBack.tsx b/packages/react-router/test/base/src/pages/swipe-to-go-back/SwipToGoBack.tsx index 4bdbe0fffe..ab8a35fd60 100644 --- a/packages/react-router/test/base/src/pages/swipe-to-go-back/SwipToGoBack.tsx +++ b/packages/react-router/test/base/src/pages/swipe-to-go-back/SwipToGoBack.tsx @@ -17,7 +17,7 @@ interface SwipeToGoBackProps {} export const SwipeToGoBack: React.FC = () => { return ( - } exact /> + } /> } /> ); diff --git a/packages/react-router/test/base/src/pages/tab-context/TabContext.tsx b/packages/react-router/test/base/src/pages/tab-context/TabContext.tsx index 5802a8b749..f43197152a 100644 --- a/packages/react-router/test/base/src/pages/tab-context/TabContext.tsx +++ b/packages/react-router/test/base/src/pages/tab-context/TabContext.tsx @@ -25,9 +25,9 @@ const TabsContext: React.FC = () => { return ( - } exact /> - } exact /> - + } /> + } /> + diff --git a/packages/react-router/test/base/src/pages/tabs/Tabs.tsx b/packages/react-router/test/base/src/pages/tabs/Tabs.tsx index 08774da3d5..59b83ef6d1 100644 --- a/packages/react-router/test/base/src/pages/tabs/Tabs.tsx +++ b/packages/react-router/test/base/src/pages/tabs/Tabs.tsx @@ -24,11 +24,11 @@ const Tabs: React.FC = () => { return ( - } exact /> - } exact /> - } exact /> - } exact /> - + } /> + } /> + } /> + } /> + diff --git a/packages/react-router/test/base/src/pages/tabs/TabsSecondary.tsx b/packages/react-router/test/base/src/pages/tabs/TabsSecondary.tsx index 701b0190f0..b51af55b6f 100644 --- a/packages/react-router/test/base/src/pages/tabs/TabsSecondary.tsx +++ b/packages/react-router/test/base/src/pages/tabs/TabsSecondary.tsx @@ -23,9 +23,9 @@ const TabsSecondary: React.FC = () => { return ( - } exact /> - } exact /> - + } /> + } /> +