Refactor the test for NumberControl component to reduce changes

WordPress · Nov 29, 2024 · 1e432c3 · 1e432c3
1 parent 6a7b449
commit 1e432c3
Showing 1 changed file with 18 additions and 30 deletions.
diff --git a/packages/components/src/number-control/test/index.tsx b/packages/components/src/number-control/test/index.tsx
@@ -12,36 +12,35 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import NumberControl from '..';
+import _NumberControl from '..';
 import type { NumberControlProps } from '../types';
 
+const NumberControl = (
+	props: React.ComponentProps< typeof _NumberControl >
+) => <_NumberControl __next40pxDefaultSize { ...props } />;
+
 function StatefulNumberControl( props: NumberControlProps ) {
 	const [ value, setValue ] = useState( props.value );
 	const handleOnChange = ( v: string | undefined ) => setValue( v );
 
 	return (
 		<NumberControl
 			{ ...props }
-			__next40pxDefaultSize
 			value={ value }
 			onChange={ handleOnChange }
 		/>
 	);
 }
 
-const ControlledNumberControl = ( props: NumberControlProps ) => {
-	return <NumberControl __next40pxDefaultSize { ...props } />;
-};
-
 describe( 'NumberControl', () => {
 	describe( 'Basic rendering', () => {
 		it( 'should render', () => {
-			render( <ControlledNumberControl /> );
+			render( <NumberControl /> );
 			expect( screen.getByRole( 'spinbutton' ) ).toBeVisible();
 		} );
 
 		it( 'should render custom className', () => {
-			render( <ControlledNumberControl className="hello" /> );
+			render( <NumberControl className="hello" /> );
 			expect( screen.getByRole( 'spinbutton' ) ).toBeVisible();
 		} );
 	} );
@@ -52,10 +51,7 @@ describe( 'NumberControl', () => {
 			const spy = jest.fn();
 
 			render(
-				<ControlledNumberControl
-					value={ 5 }
-					onChange={ ( v ) => spy( v ) }
-				/>
+				<NumberControl value={ 5 } onChange={ ( v ) => spy( v ) } />
 			);
 
 			const input = screen.getByRole( 'spinbutton' );
@@ -70,7 +66,7 @@ describe( 'NumberControl', () => {
 			const onChangeSpy = jest.fn();
 
 			render(
-				<ControlledNumberControl
+				<NumberControl
 					value={ 5 }
 					min={ 4 }
 					max={ 10 }
@@ -113,7 +109,7 @@ describe( 'NumberControl', () => {
 			const onChangeSpy = jest.fn();
 
 			render(
-				<ControlledNumberControl
+				<NumberControl
 					value={ 5 }
 					min={ 1 }
 					max={ 10 }
@@ -155,9 +151,7 @@ describe( 'NumberControl', () => {
 		it( 'should clamp value within range on ENTER keypress', async () => {
 			const user = userEvent.setup();
 
-			render(
-				<ControlledNumberControl value={ 5 } min={ 0 } max={ 10 } />
-			);
+			render( <NumberControl value={ 5 } min={ 0 } max={ 10 } /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 
@@ -175,9 +169,7 @@ describe( 'NumberControl', () => {
 		it( 'should clamp value within range on blur', async () => {
 			const user = userEvent.setup();
 
-			render(
-				<ControlledNumberControl value={ 5 } min={ 0 } max={ 10 } />
-			);
+			render( <NumberControl value={ 5 } min={ 0 } max={ 10 } /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 			await user.clear( input );
@@ -196,7 +188,7 @@ describe( 'NumberControl', () => {
 		it( 'should parse non-numeric values to a number on ENTER keypress when required', async () => {
 			const user = userEvent.setup();
 
-			render( <ControlledNumberControl value={ 5 } required /> );
+			render( <NumberControl value={ 5 } required /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 			await user.clear( input );
@@ -209,9 +201,7 @@ describe( 'NumberControl', () => {
 		it( 'should parse non-numeric values to empty string on ENTER keypress when not required', async () => {
 			const user = userEvent.setup();
 
-			render(
-				<ControlledNumberControl value={ 5 } required={ false } />
-			);
+			render( <NumberControl value={ 5 } required={ false } /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 			await user.clear( input );
@@ -230,7 +220,7 @@ describe( 'NumberControl', () => {
 		it( 'should not enforce numerical value for empty string when required is omitted', async () => {
 			const user = userEvent.setup();
 
-			render( <ControlledNumberControl value={ 5 } /> );
+			render( <NumberControl value={ 5 } /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 			await user.clear( input );
@@ -245,7 +235,7 @@ describe( 'NumberControl', () => {
 		it( 'should enforce numerical value for empty string when required', async () => {
 			const user = userEvent.setup();
 
-			render( <ControlledNumberControl value={ 5 } required /> );
+			render( <NumberControl value={ 5 } required /> );
 
 			const input = screen.getByRole( 'spinbutton' );
 			await user.clear( input );
@@ -570,9 +560,7 @@ describe( 'NumberControl', () => {
 		] as NumberControlProps[ 'spinControls' ][] )(
 			'should not appear when spinControls = %s',
 			( spinControls ) => {
-				render(
-					<ControlledNumberControl spinControls={ spinControls } />
-				);
+				render( <NumberControl spinControls={ spinControls } /> );
 				expect(
 					screen.queryByLabelText( 'Increment' )
 				).not.toBeInTheDocument();
@@ -599,7 +587,7 @@ describe( 'NumberControl', () => {
 				const user = userEvent.setup();
 				const onChange = jest.fn();
 				render(
-					<ControlledNumberControl
+					<NumberControl
 						{ ...props }
 						spinControls="custom"
 						onChange={ onChange }