Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate react-router-dom test usage #11699

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Migrate react-router-dom test usage #11699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration/abort-signal-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test.beforeAll(async () => {
files: {
"app/routes/_index.tsx": js`
import { json } from "@react-router/node";
import { useActionData, useLoaderData, Form } from "react-router-dom";
import { useActionData, useLoaderData, Form } from "react-router";

export async function action ({ request }) {
// New event loop causes express request to close
Expand Down
8 changes: 4 additions & 4 deletions integration/action-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.describe("actions", () => {
fixture = await createFixture({
files: {
"app/routes/urlencoded.tsx": js`
import { Form, useActionData } from "react-router-dom";
import { Form, useActionData } from "react-router";

export let action = async ({ request }) => {
let formData = await request.formData();
Expand All @@ -48,7 +48,7 @@ test.describe("actions", () => {
`,

"app/routes/request-text.tsx": js`
import { Form, useActionData } from "react-router-dom";
import { Form, useActionData } from "react-router";

export let action = async ({ request }) => {
let text = await request.text();
Expand All @@ -75,7 +75,7 @@ test.describe("actions", () => {

[`app/routes/${THROWS_REDIRECT}.jsx`]: js`
import { redirect } from "@react-router/node";
import { Form } from "react-router-dom";
import { Form } from "react-router";

export function action() {
throw redirect("/${REDIRECT_TARGET}")
Expand All @@ -97,7 +97,7 @@ test.describe("actions", () => {
`,

"app/routes/no-action.tsx": js`
import { Form } from "react-router-dom";
import { Form } from "react-router";

export default function Component() {
return (
Expand Down
2 changes: 1 addition & 1 deletion integration/browser-entry-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test.beforeAll(async () => {
fixture = await createFixture({
files: {
"app/routes/_index.tsx": js`
import { Link } from "react-router-dom";
import { Link } from "react-router";

export default function Index() {
return (
Expand Down
2 changes: 1 addition & 1 deletion integration/bug-report-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ test.beforeAll(async () => {
files: {
"app/routes/_index.tsx": js`
import { json } from "@react-router/node";
import { useLoaderData, Link } from "react-router-dom";
import { useLoaderData, Link } from "react-router";

export function loader() {
return json("pizza");
Expand Down
8 changes: 4 additions & 4 deletions integration/catch-boundary-data-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
Scripts,
useLoaderData,
useMatches,
} from "react-router-dom";
} from "react-router";

export const loader = () => json("${ROOT_DATA}");

Expand Down Expand Up @@ -88,7 +88,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

"app/routes/_index.tsx": js`
import { Link } from "react-router-dom";
import { Link } from "react-router";
export default function Index() {
return (
<div>
Expand All @@ -110,7 +110,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

[`app/routes${HAS_BOUNDARY_LAYOUT_NESTED_LOADER_FILE}.jsx`]: js`
import { useMatches } from "react-router-dom";
import { useMatches } from "react-router";
export function loader() {
return "${LAYOUT_DATA}";
}
Expand Down Expand Up @@ -140,7 +140,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

[`app/routes${HAS_BOUNDARY_NESTED_LOADER_FILE}.jsx`]: js`
import { Outlet, useLoaderData } from "react-router-dom";
import { Outlet, useLoaderData } from "react-router";
export function loader() {
return "${LAYOUT_DATA}";
}
Expand Down
14 changes: 7 additions & 7 deletions integration/catch-boundary-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
files: {
"app/root.tsx": js`
import { json } from "@react-router/node";
import { Links, Meta, Outlet, Scripts, useMatches } from "react-router-dom";
import { Links, Meta, Outlet, Scripts, useMatches } from "react-router";

export function loader() {
return json({ data: "ROOT LOADER" });
Expand Down Expand Up @@ -68,7 +68,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

"app/routes/_index.tsx": js`
import { Link, Form } from "react-router-dom";
import { Link, Form } from "react-router";
export default function() {
return (
<div>
Expand All @@ -94,7 +94,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

[`app/routes${HAS_BOUNDARY_ACTION_FILE}.jsx`]: js`
import { Form } from "react-router-dom";
import { Form } from "react-router";
export async function action() {
throw new Response("", { status: 401 })
}
Expand All @@ -113,7 +113,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

[`app/routes${NO_BOUNDARY_ACTION_FILE}.jsx`]: js`
import { Form } from "react-router-dom";
import { Form } from "react-router";
export function action() {
throw new Response("", { status: 401 })
}
Expand All @@ -129,7 +129,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

[`app/routes${HAS_BOUNDARY_LOADER_FILE}.jsx`]: js`
import { useRouteError } from "react-router-dom";
import { useRouteError } from "react-router";
export function loader() {
throw new Response("", { status: 401 })
}
Expand Down Expand Up @@ -166,7 +166,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

"app/routes/action.tsx": js`
import { Outlet, useLoaderData } from "react-router-dom";
import { Outlet, useLoaderData } from "react-router";

export function loader() {
return "PARENT";
Expand All @@ -183,7 +183,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
`,

"app/routes/action.child-catch.tsx": js`
import { Form, useLoaderData, useRouteError } from "react-router-dom";
import { Form, useLoaderData, useRouteError } from "react-router";

export function loader() {
return "CHILD";
Expand Down
30 changes: 15 additions & 15 deletions integration/client-data-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function getFiles({
}) {
return {
"app/root.tsx": js`
import { Outlet, Scripts } from "react-router-dom"
import { Outlet, Scripts } from "react-router"

export default function Root() {
return (
Expand All @@ -43,14 +43,14 @@ function getFiles({
}
`,
"app/routes/_index.tsx": js`
import { Link } from "react-router-dom"
import { Link } from "react-router"
export default function Component() {
return <Link to="/parent/child">Go to /parent/child</Link>
}
`,
"app/routes/parent.tsx": js`
import { json } from '@react-router/node'
import { Outlet, useLoaderData } from "react-router-dom"
import { Outlet, useLoaderData } from "react-router"
export function loader() {
return json({ message: 'Parent Server Loader'});
}
Expand Down Expand Up @@ -90,7 +90,7 @@ function getFiles({
`,
"app/routes/parent.child.tsx": js`
import { json } from '@react-router/node'
import { Form, Outlet, useActionData, useLoaderData } from "react-router-dom"
import { Form, Outlet, useActionData, useLoaderData } from "react-router"
export function loader() {
return json({ message: 'Child Server Loader'});
}
Expand Down Expand Up @@ -319,7 +319,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { defer, json } from '@react-router/node'
import { Await, useLoaderData } from "react-router-dom"
import { Await, useLoaderData } from "react-router"
export function loader() {
return defer({
message: 'Child Server Loader',
Expand Down Expand Up @@ -418,7 +418,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { useLoaderData } from "react-router-dom";
import { useLoaderData } from "react-router";
export function loader() {
return json({
message: "Child Server Loader Data",
Expand Down Expand Up @@ -471,7 +471,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { useLoaderData } from "react-router-dom";
import { useLoaderData } from "react-router";
// Even without setting hydrate=true, this should run on hydration
export async function clientLoader({ serverLoader }) {
await new Promise(r => setTimeout(r, 100));
Expand Down Expand Up @@ -514,7 +514,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { useLoaderData } from "react-router-dom";
import { useLoaderData } from "react-router";
// Even without setting hydrate=true, this should run on hydration
export async function clientLoader({ serverLoader }) {
await new Promise(r => setTimeout(r, 100));
Expand Down Expand Up @@ -557,7 +557,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { useLoaderData, useRouteError } from "react-router-dom";
import { useLoaderData, useRouteError } from "react-router";
export async function clientLoader({ serverLoader }) {
return await serverLoader();
}
Expand Down Expand Up @@ -601,7 +601,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { useLoaderData, useRevalidator } from "react-router-dom";
import { useLoaderData, useRevalidator } from "react-router";
let isFirstCall = true;
export async function loader({ serverLoader }) {
if (isFirstCall) {
Expand Down Expand Up @@ -666,7 +666,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { useLoaderData, useRevalidator } from "react-router-dom";
import { useLoaderData, useRevalidator } from "react-router";
let isFirstCall = true;
export async function loader({ serverLoader }) {
if (isFirstCall) {
Expand Down Expand Up @@ -742,7 +742,7 @@ test.describe("Client Data", () => {
childClientLoaderHydrate: false,
}),
"app/routes/parent.child.tsx": js`
import { ClientLoaderFunctionArgs, useRouteError } from "react-router-dom";
import { ClientLoaderFunctionArgs, useRouteError } from "react-router";

export function loader() {
throw new Error("Broken!")
Expand Down Expand Up @@ -882,7 +882,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { useLoaderData, useRouteError } from "react-router-dom";
import { useLoaderData, useRouteError } from "react-router";
export async function clientLoader({ serverLoader }) {
return await serverLoader();
}
Expand Down Expand Up @@ -1095,7 +1095,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { Form, useRouteError } from "react-router-dom";
import { Form, useRouteError } from "react-router";
export async function clientAction({ serverAction }) {
return await serverAction();
}
Expand Down Expand Up @@ -1312,7 +1312,7 @@ test.describe("Client Data", () => {
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { Form, useRouteError } from "react-router-dom";
import { Form, useRouteError } from "react-router";
export async function clientAction({ serverAction }) {
return await serverAction();
}
Expand Down
2 changes: 1 addition & 1 deletion integration/custom-entry-server-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test.beforeAll(async () => {
files: {
"app/entry.server.tsx": js`
import * as React from "react";
import { ServerRouter } from "react-router-dom";
import { ServerRouter } from "react-router";
import { renderToString } from "react-dom/server";

export default function handleRequest(
Expand Down
4 changes: 2 additions & 2 deletions integration/defer-loader-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test.describe("deferred loaders", () => {
fixture = await createFixture({
files: {
"app/routes/_index.tsx": js`
import { useLoaderData, Link } from "react-router-dom";
import { useLoaderData, Link } from "react-router";
export default function Index() {
return (
<div>
Expand All @@ -38,7 +38,7 @@ test.describe("deferred loaders", () => {
"app/routes/direct-promise-access.tsx": js`
import * as React from "react";
import { defer } from "@react-router/node";
import { useLoaderData, Link, Await } from "react-router-dom";
import { useLoaderData, Link, Await } from "react-router";
export function loader() {
return defer({
bar: new Promise(async (resolve, reject) => {
Expand Down
Loading