100% test coverage and corresponding fixes

airbnb · Jun 15, 2018 · 61d968f · 61d968f
1 parent 23f201c
commit 61d968f
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 83 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+dist/**
+coverage/**
diff --git a/jest.config.js b/jest.config.js
@@ -5,4 +5,6 @@ module.exports = {
   setupTestFrameworkScriptFile: './test/_helpers.jsx',
   testEnvironment: 'node',
   testRegex: '.*(\\.|/|_)(test)\\.jsx?$',
+  collectCoverage: true,
+  collectCoverageFrom: ['src/**/*.{js,jsx}'],
 };
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "clean": "rimraf dist",
     "prebuild": "npm run clean",
     "build": "babel src --out-dir dist",
-    "lint": "eslint --ignore-pattern 'dist/' .",
+    "lint": "eslint .",
     "test": "jest",
     "prepublish": "safe-publish-latest && npm run build"
   },
@@ -41,7 +41,7 @@
     "eslint-plugin-import": "^2.11.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.8.2",
-    "jest": "^22.4.3",
+    "jest": "^23.1.0",
     "prop-types": "^15.6.1",
     "react": "^0.14 || ^15 || ^16",
     "react-dom": "^0.14 || ^15 || ^16",

diff --git a/src/index.js b/src/index.js
@@ -19,8 +19,8 @@ export default function createHOC(
   {
     passedProps = [],
     factory,
-    allowExtraProps,
-  } = {},
+    allowExtraProps = false,
+  },
 ) {
   if (!hocName || typeof hocName !== 'string') {
     throw new Error('A valid name for this HOC must be passed.');
@@ -60,14 +60,18 @@ export default function createHOC(
 
         const newPropTypes = {
           ...copiedProps,
-          ...NewComponent.propTypes,
+          ...(NewComponent.propTypes && sloppy(NewComponent.propTypes)),
         };
 
         if (allowExtraProps) {
           NewComponent.propTypes = newPropTypes;
         } else {
           NewComponent.propTypes = exact(newPropTypes);
         }
+      } else if (!allowExtraProps) {
+        // Get "sloppy" propTypes before getting "exact" prop types in case
+        // the original prop types were already "exact"
+        NewComponent.propTypes = exact(sloppy(NewComponent.propTypes));
       }
 
       return hoistNonReactStatics(NewComponent, ComponentToWrap);

diff --git a/test/fixtures/BasicSFC.jsx → test/fixtures.jsx b/test/fixtures/BasicSFC.jsx → test/fixtures.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function BasicSFC({ a, b, c }) {
+export function BasicSFC({ a, b, c }) {
   return (
     <div>
       <div id="a">{a}</div>
@@ -16,3 +16,10 @@ BasicSFC.propTypes = {
   b: PropTypes.string.isRequired,
   c: PropTypes.string.isRequired,
 };
+
+
+export function ProplessSFC() {
+  return (
+    <div>Wow!</div>
+  );
+}