Merge pull request #7 from MarcL/day6

Day 6 : Simplify and automate your tests

Author: MarcL

doc/notes.md

@@ -42,13 +42,13 @@
 
 ## Day 6 - Simplify & automate your tests
 
-1. Put test call in package.json script
-2. Refactor tests using mocha.opts
-3. Add mocha watch command
-4. Skipping tests
-5. Isolating tests
-6. Increase timeouts
-7. Install husky
+1. Customising your package.json scripts
+2. Add mocha watch command
+3. Refactor tests using mocha.opts
+4. Recursive testing
+5. Skipping tests
+6. Isolating tests
+7. Install git hooks
 8. Run tests when commit or push
 
 ## Day 7 - JavaScript testing recap

package.json

@@ -4,7 +4,10 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "precommit": "npm test",
+    "prepush": "npm test",
+    "test": "mocha",
+    "test:watch": "mocha --watch"
   },
   "repository": {
     "type": "git",
@@ -21,6 +24,7 @@
     "babel-preset-env": "~1.6.0",
     "babel-register": "~6.24.1",
     "chai": "~4.1.1",
+    "husky": "~0.14.3",
     "mocha": "~3.5.0",
     "sinon": "~3.2.1"
   },

test/mocha.opts

@@ -0,0 +1,3 @@
+--require babel-register
+--recursive
+--require test/support

test/support.js

@@ -0,0 +1,5 @@
+import {expect} from 'chai';
+import sinon from 'sinon';
+
+global.expect = expect;
+global.sinon = sinon;

test/day2.test.js renamed to test/unit-tests/day2.test.js

@@ -1,5 +1,4 @@
-import {expect} from 'chai';
-import day2 from '../src/day2';
+import day2 from '../../src/day2';
 
 describe('day2 tests', () => {
     describe('check data type', () => {

test/day3.test.js renamed to test/unit-tests/day3.test.js

@@ -1,5 +1,4 @@
-import {expect} from 'chai';
-import day3 from '../src/day3';
+import day3 from '../../src/day3';
 
 describe('day 3 tests', () => {
     it('should return expected value from callback', (done) => {

test/day4.test.js renamed to test/unit-tests/day4.test.js

@@ -1,6 +1,4 @@
-import sinon from 'sinon';
-import {expect} from 'chai';
-import {timeout, dateDescriber} from '../src/day4';
+import {timeout, dateDescriber} from '../../src/day4';
 
 describe('day 4 tests', () => {
     describe('timeout tests', () => {

test/day5.test.js renamed to test/unit-tests/day5.test.js

@@ -1,7 +1,5 @@
-import {expect} from 'chai';
-import sinon from 'sinon';
 import request from 'request';
-import day5 from '../src/day5';
+import day5 from '../../src/day5';
 
 describe('day5 tests', () => {