Add missing tests for fieldWrapper

Author: rvsia

packages/react-form-renderer/src/form-renderer/field-provider.js

@@ -87,9 +87,9 @@ FieldProvider.propTypes = {
     getFieldState: PropTypes.func,
     clearedValue: PropTypes.any,
   }),
-  component: PropTypes.oneOfType(PropTypes.node, PropTypes.element, PropTypes.func),
+  component: PropTypes.oneOfType([ PropTypes.node, PropTypes.element, PropTypes.func ]),
   render: PropTypes.func,
-  children: PropTypes.oneOfType(PropTypes.node, PropTypes.element, PropTypes.func),
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.element, PropTypes.func ]),
   dataType: PropTypes.oneOf(Object.values(dataTypes)),
   name: PropTypes.string,
   clearOnUnmount: PropTypes.bool,

packages/react-form-renderer/src/form-renderer/field-wrapper.js

@@ -24,7 +24,7 @@ const FieldWrapper = ({ componentType, validate, component, ...rest }) => {
       }
 
       const arrayValidator = composeValidators(validate);
-      let result = arrayValidator(value ? value.length > 0 ? value : undefined : undefined);
+      let result = arrayValidator(value && value.length > 0 ? value : undefined);
       if (typeof result === 'function') {
         result = result(value);
       }

packages/react-form-renderer/src/tests/form-renderer/field-wrapper.test.js

@@ -0,0 +1,67 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import { componentTypes } from '@data-driven-forms/react-form-renderer';
+import { Form } from 'react-final-form';
+
+import FieldWrapper from '../../form-renderer/field-wrapper';
+import FieldProvider from '../../form-renderer/field-provider';
+
+describe('fieldWrapper', () => {
+  const Component = (props) => <div>{ JSON.stringify(props, null, 2) }</div>;
+
+  it('use arrayValidator if it is fieldArray', () => {
+    const wrapper = mount(<Form
+      onSubmit={ jest.fn() }
+      render={ () => <FieldWrapper
+        componentType={ componentTypes.FIELD_ARRAY }
+        validate={ [
+          (value) => value === 4,
+        ] }
+        component={ Component }
+      /> }
+    />);
+
+    expect(wrapper.find(Component).props().arrayValidator).toEqual(expect.any(Function));
+    expect(wrapper.find(FieldProvider).props().validate).toEqual(undefined);
+  });
+
+  it('do not use arrayValidator', () => {
+    const wrapper = mount(<Form
+      onSubmit={ jest.fn() }
+      render={ () => <FieldWrapper
+        componentType={ componentTypes.TEXT_FIELD }
+        validate={ [
+          (value) => value === 4,
+        ] }
+        component={ Component }
+      /> }
+    />);
+
+    expect(wrapper.find(Component).props().arrayValidator).toEqual(undefined);
+    expect(wrapper.find(FieldProvider).props().validate).toEqual(expect.any(Function));
+  });
+
+  it('custom component - should not be wrapper in field provider', () => {
+    const wrapper = mount(<Form
+      onSubmit={ jest.fn() }
+      render={ () => <FieldWrapper
+        componentType='custom type'
+        component={ Component }
+      /> }
+    />);
+
+    expect(wrapper.find(FieldProvider)).toHaveLength(0);
+  });
+
+  it('data driven forms component - should be wrapper in field provider', () => {
+    const wrapper = mount(<Form
+      onSubmit={ jest.fn() }
+      render={ () => <FieldWrapper
+        componentType={ componentTypes.TEXT_FIELD }
+        component={ Component }
+      /> }
+    />);
+
+    expect(wrapper.find(FieldProvider)).toHaveLength(1);
+  });
+});