Merge pull request #28 from csvenke/test/increase-test-coverage

* test: increase test coverage

Author: csvenke

jest.config.js

@@ -14,6 +14,5 @@ module.exports = {
       statements: 90,
     },
   },
-  collectCoverageFrom: ['src/@(components|utils)/**/*.@(ts|tsx)'],
-  coveragePathIgnorePatterns: ['index.ts'],
+  collectCoverageFrom: ['src/@(components|utils)/**/*.@(ts|tsx)']
 };

package.json

@@ -99,7 +99,7 @@
     }
   },
   "lint-staged": {
-    "src/**/*.{ts,tsx}": [
+    "*.{ts,tsx}": [
       "prettier -c .prettierrc --write",
       "tslint -c tslint.json --fix",
       "git add"

src/components/List/List.tsx

@@ -1,7 +1,7 @@
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 
-export type ListItemCallbackFn = (
+type ListItemCallbackFn = (
   value?: any,
   index?: number,
   array?: any[],
@@ -24,7 +24,7 @@ export interface IListProps {
 const List: React.SFC<IListProps> = ({ items, render, children }) => {
   const func = children ? children : render;
 
-  if (!func) {
+  if (typeof func !== 'function') {
     return null;
   }
 

src/components/Show/Show.tsx

@@ -1,7 +1,7 @@
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 
-import { isEmptyChildren } from '../../utils';
+import { getChildrenOrRender } from '../../utils';
 
 export interface IShowProps {
   /** Conditional statement.  */
@@ -18,17 +18,7 @@ export interface IShowProps {
  * Semantic helper component that return content if `when` equals true.
  */
 const Show: React.SFC<IShowProps> = ({ when, render, children }) => {
-  if (when) {
-    if (children && !isEmptyChildren(children)) {
-      return React.Children.only(children);
-    }
-
-    if (render) {
-      return <React.Fragment>{render()}</React.Fragment>;
-    }
-  }
-
-  return null;
+  return when ? getChildrenOrRender(children, render) : null;
 };
 
 Show.propTypes = {

src/components/Switch/Switch.tsx

@@ -54,10 +54,7 @@ class Switch extends React.Component<ISwitchProps> {
   }
 
   private getElementValue = (element: any) => {
-    if (element && element.props) {
-      return element.props.value;
-    }
-    return undefined;
+    return element.props.value;
   };
 
   private isValidChild = (child: any) => {

src/components/Switch/SwitchCase.tsx

@@ -1,7 +1,7 @@
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 
-import { isEmptyChildren } from '../../utils';
+import { getChildrenOrRender } from '../../utils/';
 
 export interface ISwitchCaseProps {
   /** Conditional statement. */
@@ -17,18 +17,9 @@ export interface ISwitchCaseProps {
 /**
  * Semantic helper component that can be accessed from the `Switch` component.
  */
+// @ts-ignore `value` prop is used by parent component Switch.
 const SwitchCase: React.SFC<ISwitchCaseProps> = ({ value, render, children }) => {
-  if (value !== undefined) {
-    if (children && !isEmptyChildren(children)) {
-      return React.Children.only(children);
-    }
-
-    if (render) {
-      return <React.Fragment>{render()}</React.Fragment>;
-    }
-  }
-
-  return null;
+  return getChildrenOrRender(children, render);
 };
 
 SwitchCase.propTypes = {

src/components/index.test.ts

@@ -0,0 +1,17 @@
+import { List, Resolve, Show, Switch } from './index';
+
+test('List', () => {
+  expect(List).toBeDefined();
+});
+
+test('Resolve', () => {
+  expect(Resolve).toBeDefined();
+});
+
+test('Show', () => {
+  expect(Show).toBeDefined();
+});
+
+test('Switch', () => {
+  expect(Switch).toBeDefined();
+});

src/utils/getRenderOrChildren/getRenderOrChildren.test.tsx

@@ -0,0 +1,36 @@
+import { shallow } from 'enzyme';
+import * as React from 'react';
+
+import getRenderOrChildren from './getRenderOrChildren';
+
+describe('with children node and render function', () => {
+  const children = <div>result</div>;
+  const render = () => <div>result</div>;
+  const result = '<div>result</div>';
+
+  test('should return content from children', () => {
+    const wrapper = shallow(getRenderOrChildren(children, render));
+    expect(wrapper.html()).toEqual(result);
+  });
+
+  test('should return content from render', () => {
+    const wrapper = shallow(getRenderOrChildren(undefined, render));
+    expect(wrapper.html()).toEqual(result);
+  });
+});
+
+describe('with children function and render function', () => {
+  const children = () => <div>result</div>;
+  const render = () => <div>result</div>;
+  const result = '<div>result</div>';
+
+  test('should return content from children', () => {
+    const wrapper = shallow(getRenderOrChildren(children, render));
+    expect(wrapper.html()).toEqual(result);
+  });
+
+  test('should return content from render', () => {
+    const wrapper = shallow(getRenderOrChildren(undefined, render));
+    expect(wrapper.html()).toEqual(result);
+  });
+});

src/utils/getRenderOrChildren/getRenderOrChildren.tsx

@@ -0,0 +1,21 @@
+import * as React from 'react';
+
+import isEmptyChildren from '../isEmptyChildren/isEmptyChildren';
+
+const getChildrenOrRender = (children?: any, render?: () => React.ReactNode) => {
+  if (typeof children === 'function') {
+    return children();
+  }
+
+  if (children && !isEmptyChildren(children)) {
+    return React.Children.only(children);
+  }
+
+  if (render) {
+    return render();
+  }
+
+  return null;
+};
+
+export default getChildrenOrRender;

src/utils/index.ts

@@ -1 +1,4 @@
 export { default as isEmptyChildren } from './isEmptyChildren/isEmptyChildren';
+export {
+  default as getChildrenOrRender,
+} from './getRenderOrChildren/getRenderOrChildren';