From e7393ee97e82b8c08e601afc1405a15f104d7d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Long=20Hao=20=28=E9=BE=99=E6=BF=A0=29?=
<45565100+LongHaoo@users.noreply.github.com>
Date: Sat, 28 May 2022 14:47:29 +0800
Subject: [PATCH 1/3] test: Replace card component test with testing lib
(#35751)
* test: Replace card component test with testing lib
* test: update the snapshot
---
...index.test.js.snap => index.test.tsx.snap} | 0
.../{index.test.js => index.test.tsx} | 26 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
rename components/card/__tests__/__snapshots__/{index.test.js.snap => index.test.tsx.snap} (100%)
rename components/card/__tests__/{index.test.js => index.test.tsx} (72%)
diff --git a/components/card/__tests__/__snapshots__/index.test.js.snap b/components/card/__tests__/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from components/card/__tests__/__snapshots__/index.test.js.snap
rename to components/card/__tests__/__snapshots__/index.test.tsx.snap
diff --git a/components/card/__tests__/index.test.js b/components/card/__tests__/index.test.tsx
similarity index 72%
rename from components/card/__tests__/index.test.js
rename to components/card/__tests__/index.test.tsx
index fc11bc5c74..a9cc063b9a 100644
--- a/components/card/__tests__/index.test.js
+++ b/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(
xxx
,
);
- expect(wrapper.render()).toMatchSnapshot();
+ expect(container.firstChild).toMatchSnapshot();
});
it('title should be vertically aligned', () => {
- const wrapper = mount(
+ const { container } = render(
Button} style={{ width: 300 }}>
Card content
,
);
- 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(
xxx
,
);
- 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 content
,
);
- 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 content
,
);
- 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();
render(
From 363e077298b874874d4f6d2b5ff2927aac3a4519 Mon Sep 17 00:00:00 2001
From: Gabriel Haruki
Date: Sat, 28 May 2022 04:31:13 -0300
Subject: [PATCH 2/3] docs: add note to custom BackTop demo (#35625)
* docs: add note to custom BackTop demo
* Apply suggestions from code review
Co-authored-by: afc163
---
components/back-top/demo/custom.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/components/back-top/demo/custom.md b/components/back-top/demo/custom.md
index f76c4df8fc..648a5f600a 100644
--- a/components/back-top/demo/custom.md
+++ b/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 React from 'react';
import { BackTop } from 'antd';
From effa5541b84eb3593b8e6d412b16447d7e1808ee Mon Sep 17 00:00:00 2001
From: afc163
Date: Sun, 29 May 2022 20:16:01 +0800
Subject: [PATCH 3/3] test: lock eslint-plugin-jest version for false positive
https://github.com/jest-community/eslint-plugin-jest/issues/1128
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index fd112fa62d..e0bc61bcfc 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,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",