Browse Source

chore: auto merge branchs (#35798)

chore: merge master into next
pull/35814/head
github-actions[bot] 3 years ago
committed by GitHub
parent
commit
9c8baaa466
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      components/back-top/demo/custom.md
  2. 0
      components/card/__tests__/__snapshots__/index.test.tsx.snap
  3. 26
      components/card/__tests__/index.test.tsx
  4. 2
      package.json

4
components/back-top/demo/custom.md

@ -10,10 +10,14 @@ title:
可以自定义回到顶部按钮的样式,限制宽高:`40px * 40px`。
> 注意:`BackTop` 需要一个可接受 `onClick` 事件的元素作为 `children`。 如果您直接将文本作为子项放置,则该组件将无法正常运行。
## en-US
You can customize the style of the button, just note the size limit: no more than `40px * 40px`.
> Note: `BackTop` expects a element could accept `onClick` propety as children. If you put a text directly as children the component will not function properly.
```tsx
import { BackTop } from 'antd';
import React from 'react';

0
components/card/__tests__/__snapshots__/index.test.js.snap → components/card/__tests__/__snapshots__/index.test.tsx.snap

26
components/card/__tests__/index.test.js → components/card/__tests__/index.test.tsx

@ -1,10 +1,9 @@
import React from 'react';
import { mount } from 'enzyme';
import Card from '../index';
import Button from '../../button/index';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
import { render } from '../../../tests/utils';
import { render, fireEvent } from '../../../tests/utils';
describe('Card', () => {
mountTest(Card);
@ -19,21 +18,21 @@ describe('Card', () => {
});
it('should still have padding when card which set padding to 0 is loading', () => {
const wrapper = mount(
const { container } = render(
<Card loading bodyStyle={{ padding: 0 }}>
xxx
</Card>,
);
expect(wrapper.render()).toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
it('title should be vertically aligned', () => {
const wrapper = mount(
const { container } = render(
<Card title="Card title" extra={<Button>Button</Button>} style={{ width: 300 }}>
<p>Card content</p>
</Card>,
);
expect(wrapper.render()).toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
it('onTabChange should work', () => {
@ -48,26 +47,27 @@ describe('Card', () => {
},
];
const onTabChange = jest.fn();
const wrapper = mount(
const { container } = render(
<Card onTabChange={onTabChange} tabList={tabList}>
xxx
</Card>,
);
wrapper.find('.ant-tabs-tab').at(1).simulate('click');
fireEvent.click(container.querySelectorAll('.ant-tabs-tab')[1]);
expect(onTabChange).toHaveBeenCalledWith('tab2');
});
it('should not render when actions is number', () => {
const wrapper = mount(
const { container } = render(
// @ts-ignore ingnore for the wrong action value
<Card title="Card title" actions={11}>
<p>Card content</p>
</Card>,
);
expect(wrapper.find('.ant-card-actions').length).toBe(0);
expect(container.querySelectorAll('.ant-card-actions').length).toBe(0);
});
it('with tab props', () => {
const wrapper = mount(
const { container } = render(
<Card
title="Card title"
tabList={[
@ -81,11 +81,11 @@ describe('Card', () => {
<p>Card content</p>
</Card>,
);
expect(wrapper.find('Tabs').get(0).props.size).toBe('small');
expect(container.querySelectorAll('.ant-tabs-small').length === 0).toBeFalsy();
});
it('get ref of card', () => {
const cardRef = React.createRef();
const cardRef = React.createRef<HTMLDivElement>();
render(
<Card ref={cardRef} title="Card title">

2
package.json

@ -220,7 +220,7 @@
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-compat": "^4.0.0",
"eslint-plugin-import": "^2.21.1",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-jest": "~26.3.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-markdown": "^2.0.0",
"eslint-plugin-react": "^7.28.0",

Loading…
Cancel
Save