From 9e82bae749881476f8a1e21c542386784a7eaa26 Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Mon, 26 Dec 2022 14:14:07 +0800 Subject: [PATCH 1/4] chore: fix ci --- components/modal/__tests__/hook.test.tsx | 26 ++++++++++-------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/components/modal/__tests__/hook.test.tsx b/components/modal/__tests__/hook.test.tsx index cccb5420d7c2..b8f73c4cf65e 100644 --- a/components/modal/__tests__/hook.test.tsx +++ b/components/modal/__tests__/hook.test.tsx @@ -199,10 +199,6 @@ describe('Modal.hook', () => { it('the callback close should be a method when onCancel has a close parameter', async () => { jest.useFakeTimers(); - const clear = async function clear() { - await waitFakeTimer(); - }; - const mockFn = jest.fn(); const Demo = () => { @@ -229,57 +225,57 @@ describe('Modal.hook', () => { const { container } = render(); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(0); // First open fireEvent.click(container.querySelectorAll('.open-hook-modal-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(1); // Click mask to close fireEvent.click(document.body.querySelectorAll('.ant-modal-wrap')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(0); // Second open fireEvent.click(container.querySelectorAll('.open-hook-modal-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(1); // Press ESC to turn off - TestUtils.Simulate.keyDown(document.body.querySelectorAll('.ant-modal')[0], { + fireEvent.keyDown(document.body.querySelectorAll('.ant-modal')[0], { keyCode: KeyCode.ESC, }); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(0); // Third open fireEvent.click(container.querySelectorAll('.open-hook-modal-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(1); // Click the close icon to close fireEvent.click(document.body.querySelectorAll('.ant-modal-close')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(0); // Last open fireEvent.click(container.querySelectorAll('.open-hook-modal-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(1); // Click the Cancel button to close (invalid) fireEvent.click(document.body.querySelectorAll('.ant-modal-confirm-btns > .ant-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(1); @@ -288,7 +284,7 @@ describe('Modal.hook', () => { // Click the Cancel button to close (valid) fireEvent.click(document.body.querySelectorAll('.ant-modal-confirm-btns > .ant-btn')[0]); - await clear(); + await waitFakeTimer(); expect(document.body.querySelectorAll('.ant-modal-confirm-confirm')).toHaveLength(0); From 2e68b949cdfaf37c3241545ab921819e04218dbc Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Mon, 26 Dec 2022 14:15:33 +0800 Subject: [PATCH 2/4] chore: code clean --- components/modal/__tests__/hook.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/modal/__tests__/hook.test.tsx b/components/modal/__tests__/hook.test.tsx index b8f73c4cf65e..16edbe4ac9a5 100644 --- a/components/modal/__tests__/hook.test.tsx +++ b/components/modal/__tests__/hook.test.tsx @@ -2,7 +2,7 @@ import CSSMotion from 'rc-motion'; import { genCSSMotion } from 'rc-motion/lib/CSSMotion'; import KeyCode from 'rc-util/lib/KeyCode'; import React from 'react'; -import TestUtils, { act } from 'react-dom/test-utils'; +import { act } from 'react-dom/test-utils'; import Modal from '..'; import { fireEvent, render, waitFakeTimer } from '../../../tests/utils'; From b7e17e0cc491abf1ea8a57e6760adcdec583c423 Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Mon, 26 Dec 2022 14:49:19 +0800 Subject: [PATCH 3/4] chore: update form test --- components/form/__tests__/index.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/form/__tests__/index.test.tsx b/components/form/__tests__/index.test.tsx index 8b638e5d9c8a..0f1c702647f9 100644 --- a/components/form/__tests__/index.test.tsx +++ b/components/form/__tests__/index.test.tsx @@ -639,7 +639,7 @@ describe('Form', () => { value = '', id, }) => { - shouldRender(); + shouldRender(value); return ; }; @@ -667,8 +667,8 @@ describe('Form', () => { expect(formRef.current!.getFieldsValue()).toEqual({ light: 'bamboo' }); - expect(container.querySelector('#changed')!.value).toEqual('bamboo'); expect(shouldNotRender).toHaveBeenCalledTimes(1); + expect(shouldRender).toHaveBeenLastCalledWith('bamboo'); expect(shouldRender).toHaveBeenCalledTimes(2); }); From ca5edf1fb67da8fd897e0f02e8a3fd2c04c2a0db Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Mon, 26 Dec 2022 15:25:17 +0800 Subject: [PATCH 4/4] chore: test --- components/form/__tests__/index.test.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/form/__tests__/index.test.tsx b/components/form/__tests__/index.test.tsx index 0f1c702647f9..c4f26cdf0e95 100644 --- a/components/form/__tests__/index.test.tsx +++ b/components/form/__tests__/index.test.tsx @@ -667,6 +667,8 @@ describe('Form', () => { expect(formRef.current!.getFieldsValue()).toEqual({ light: 'bamboo' }); + await waitFakeTimer(); + expect(shouldNotRender).toHaveBeenCalledTimes(1); expect(shouldRender).toHaveBeenLastCalledWith('bamboo'); expect(shouldRender).toHaveBeenCalledTimes(2);