Fix circle/ci

Author: cgewecke

.circleci/config.yml

@@ -14,14 +14,18 @@ step_install_nvm: &step_install_nvm
       echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
 jobs:
   unit-test:
-    docker:
-      - image: circleci/node:8.15.0
+    machine: true
     steps:
       - checkout
+      - <<: *step_install_nvm
       - run:
           name: Delete any old node_modules
           command: |
             rm -rf node_modules/
+      - run:
+          name: Install yarn
+          command: |
+            npm install -g yarn
       - run:
           name: Install dependencies
           command: |
@@ -30,12 +34,10 @@ jobs:
           name: Run tests
           command: |
             npm run test-cov
-
-      # TODO: Re-enable
-      #- run:
-      #    name: Upload coverage
-      #    command: |
-      #      bash <(curl -s https://codecov.io/bash)
+      - run:
+          name: Upload coverage
+          command: |
+            bash <(curl -s https://codecov.io/bash)
 
   # This works but takes a while....
   e2e-colony:

.gitignore

@@ -5,4 +5,6 @@ node_modules/
 .DS_Store
 test/artifacts
 test/cache
-yarn.lock
+yarn.lock
+temp
+.nyc_output/

dist/truffle.plugin.js

@@ -33,7 +33,7 @@ const Web3 = require('web3');
 const util = require('util');
 const ganache = require('ganache-core-sc');
 
-module.exports = async function(truffleConfig){
+async function plugin(truffleConfig){
   let app;
   let error;
   let testsErrored = false;
@@ -152,4 +152,4 @@ const paths = {
   }
 }
 
-
+module.exports = plugin;

package.json

@@ -8,8 +8,11 @@
     "test": "test"
   },
   "scripts": {
-    "test": "mocha test/units --timeout 70000 --no-warnings --exit",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- test/units --timeout 70000 --exit"
+    "nyc": "SILENT=true  nyc --exclude '**/sc_temp/**' --exclude '**/test/**'",
+    "nyc:ci": "SILENT=true nyc --reporter=lcov --exclude '**/sc_temp/**' --exclude '**/test/**'",
+    "test": "npm run nyc -- mocha test/units --timeout 70000 --no-warnings --exit",
+    "test:debug": "mocha test/units --timeout 70000 --no-warnings --exit",
+    "test-cov": "npm run nyc:ci -- mocha test/units --timeout 70000 --no-warnings --exit"
   },
   "homepage": "https://github.com/sc-forks/solidity-coverage",
   "repository": {
@@ -36,6 +39,7 @@
     "@nomiclabs/buidler-web3": "^1.0.0-beta.8",
     "decache": "^4.5.1",
     "mocha": "5.2.0",
+    "nyc": "^14.1.1",
     "solc": "^0.5.10",
     "truffle": "^5.0.31",
     "truffle-config": "^1.1.18"