Skip to content

Commit

Permalink
Set test env to jsdom
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Jun 21, 2024
1 parent 45f8775 commit 59dc0dd
Show file tree
Hide file tree
Showing 47 changed files with 21 additions and 159 deletions.
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/data-memory-router-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import "@testing-library/jest-dom";
import {
fireEvent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import {
MemoryRouter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { JSDOM } from "jsdom";
// Drop support for the submitter parameter, as in a legacy browser. This
// needs to be done before react-router-dom is required, since it does some
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { ErrorResponse, Fetcher } from "react-router";
import "@testing-library/jest-dom";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* @jest-environment node
*/

import * as React from "react";
import * as ReactDOMServer from "react-dom/server";
import { json } from "react-router";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import {
createBrowserRouter,
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/link-click-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { act } from "react-dom/test-utils";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/link-href-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import {
BrowserRouter,
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/link-push-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as TestRenderer from "react-test-renderer";
import {
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/nav-link-active-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { render, fireEvent, waitFor, screen } from "@testing-library/react";
import "@testing-library/jest-dom";
import { JSDOM } from "jsdom";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { act } from "react-dom/test-utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import "@testing-library/jest-dom";
import { act, render, screen, waitFor } from "@testing-library/react";
import * as React from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { JSDOM } from "jsdom";
import * as React from "react";
import { render, fireEvent, screen } from "@testing-library/react";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/search-params-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { act } from "react-dom/test-utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
/* eslint-disable jest/expect-expect */

import { JSDOM } from "jsdom";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/ssr/components-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { createStaticHandler } from "react-router";
import { act, fireEvent, render } from "@testing-library/react";
import * as React from "react";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/ssr/meta-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { prettyDOM, render, screen } from "@testing-library/react";
import user from "@testing-library/user-event";
import * as React from "react";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/stub-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import { render, screen, waitFor } from "@testing-library/react";
import user from "@testing-library/user-event";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/trailing-slashes-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { JSDOM } from "jsdom";
import * as React from "react";
import * as ReactDOM from "react-dom/client";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/use-blocker-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { act } from "react-dom/test-utils";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/dom/use-prompt-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { act } from "react-dom/test-utils";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/navigate-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as TestRenderer from "react-test-renderer";
import {
Expand Down
3 changes: 0 additions & 3 deletions packages/react-router/__tests__/router/browser-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
/* eslint-disable jest/expect-expect */

import { JSDOM } from "jsdom";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/defer-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { createMemoryHistory } from "../../lib/router";
import { createRouter } from "../../lib/router";
import {
Expand Down
3 changes: 0 additions & 3 deletions packages/react-router/__tests__/router/fetchers-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
/* eslint-disable jest/valid-title */

import type { FutureConfig, HydrationState } from "../../lib/router";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/flush-sync-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { cleanup, setup } from "./utils/data-router-setup";
import { createFormData } from "./utils/utils";

Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/hash-base-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { JSDOM } from "jsdom";

import type { HashHistory } from "../../lib/router";
Expand Down
3 changes: 0 additions & 3 deletions packages/react-router/__tests__/router/hash-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
/* eslint-disable jest/expect-expect */

import { JSDOM } from "jsdom";
Expand Down
3 changes: 0 additions & 3 deletions packages/react-router/__tests__/router/interruptions-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
/* eslint-disable jest/valid-title */

import type { HydrationState } from "../../lib/router";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/lazy-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import {
createMemoryHistory,
createRouter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { Router } from "../../lib/router";
import { createMemoryHistory, createRouter } from "../../lib/router";

Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/navigation-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { HydrationState } from "../../lib/router";
import { json } from "../../lib/router";
import { cleanup, setup } from "./utils/data-router-setup";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/redirects-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { IDLE_NAVIGATION } from "../../lib/router";
import type { TestRouteObject } from "./utils/data-router-setup";
import { cleanup, setup } from "./utils/data-router-setup";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/revalidate-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { createMemoryRouter } from "../../lib/components";
import { IDLE_NAVIGATION } from "../../lib/router";
import {
Expand Down
4 changes: 4 additions & 0 deletions packages/react-router/__tests__/router/router-memory-test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* @jest-environment node
*/

import { createMemoryHistory, createRouter } from "../../lib/router";

// This suite of tests specifically runs in the node jest environment to catch
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/router-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { HydrationState } from "../../lib/router";
import {
createMemoryHistory,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { TestRouteObject } from "./utils/data-router-setup";
import { cleanup, setup } from "./utils/data-router-setup";
import { createFormData } from "./utils/utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { createMemoryHistory, createRouter, redirect } from "../../lib/router";
import type { ShouldRevalidateFunctionArgs } from "../../lib/router";
import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "../../lib/router";
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/router/submission-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import type { HydrationState } from "../../lib/router";
import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "../../lib/router";
import { cleanup, setup } from "./utils/data-router-setup";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import { IDLE_NAVIGATION } from "../../lib/router";
import { cleanup, setup } from "./utils/data-router-setup";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* @jest-environment node
*/

import { parseMultipartFormData } from "../../lib/server-runtime/formData";

declare global {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* @jest-environment node
*/

import type { TypedResponse } from "../../lib/server-runtime/responses";
import { json, redirect } from "../../lib/server-runtime/responses";
import { isEqual } from "./utils";
Expand Down
4 changes: 4 additions & 0 deletions packages/react-router/__tests__/server-runtime/server-test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* @jest-environment node
*/

import type { StaticHandlerContext } from "react-router";
import { json } from "react-router";

Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/use-revalidator-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import "@testing-library/jest-dom";
import {
fireEvent,
Expand Down
4 changes: 0 additions & 4 deletions packages/react-router/__tests__/useResolvedPath-test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @jest-environment jsdom
*/

import * as React from "react";
import * as TestRenderer from "react-test-renderer";
import type { Path } from "react-router";
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
module.exports = {
...require("../../jest/jest.config.shared"),
setupFilesAfterEnv: ["@testing-library/jest-dom"],
testEnvironment: "jsdom",
};

0 comments on commit 59dc0dd

Please sign in to comment.