Migrated SelectArrayInput

marmelab · Jun 19, 2019 · 5e7fa46 · 5e7fa46
1 parent d954c91
commit 5e7fa46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/ra-ui-materialui/src/input/SelectArrayInput.js b/packages/ra-ui-materialui/src/input/SelectArrayInput.js
@@ -187,14 +187,15 @@ export class SelectArrayInput extends Component {
             source,
             optionText,
             optionValue,
+            helperText,
             ...rest
         } = this.props;
         if (typeof meta === 'undefined') {
             throw new Error(
                 "The SelectInput component wasn't called within a redux-form <Field>. Did you decorate it and forget to add the addField prop to your component? See https://marmelab.com/react-admin/Inputs.html#writing-your-own-input-component for details."
             );
         }
-        const { touched, error, helperText = false } = meta;
+        const { touched, error } = meta;
 
         return (
             <FormControl

diff --git a/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.js b/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.js
@@ -20,7 +20,7 @@ describe('<SelectArrayInput />', () => {
         const { queryByTestId } = render(
             <SelectArrayInput {...defaultProps} input={{}} />
         );
-        expect(queryByTestId('selectArray')).not.toBeNull();
+        expect(queryByTestId('selectArray')).toBeDefined();
     });
 
     it('should use the input parameter value as the initial input value', () => {
@@ -153,12 +153,9 @@ describe('<SelectArrayInput />', () => {
 
     it('should displayed helperText if prop is present in meta', () => {
         const { queryByText } = render(
-            <SelectArrayInput
-                {...defaultProps}
-                meta={{ helperText: 'Can I help you?' }}
-            />
+            <SelectArrayInput {...defaultProps} helperText="Can I help you?" />
         );
-        expect(queryByText('Can I help you?')).not.toBeNull();
+        expect(queryByText('Can I help you?')).toBeDefined();
     });
 
     describe('error message', () => {
@@ -186,10 +183,10 @@ describe('<SelectArrayInput />', () => {
             const { queryByText } = render(
                 <SelectArrayInput
                     {...defaultProps}
+                    helperText="Can I help you?"
                     meta={{
                         touched: true,
                         error: 'Required field.',
-                        helperText: 'Can I help you?',
                     }}
                 />
             );