Remove imports from `@jest/globals`
They were causing issues with mocking (i.e. mocks wouldn't get applied) when upgrading to Next 12.1.5 (from 12.1.0). Since we couldn't consistently use them anyway (expect.extend didn't support it, IIRC) and it's not the default setup in Jest, so let's keep relying on their implicit injection for now.
This commit is contained in:
Родитель
5403d047b8
Коммит
9592c8d95c
|
@ -1,4 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import type { RuntimeConfig } from "../src/config";
|
||||
|
||||
export const mockConfigModule = {
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import { AddonData, useAddonData } from "../../src/hooks/addon";
|
||||
|
||||
jest.mock("../../src/hooks/addon");
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import {
|
||||
CustomAliasData,
|
||||
RandomAliasData,
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import { ProfileData, ProfileUpdateFn, useProfiles } from "../../../src/hooks/api/profile";
|
||||
import {
|
||||
ProfileData,
|
||||
ProfileUpdateFn,
|
||||
useProfiles,
|
||||
} from "../../../src/hooks/api/profile";
|
||||
|
||||
jest.mock("../../../src/hooks/api/profile");
|
||||
|
||||
|
@ -28,23 +31,30 @@ export function getMockProfileData(profileData?: MockData): ProfileData {
|
|||
}
|
||||
|
||||
type Callbacks = {
|
||||
updater?: ProfileUpdateFn,
|
||||
updater?: ProfileUpdateFn;
|
||||
};
|
||||
function getReturnValue(profileData?: MockData, callbacks?: Callbacks): ReturnType<typeof useProfiles> {
|
||||
function getReturnValue(
|
||||
profileData?: MockData,
|
||||
callbacks?: Callbacks
|
||||
): ReturnType<typeof useProfiles> {
|
||||
return {
|
||||
isValidating: false,
|
||||
mutate: jest.fn(),
|
||||
update: callbacks?.updater ?? jest.fn(),
|
||||
data: [
|
||||
getMockProfileData(profileData),
|
||||
],
|
||||
data: [getMockProfileData(profileData)],
|
||||
};
|
||||
}
|
||||
|
||||
export const setMockProfileData = (profileData?: MockData, callbacks?: Callbacks) => {
|
||||
export const setMockProfileData = (
|
||||
profileData?: MockData,
|
||||
callbacks?: Callbacks
|
||||
) => {
|
||||
mockedUseProfiles.mockReturnValue(getReturnValue(profileData, callbacks));
|
||||
};
|
||||
|
||||
export const setMockProfileDataOnce = (profileData?: MockData, callbacks?: Callbacks) => {
|
||||
export const setMockProfileDataOnce = (
|
||||
profileData?: MockData,
|
||||
callbacks?: Callbacks
|
||||
) => {
|
||||
mockedUseProfiles.mockReturnValueOnce(getReturnValue(profileData, callbacks));
|
||||
};
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import {
|
||||
RuntimeData,
|
||||
useRuntimeData,
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import { UserData, useUsers } from "../../../src/hooks/api/user";
|
||||
|
||||
jest.mock("../../../src/hooks/api/user");
|
||||
|
||||
// We know that `jest.mock` has turned `useUsers` into a mock function,
|
||||
// but TypeScript can't — so we tell it using a type assertion:
|
||||
const mockedUseUsers = useUsers as jest.MockedFunction<
|
||||
typeof useUsers
|
||||
>;
|
||||
const mockedUseUsers = useUsers as jest.MockedFunction<typeof useUsers>;
|
||||
|
||||
function getReturnValue(userData?: Partial<UserData>): ReturnType<typeof useUsers> {
|
||||
function getReturnValue(
|
||||
userData?: Partial<UserData>
|
||||
): ReturnType<typeof useUsers> {
|
||||
return {
|
||||
isValidating: false,
|
||||
mutate: jest.fn(),
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
import { useMinViewportWidth } from "../../src/hooks/mediaQuery";
|
||||
|
||||
jest.mock("../../src/hooks/mediaQuery");
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
|
||||
export const mockNextRouter = {
|
||||
useRouter: jest.fn(() => {
|
||||
return {
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
import { jest } from "@jest/globals";
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const { OutboundLink } = jest.requireActual("react-ga") as any;
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { expect } from "@jest/globals";
|
||||
import "@testing-library/jest-dom/extend-expect";
|
||||
import { toHaveNoViolations } from "jest-axe";
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { mockConfigModule } from "../../../../__mocks__/configMock";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import { mockCookiesModule } from "../../../__mocks__/functions/cookies";
|
||||
import { mockGetLocaleModule } from "../../../__mocks__/functions/getLocale";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { mockGetLocaleModule } from "../../../../__mocks__/functions/getLocale";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { it, expect } from "@jest/globals";
|
||||
import {
|
||||
AliasData,
|
||||
CustomAliasData,
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { describe, it, expect } from "@jest/globals";
|
||||
import { act, renderHook } from "@testing-library/react-hooks";
|
||||
import { setMockAddonDataOnce } from "../../__mocks__/hooks/addon";
|
||||
import { getMockRandomAlias } from "../../__mocks__/hooks/api/aliases";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import React from "react";
|
||||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { act, render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { axe } from "jest-axe";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import React from "react";
|
||||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { act, render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { axe } from "jest-axe";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { act, render } from "@testing-library/react";
|
||||
import { axe } from "jest-axe";
|
||||
import { mockConfigModule } from "../../__mocks__/configMock";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { act, render } from "@testing-library/react";
|
||||
import { axe } from "jest-axe";
|
||||
import { mockConfigModule } from "../../__mocks__/configMock";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import { jest, describe, it, expect } from "@jest/globals";
|
||||
import { act, render } from "@testing-library/react";
|
||||
import { axe } from "jest-axe";
|
||||
import { mockConfigModule } from "../../__mocks__/configMock";
|
||||
|
|
Загрузка…
Ссылка в новой задаче