From 0364501c245fffbb5c47e8c52c4de8905ea7ecf8 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <dg@domgan.com>
Date: Mon, 3 Apr 2017 15:49:25 +0100
Subject: [PATCH] re-enabled code coverage

---
 scripts/circleci/{test_build.sh => build.sh} |  0
 scripts/circleci/test_coverage.sh            |  2 +-
 scripts/circleci/test_entry_point.sh         | 12 ++++++++----
 scripts/tasks/jest.js                        | 15 ++++++++-------
 4 files changed, 17 insertions(+), 12 deletions(-)
 rename scripts/circleci/{test_build.sh => build.sh} (100%)

diff --git a/scripts/circleci/test_build.sh b/scripts/circleci/build.sh
similarity index 100%
rename from scripts/circleci/test_build.sh
rename to scripts/circleci/build.sh
diff --git a/scripts/circleci/test_coverage.sh b/scripts/circleci/test_coverage.sh
index cabe84921c..467471fff6 100755
--- a/scripts/circleci/test_coverage.sh
+++ b/scripts/circleci/test_coverage.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-node ./scripts/tasks/jest -- --coverage
+node ./scripts/tasks/jest --coverage
 if [ -z $CI_PULL_REQUEST ]; then
   cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
 fi
diff --git a/scripts/circleci/test_entry_point.sh b/scripts/circleci/test_entry_point.sh
index a9df96e5c5..2a4cbdf665 100755
--- a/scripts/circleci/test_entry_point.sh
+++ b/scripts/circleci/test_entry_point.sh
@@ -12,21 +12,25 @@ COMMANDS_TO_RUN=()
 # - 1:15 grunt build
 # with everything else < 0:30.
 
-# if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-#   COMMANDS_TO_RUN+=('./scripts/circleci/test_coverage.sh')
-# fi
+if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
+  COMMANDS_TO_RUN+=('./scripts/circleci/test_coverage.sh')
+fi
 
 if [ $((2 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
   COMMANDS_TO_RUN+=('./scripts/circleci/test_fiber.sh')
 fi
 
+if [ $((3 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
+  COMMANDS_TO_RUN+=('./scripts/circleci/test_html_generation.sh')
+fi
+
 # These seem out of order but extract-errors must be run after jest.
 if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
   COMMANDS_TO_RUN+=('node ./scripts/tasks/eslint')
   COMMANDS_TO_RUN+=('node ./scripts/prettier/index')
   COMMANDS_TO_RUN+=('node ./scripts/tasks/flow')
   COMMANDS_TO_RUN+=('node ./scripts/tasks/jest')
-  COMMANDS_TO_RUN+=('./scripts/circleci/test_build.sh')
+  COMMANDS_TO_RUN+=('./scripts/circleci/build.sh')
   COMMANDS_TO_RUN+=('./scripts/circleci/track_stats.sh')
 fi
 
diff --git a/scripts/tasks/jest.js b/scripts/tasks/jest.js
index e30cf21247..f20ba994e8 100644
--- a/scripts/tasks/jest.js
+++ b/scripts/tasks/jest.js
@@ -2,16 +2,17 @@
 
 const path = require('path');
 const spawn = require('child_process').spawn;
+const argv = require('minimist')(process.argv.slice(2));
   
-console.log('running jest');		
+console.log('Running Jest');		
 
 const args = [		
   path.join('node_modules', 'jest-cli', 'bin', 'jest'),		
   '--runInBand',		
-];		
-// if (coverage) {		
-//   args.push('--coverage');		
-// }
+];
+if (argv.coverage) {
+  args.push('--coverage');
+}
 
 const jest = spawn('node', args, {
   stdio: 'inherit',
@@ -22,9 +23,9 @@ const jest = spawn('node', args, {
 
 jest.on('close', (code) => {
   if (code === 1) {
-    console.error('jest failed');
+    console.error('Jest failed!');
   } else {
-    console.log('jest passed');
+    console.log('Jest passed!');
   }
   process.exit(0);
 });