Skip to content

Commit ff04ca2

Browse files
committed
Revert back to tsx test file
1 parent cb930b9 commit ff04ca2

File tree

2 files changed

+54
-0
lines changed

2 files changed

+54
-0
lines changed

packages/react-router/__tests__/dom/data-browser-router-test.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ import {
1919
Form,
2020
Link,
2121
Outlet,
22+
Route,
23+
RouterContextProvider,
2224
RouterProvider,
2325
createBrowserRouter,
2426
createHashRouter,
27+
createRoutesFromElements,
2528
isRouteErrorResponse,
2629
matchRoutes,
2730
redirect,

packages/react-router/__tests__/router/context-middleware-test.ts renamed to packages/react-router/__tests__/router/context-middleware-test.tsx

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,57 @@ describe("context/middleware", () => {
751751
});
752752
});
753753

754+
it("works with createRoutesFromElements", async () => {
755+
let context = new RouterContextProvider();
756+
router = createRouter({
757+
history: createMemoryHistory(),
758+
getContext: () => context,
759+
routes: createRoutesFromElements(
760+
<>
761+
<Route path="/" />
762+
<Route
763+
id="parent"
764+
path="/parent"
765+
middleware={[
766+
getOrderMiddleware(orderContext, "a"),
767+
getOrderMiddleware(orderContext, "b"),
768+
]}
769+
loader={({ context }) => {
770+
context.get(orderContext).push("parent loader");
771+
}}
772+
>
773+
<Route
774+
id="child"
775+
path="child"
776+
middleware={[
777+
getOrderMiddleware(orderContext, "c"),
778+
getOrderMiddleware(orderContext, "d"),
779+
]}
780+
loader={({ context }) => {
781+
context.get(orderContext).push("child loader");
782+
}}
783+
/>
784+
</Route>
785+
</>,
786+
),
787+
});
788+
789+
await router.navigate("/parent/child");
790+
791+
expect(context.get(orderContext)).toEqual([
792+
"a middleware - before next()",
793+
"b middleware - before next()",
794+
"c middleware - before next()",
795+
"d middleware - before next()",
796+
"parent loader",
797+
"child loader",
798+
"d middleware - after next()",
799+
"c middleware - after next()",
800+
"b middleware - after next()",
801+
"a middleware - after next()",
802+
]);
803+
});
804+
754805
describe("lazy", () => {
755806
it("runs lazy loaded middleware", async () => {
756807
let snapshot;

0 commit comments

Comments
 (0)