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.

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

test: wrap React.StrictMode for test cases #35026

Merged
merged 26 commits into from
Apr 18, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/avatar/__tests__/Avatar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import { act } from 'react-dom/test-utils';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Avatar from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
Expand Down
2 changes: 1 addition & 1 deletion components/breadcrumb/__tests__/Breadcrumb.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Breadcrumb from '../index';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
Expand Down
3 changes: 1 addition & 2 deletions components/button/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import React, { Component } from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { SearchOutlined } from '@ant-design/icons';
import { resetWarned } from 'rc-util/lib/warning';
import Button from '..';
import ConfigProvider from '../../config-provider';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { sleep } from '../../../tests/utils';
import { sleep, render } from '../../../tests/utils';
import { SizeType } from '../../config-provider/SizeContext';

describe('Button', () => {
Expand Down
2 changes: 1 addition & 1 deletion components/config-provider/__tests__/form.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { render } from '../../../tests/utils';
import ConfigProvider from '..';
import zhCN from '../../locale/zh_CN';
import Form from '../../form';
Expand Down
2 changes: 1 addition & 1 deletion components/drawer/__tests__/Drawer.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Drawer from '..';
import ConfigProvider from '../../config-provider';
import mountTest from '../../../tests/shared/mountTest';
Expand Down
3 changes: 1 addition & 2 deletions components/form/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Component, useState } from 'react';
import { mount } from 'enzyme';
import { render, fireEvent } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import scrollIntoView from 'scroll-into-view-if-needed';
import Form from '..';
Expand All @@ -12,7 +11,7 @@ import Select from '../../select';

import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { sleep } from '../../../tests/utils';
import { sleep, render, fireEvent } from '../../../tests/utils';
import ConfigProvider from '../../config-provider';
import zhCN from '../../locale/zh_CN';

Expand Down
3 changes: 1 addition & 2 deletions components/form/__tests__/list.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';
import { mount } from 'enzyme';
import { act } from 'react-dom/test-utils';
import { render, fireEvent } from '@testing-library/react';
import Form from '..';
import Input from '../../input';
import Button from '../../button';
import { sleep } from '../../../tests/utils';
import { sleep, render, fireEvent } from '../../../tests/utils';

describe('Form.List', () => {
async function change(wrapper, index, value) {
Expand Down
2 changes: 1 addition & 1 deletion components/grid/__tests__/gap.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import ReactDOMServer from 'react-dom/server';
import { render } from '@testing-library/react';
import { mount } from 'enzyme';
import { render } from '../../../tests/utils';
import { Col, Row } from '..';
// eslint-disable-next-line no-unused-vars
import * as styleChecker from '../../_util/styleChecker';
Expand Down
12 changes: 6 additions & 6 deletions components/input/__tests__/focus.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { mount } from 'enzyme';
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
import { InputRef } from '../Input';
import Input from '..';
import { render, fireEvent } from '../../../tests/utils';

const { TextArea } = Input;

Expand Down Expand Up @@ -58,12 +59,11 @@ describe('Input.Focus', () => {
});

it('disabled should reset focus', () => {
const wrapper = mount(<Input allowClear />);
wrapper.find('input').simulate('focus');
expect(wrapper.exists('.ant-input-affix-wrapper-focused')).toBeTruthy();
const { rerender, container } = render(<Input allowClear />);
fireEvent.focus(container.querySelector('input')!);
expect(container.querySelector('.ant-input-affix-wrapper-focused')).toBeTruthy();

wrapper.setProps({ disabled: true });
wrapper.update();
expect(wrapper.exists('.ant-input-affix-wrapper-focused')).toBeFalsy();
rerender(<Input allowClear disabled />);
expect(container.querySelector('.ant-input-affix-wrapper-focused')).toBeFalsy();
});
});
2 changes: 1 addition & 1 deletion components/input/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { mount } from 'enzyme';
import { render, fireEvent } from '@testing-library/react';
import { render, fireEvent } from '../../../tests/utils';
// eslint-disable-next-line import/no-unresolved
import Form from '../../form';
import Input, { InputProps, InputRef } from '..';
Expand Down
3 changes: 1 addition & 2 deletions components/input/__tests__/textarea.test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React, { useState } from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import RcTextArea from 'rc-textarea';
import Input from '..';
import focusTest from '../../../tests/shared/focusTest';
import { sleep } from '../../../tests/utils';
import { sleep, render } from '../../../tests/utils';

const { TextArea } = Input;

Expand Down
2 changes: 1 addition & 1 deletion components/menu/__tests__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
PieChartOutlined,
UserOutlined,
} from '@ant-design/icons';
import { render, fireEvent } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import Menu from '..';
import Layout from '../../layout';
import Tooltip from '../../tooltip';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { render, fireEvent } from '../../../tests/utils';
import collapseMotion from '../../_util/motion';

globalThis.IS_REACT_ACT_ENVIRONMENT = true;
Expand Down
3 changes: 1 addition & 2 deletions components/popconfirm/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';
import { mount } from 'enzyme';
import { spyElementPrototype } from 'rc-util/lib/test/domHook';
import { render, fireEvent } from '@testing-library/react';
import Popconfirm from '..';
import mountTest from '../../../tests/shared/mountTest';
import { sleep } from '../../../tests/utils';
import { sleep, render, fireEvent } from '../../../tests/utils';
import rtlTest from '../../../tests/shared/rtlTest';
import Button from '../../button';

Expand Down
2 changes: 1 addition & 1 deletion components/popover/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Popover from '..';
import mountTest from '../../../tests/shared/mountTest';
import ConfigProvider from '../../config-provider';
Expand Down
2 changes: 1 addition & 1 deletion components/result/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Result from '..';
import Button from '../../button';
import mountTest from '../../../tests/shared/mountTest';
Expand Down
15 changes: 8 additions & 7 deletions components/spin/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import { render, mount } from 'enzyme';
import { mount } from 'enzyme';
import Spin from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { render } from '../../../tests/utils';

describe('Spin', () => {
mountTest(Spin);
Expand All @@ -20,15 +21,15 @@ describe('Spin', () => {

it("should render custom indicator when it's set", () => {
const customIndicator = <div className="custom-indicator" />;
const wrapper = render(<Spin indicator={customIndicator} />);
expect(wrapper).toMatchSnapshot();
const wrapper = mount(<Spin indicator={customIndicator} />);
expect(wrapper.render()).toMatchSnapshot();
});

it('should be controlled by spinning', () => {
const wrapper = mount(<Spin spinning={false} />);
expect(wrapper.instance().state.spinning).toBe(false);
wrapper.setProps({ spinning: true });
expect(wrapper.instance().state.spinning).toBe(true);
const { container, rerender } = render(<Spin spinning={false} />);
expect(container.querySelector('.ant-spin')).not.toHaveClass('ant-spin-spinning');
rerender(<Spin spinning />);
expect(container.querySelector('.ant-spin')).toHaveClass('ant-spin-spinning');
});

it('if indicator set null should not be render default indicator', () => {
Expand Down
2 changes: 1 addition & 1 deletion components/table/__tests__/Table.filter.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from 'react';
import { mount } from 'enzyme';
import { act } from 'react-dom/test-utils';
import { render, fireEvent } from '@testing-library/react';
import { render, fireEvent } from '../../../tests/utils';
import Table from '..';
import Input from '../../input';
import Tooltip from '../../tooltip';
Expand Down
3 changes: 1 addition & 2 deletions components/table/__tests__/Table.test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import Table from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { sleep } from '../../../tests/utils';
import { sleep, render } from '../../../tests/utils';

const { Column, ColumnGroup } = Table;

Expand Down
2 changes: 1 addition & 1 deletion components/transfer/__tests__/customize.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { render } from '../../../tests/utils';
import Transfer from '../index';

describe('Transfer.Customize', () => {
Expand Down
2 changes: 1 addition & 1 deletion components/transfer/__tests__/search.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { render, fireEvent } from '@testing-library/react';
import { render, fireEvent } from '../../../tests/utils';
import Search from '../search';
import Transfer from '../index';

Expand Down
3 changes: 1 addition & 2 deletions components/typography/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { mount } from 'enzyme';
import { render } from '@testing-library/react';
import { SmileOutlined, LikeOutlined, HighlightOutlined, CheckOutlined } from '@ant-design/icons';
import KeyCode from 'rc-util/lib/KeyCode';
import { resetWarned } from 'rc-util/lib/warning';
Expand All @@ -14,7 +13,7 @@ import Base from '../Base';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import Typography from '../Typography';
import { sleep } from '../../../tests/utils';
import { sleep, render } from '../../../tests/utils';

jest.mock('copy-to-clipboard');

Expand Down
3 changes: 1 addition & 2 deletions components/upload/__tests__/upload.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable react/no-string-refs, react/prefer-es6-class */
import React from 'react';
import { mount } from 'enzyme';
import { render, fireEvent } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import produce from 'immer';
import { cloneDeep } from 'lodash';
Expand All @@ -12,7 +11,7 @@ import { setup, teardown } from './mock';
import { resetWarned } from '../../_util/devWarning';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { sleep } from '../../../tests/utils';
import { sleep, render, fireEvent } from '../../../tests/utils';

globalThis.IS_REACT_ACT_ENVIRONMENT = true;

Expand Down
17 changes: 17 additions & 0 deletions tests/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,20 @@ Object.assign(Enzyme.ReactWrapper.prototype, {
target.getBoundingClientRect = originGetBoundingClientRect;
},
});

// React.StrictMode wrapper
jest.mock('enzyme', () => {
const enzyme = jest.requireActual('enzyme');
const { StrictMode, cloneElement } = jest.requireActual('react');
const { mount, render } = enzyme;

function EnzymeWrapper({ children, ...props }) {
return <StrictMode>{cloneElement(children, props)}</StrictMode>;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这么神奇,这样包一下有啥意义?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setProps 需要透传,否则 wrapper.setProps 的测试全部会挂掉

}

return {
...enzyme,
mount: (ui, ...args) => mount(<EnzymeWrapper>{ui}</EnzymeWrapper>, ...args),
render: (ui, ...args) => render(<EnzymeWrapper>{ui}</EnzymeWrapper>, ...args),
};
});
3 changes: 1 addition & 2 deletions tests/shared/focusTest.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import { render } from '@testing-library/react';
import { mount, ReactWrapper } from 'enzyme';
import { sleep } from '../utils';
import { sleep, render } from '../utils';

// eslint-disable-next-line jest/no-export
export default function focusTest(
Expand Down
9 changes: 9 additions & 0 deletions tests/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import MockDate from 'mockdate';
import { StrictMode, ReactElement } from 'react';
import { act } from 'react-dom/test-utils';
import { render, RenderOptions } from '@testing-library/react';

export function setMockDate(dateString = '2017-09-18T03:30:07.795') {
MockDate.set(dateString);
Expand All @@ -18,3 +20,10 @@ export const sleep = async (timeout = 0) => {
});
});
};

const customRender = (ui: ReactElement, options?: Omit<RenderOptions, 'wrapper'>) =>
render(ui, { wrapper: StrictMode, ...options });

export { customRender as render };

export * from '@testing-library/react';