Clean up some core tests

Use react-test-renderer instead of react-dom/test-utils for all core react-router tests.
remix-run · Oct 29, 2021 · c992312 · c992312
1 parent d57bd32
commit c992312
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 817 deletions.
diff --git a/packages/react-router/__tests__/Router-test.tsx b/packages/react-router/__tests__/Router-test.tsx
@@ -1,6 +1,5 @@
 import * as React from "react";
-import type { ReactTestRenderer } from "react-test-renderer";
-import { act, create as createTestRenderer } from "react-test-renderer";
+import * as TestRenderer from "react-test-renderer";
 import { MemoryRouter, useLocation } from "react-router";
 
 describe("<Router>", () => {
@@ -15,7 +14,7 @@ describe("<Router>", () => {
 
   it("throws if another <Router> is already in context", () => {
     expect(() => {
-      createTestRenderer(
+      TestRenderer.create(
         <MemoryRouter>
           <MemoryRouter />
         </MemoryRouter>
@@ -32,9 +31,9 @@ describe("<Router>", () => {
       return null;
     }
 
-    let renderer: ReactTestRenderer;
-    act(() => {
-      renderer = createTestRenderer(
+    let renderer: TestRenderer.ReactTestRenderer;
+    TestRenderer.act(() => {
+      renderer = TestRenderer.create(
         <MemoryRouter>
           <CaptureLocation1 />
         </MemoryRouter>
@@ -49,7 +48,7 @@ describe("<Router>", () => {
       return null;
     }
 
-    act(() => {
+    TestRenderer.act(() => {
       renderer.update(
         <MemoryRouter>
           <CaptureLocation2 />

diff --git a/packages/react-router/__tests__/descendant-routes-warning-test.tsx b/packages/react-router/__tests__/descendant-routes-warning-test.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { act, create as createTestRenderer } from "react-test-renderer";
+import * as TestRenderer from "react-test-renderer";
 import { MemoryRouter, Outlet, Routes, Route } from "react-router";
 
 describe("Descendant <Routes>", () => {
@@ -39,15 +39,17 @@ describe("Descendant <Routes>", () => {
         );
       }
 
-      createTestRenderer(
-        <MemoryRouter initialEntries={["/courses/react"]}>
-          <Routes>
-            <Route path="courses" element={<Courses />}>
-              <Route path="react" element={<ReactCourses />} />
-            </Route>
-          </Routes>
-        </MemoryRouter>
-      );
+      TestRenderer.act(() => {
+        TestRenderer.create(
+          <MemoryRouter initialEntries={["/courses/react"]}>
+            <Routes>
+              <Route path="courses" element={<Courses />}>
+                <Route path="react" element={<ReactCourses />} />
+              </Route>
+            </Routes>
+          </MemoryRouter>
+        );
+      });
 
       expect(consoleWarn).toHaveBeenCalledTimes(1);
       expect(consoleWarn).toHaveBeenCalledWith(
@@ -82,8 +84,8 @@ describe("Descendant <Routes>", () => {
         );
       }
 
-      act(() => {
-        createTestRenderer(
+      TestRenderer.act(() => {
+        TestRenderer.create(
           <MemoryRouter initialEntries={["/courses/react"]}>
             <Routes>
               <Route path="courses" element={<Courses />}>

diff --git a/packages/react-router/__tests__/gh-issue-8127-test.tsx b/packages/react-router/__tests__/gh-issue-8127-test.tsx
@@ -1,12 +1,12 @@
 import * as React from "react";
-import { act, create as createTestRenderer } from "react-test-renderer";
+import * as TestRenderer from "react-test-renderer";
 import { MemoryRouter, Routes, Route } from "react-router-dom";
 
 describe("GH Issue #8127", () => {
   it("works", () => {
-    let renderer;
-    act(() => {
-      renderer = createTestRenderer(
+    let renderer: TestRenderer.ReactTestRenderer;
+    TestRenderer.act(() => {
+      renderer = TestRenderer.create(
         <MemoryRouter initialEntries={["/availability"]}>
           <Routes>
             <Route

diff --git a/packages/react-router/__tests__/gh-issue-8165-test.tsx b/packages/react-router/__tests__/gh-issue-8165-test.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { act, create as createTestRenderer } from "react-test-renderer";
+import * as TestRenderer from "react-test-renderer";
 import {
   MemoryRouter,
   Routes,
@@ -58,9 +58,9 @@ describe("GH Issue #8165", () => {
       );
     }
 
-    let renderer;
-    act(() => {
-      renderer = createTestRenderer(
+    let renderer: TestRenderer.ReactTestRenderer;
+    TestRenderer.act(() => {
+      renderer = TestRenderer.create(
         <MemoryRouter initialEntries={["/en/tab"]}>
           <App />
         </MemoryRouter>

diff --git a/packages/react-router/__tests__/navigate-element-test.tsx b/packages/react-router/__tests__/navigate-element-test.tsx
diff --git a/packages/react-router/__tests__/navigate-push-test.tsx b/packages/react-router/__tests__/navigate-push-test.tsx