merging latest/same changes in PR StephenGrider/pull/217

README.md

@@ -5,7 +5,7 @@ This fork contains the following updates as of 3/28/2018:
 - Upgraded to React-Redux 5.
 - Upgraded to Webpack 4.
 - Changed babel preset to 'env': https://www.npmjs.com/package/babel-preset-env
-- Moved from using Mocha/Chai to Jest/Enzyme. Demo test is within src/components/.
+- Moved from using Mocha/Chai to Jest/Enzyme. Demo test is within src/components/. See "Run Tests" section below.
 - Package control using Yarn instead of NPM.
 - Added support for JS object rest spread (...destructuring) and class properties.
 
@@ -38,5 +38,11 @@ This repo uses Jest and Enzyme for testing. Here's a great video intro: https://
 
 ```
 > yarn test
+<<<<<<< HEAD
 > yarn test:watch # tests will run as you make modifications
-```
+```
+=======
+> yarn test:watch # Tests will run as you make modifications
+> yarn test:cover # Produce a code coverage report. Open ./coverage/Icov-report/index.html in browser and profit!
+```
+>>>>>>> ReduxSimpleStarterRefreshed

package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "start": "webpack-dev-server --inline --hot --mode development --open",
     "test": "jest",
-    "test:watch": "npm run test -- --watch"
+    "test:watch": "yarn test -- --watch",
+    "test:cover": "yarn test -- --coverage"
   },
   "author": "",
   "license": "ISC",