Skip to content

Commit 4bb25fb

Browse files
committed
chore: Update tests to use jest.mocked
1 parent 87fe77c commit 4bb25fb

File tree

9 files changed

+16
-25
lines changed

9 files changed

+16
-25
lines changed

packages/documentation/src/components/DemoSandbox/__tests__/DemoSandbox.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { mocked } from "ts-jest/utils";
21
import { render, fireEvent } from "utils/tests";
32

43
import DemoSandbox from "../DemoSandbox";
54
import useSandbox from "../useSandbox";
65

76
jest.mock("../useSandbox");
87

9-
const useSandboxMock = mocked(useSandbox);
8+
const useSandboxMock = jest.mocked(useSandbox);
109

1110
beforeEach(() => {
1211
useSandboxMock.mockImplementation((defaultSandbox) => ({

packages/documentation/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"isolatedModules": true,
1212
"incremental": true
1313
},
14-
"include": ["next-env.d.ts", "src"],
15-
"exclude": ["src/server", "**/__tests__"]
14+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
15+
"exclude": ["node_modules"]
1616
}

packages/form/src/text-field/__tests__/TextArea.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// tests with cypress
33
import { ReactElement, useState } from "react";
44
import { act, fireEvent, render } from "@testing-library/react";
5-
import { mocked } from "ts-jest/utils";
65
import { ResizeObserver } from "@juggle/resize-observer";
76

87
import { TextArea } from "../TextArea";
98

109
jest.mock("@juggle/resize-observer");
1110

12-
const ResizeObserverMock = mocked(ResizeObserver);
11+
const ResizeObserverMock = jest.mocked(ResizeObserver);
1312
const DEFAULT_DOM_RECT: DOMRectReadOnly = {
1413
x: 0,
1514
y: 0,

packages/layout/src/__tests__/Layout.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
Routes,
88
Route,
99
} from "react-router-dom";
10-
import { mocked } from "ts-jest/utils";
1110
import {
1211
RenderOptions,
1312
fireEvent,
@@ -46,8 +45,9 @@ jest.mock("@react-md/utils", () => ({
4645
AppSizeListener: jest.fn(),
4746
}));
4847

49-
mocked(AppSizeListener).mockImplementation(
50-
({ children, defaultSize = DEFAULT_APP_SIZE }) => {
48+
jest
49+
.mocked(AppSizeListener)
50+
.mockImplementation(({ children, defaultSize = DEFAULT_APP_SIZE }) => {
5151
const [value, setValue] = useState({ ...defaultSize, __initialized: true });
5252
return (
5353
<AppSizeContext.Provider value={value}>
@@ -73,8 +73,7 @@ mocked(AppSizeListener).mockImplementation(
7373
)}
7474
</AppSizeContext.Provider>
7575
);
76-
}
77-
);
76+
});
7877

7978
const render = (ui: ReactElement, options?: RenderOptions) =>
8079
baseRender(ui, {

packages/utils/src/__tests__/useInterval.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { render } from "@testing-library/react";
22
import { act, renderHook } from "@testing-library/react-hooks";
3-
import { mocked } from "ts-jest/utils";
43

54
import { useInterval } from "../useInterval";
65

76
jest.useFakeTimers();
8-
const setInterval = mocked(window.setInterval);
9-
const clearInterval = mocked(window.clearInterval);
7+
const setInterval = jest.mocked(window.setInterval);
8+
const clearInterval = jest.mocked(window.clearInterval);
109
beforeEach(() => {
1110
setInterval.mockClear();
1211
clearInterval.mockClear();

packages/utils/src/__tests__/useTimeout.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { act, renderHook } from "@testing-library/react-hooks";
2-
import { mocked } from "ts-jest/utils";
32

43
import { useTimeout } from "../useTimeout";
54

65
jest.useFakeTimers();
76

8-
const setTimeout = mocked(window.setTimeout);
9-
const clearTimeout = mocked(window.clearTimeout);
7+
const setTimeout = jest.mocked(window.setTimeout);
8+
const clearTimeout = jest.mocked(window.clearTimeout);
109

1110
afterEach(() => {
1211
jest.clearAllMocks();

packages/utils/src/layout/__tests__/GridList.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
import { ReactElement } from "react";
33
import { act, render } from "@testing-library/react";
44
import { ResizeObserver } from "@juggle/resize-observer";
5-
import { mocked } from "ts-jest/utils";
65

76
import { GridList, GridListProps } from "../GridList";
87
import { useGridListSize } from "../useGridList";
98

109
jest.mock("@juggle/resize-observer");
1110

12-
const ResizeObserverMock = mocked(ResizeObserver);
11+
const ResizeObserverMock = jest.mocked(ResizeObserver);
1312

1413
const DEFAULT_DOM_RECT: DOMRectReadOnly = {
1514
x: 100,

packages/utils/src/sizing/__tests__/useResizeObserver.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { act, render } from "@testing-library/react";
22
import { ResizeObserver } from "@juggle/resize-observer";
3-
import { mocked } from "ts-jest/utils";
43

54
import {
65
OnResizeObserverChange,
@@ -10,7 +9,7 @@ import {
109

1110
jest.mock("@juggle/resize-observer");
1211

13-
const ResizeObserverMock = mocked(ResizeObserver);
12+
const ResizeObserverMock = jest.mocked(ResizeObserver);
1413
const observe = jest.fn();
1514
const unobserve = jest.fn();
1615
const disconnect = jest.fn();

packages/utils/src/wia-aria/__tests__/focusElementWithin.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import { mocked } from "ts-jest/utils";
2-
31
import { scrollIntoView as scrollIntoView_ } from "../../scrollIntoView";
42
import { focusElementWithin } from "../focusElementWithin";
53
import { getFocusableElements as getFocusableElements_ } from "../getFocusableElements";
64

75
jest.mock("../getFocusableElements");
86
jest.mock("../../scrollIntoView");
97

10-
const getFocusableElements = mocked(getFocusableElements_);
11-
const scrollIntoView = mocked(scrollIntoView_);
8+
const getFocusableElements = jest.mocked(getFocusableElements_);
9+
const scrollIntoView = jest.mocked(scrollIntoView_);
1210
const ELEMENT = document.createElement("div");
1311
const element1 = document.createElement("button");
1412
element1.className = "element element--1";

0 commit comments

Comments
 (0)