From a998569adb9617c7a47b04b15ab0e1ed639b2f53 Mon Sep 17 00:00:00 2001 From: Fly me to the moon <138013431+Negentropy247@users.noreply.github.com> Date: Sat, 8 Jul 2023 15:45:28 +0800 Subject: [PATCH] test: optimization type in test case (#43449) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: optimization type in test case * fix lint --------- Co-authored-by: 我们去月球漫步 <13105694+flymetothemoon-wj@user.noreply.gitee.com> --- .../date-picker/__tests__/DatePicker.test.tsx | 2 +- components/dropdown/__tests__/index.test.tsx | 2 +- tests/__mocks__/@rc-component/trigger.tsx | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/components/date-picker/__tests__/DatePicker.test.tsx b/components/date-picker/__tests__/DatePicker.test.tsx index 6df4622b3e..c7b7533ba1 100644 --- a/components/date-picker/__tests__/DatePicker.test.tsx +++ b/components/date-picker/__tests__/DatePicker.test.tsx @@ -21,7 +21,7 @@ jest.mock('@rc-component/trigger', () => { const h: typeof React = jest.requireActual('react'); return { - default: h.forwardRef((props, ref) => { + default: h.forwardRef((props, ref) => { triggerProps = props; return h.createElement(Trigger, { ref, ...props }); }), diff --git a/components/dropdown/__tests__/index.test.tsx b/components/dropdown/__tests__/index.test.tsx index fa3f15b081..0af4b9fcac 100644 --- a/components/dropdown/__tests__/index.test.tsx +++ b/components/dropdown/__tests__/index.test.tsx @@ -15,7 +15,7 @@ jest.mock('@rc-component/trigger', () => { const h: typeof React = jest.requireActual('react'); return { - default: h.forwardRef((props, ref) => { + default: h.forwardRef((props, ref) => { triggerProps = props; return h.createElement(Trigger, { ref, ...props }); }), diff --git a/tests/__mocks__/@rc-component/trigger.tsx b/tests/__mocks__/@rc-component/trigger.tsx index b9c9d5c88d..1c331e7774 100644 --- a/tests/__mocks__/@rc-component/trigger.tsx +++ b/tests/__mocks__/@rc-component/trigger.tsx @@ -1,4 +1,4 @@ -import type { TriggerProps } from '@rc-component/trigger'; +import type { TriggerProps, TriggerRef } from '@rc-component/trigger'; import MockTrigger from '@rc-component/trigger/lib/mock'; import * as React from 'react'; import { TriggerMockContext } from '../../shared/demoTestContext'; @@ -6,22 +6,21 @@ import { TriggerMockContext } from '../../shared/demoTestContext'; let OriginTrigger = jest.requireActual('@rc-component/trigger'); OriginTrigger = OriginTrigger.default ?? OriginTrigger; -const ForwardTrigger = React.forwardRef((props, ref) => { +const ForwardTrigger = React.forwardRef((props, ref) => { const context = React.useContext(TriggerMockContext); const mergedPopupVisible = context?.popupVisible ?? props.popupVisible; (global as any).triggerProps = props; - const mergedProps = { + const mergedProps: TriggerProps = { ...props, - ref, - popupVisible: mergedPopupVisible as boolean, + popupVisible: mergedPopupVisible, }; if (context?.mock === false) { - return ; + return ; } - return ; + return ; }); export default ForwardTrigger;