Restructure test folders / move npm commands to shell scripts (#841)

.circleci/config.yml

@@ -49,7 +49,7 @@ jobs:
       - run:
           name: Zeppelin E2E
           command: |
-            ./scripts/run-zeppelin.sh
+            ./scripts/zeppelin.sh
   e2e-nomiclabs:
     machine: true
     steps:
@@ -58,7 +58,7 @@ jobs:
       - run:
           name: Hardhat E2E
           command: |
-            ./scripts/run-nomiclabs.sh
+            ./scripts/nomiclabs.sh
 workflows:
   version: 2
   build:

package.json

@@ -10,11 +10,9 @@
     "test": "test"
   },
   "scripts": {
-    "nyc": "SILENT=true  nyc --exclude '**/sc_temp/**' --exclude '**/test/**'",
-    "test": "SILENT=true node --max-old-space-size=4096 ./node_modules/.bin/nyc --exclude '**/sc_temp/**' --exclude '**/test/**/' -- mocha test/units/* --timeout 100000 --no-warnings --exit",
-    "test:ci": "SILENT=true node --max-old-space-size=4096 ./node_modules/.bin/nyc --reporter=lcov --exclude '**/sc_temp/**' --exclude '**/test/**/' --exclude 'plugins/resources/matrix.js' -- mocha test/units/* --timeout 100000 --no-warnings --exit",
-    "test:debug": "node --max-old-space-size=4096 ./node_modules/.bin/mocha test/units/* --timeout 100000 --no-warnings --exit",
-    "netlify": "./scripts/run-netlify.sh"
+    "test:unit": "./scripts/unit.sh",
+    "test:integration": "./scripts/integration.sh",
+    "test:ci": "./scripts/ci.sh"
   },
   "homepage": "https://github.com/sc-forks/solidity-coverage",
   "repository": {

scripts/ci.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+SILENT=true node --max-old-space-size=4096 \
+  ./node_modules/.bin/nyc \
+    --reporter=lcov \
+    --exclude '**/sc_temp/**' \
+    --exclude '**/test/**/' \
+    --exclude 'plugins/resources/matrix.js' \
+  -- \
+  mocha \
+    test/units/* test/integration/* \
+    --timeout 100000 \
+    --no-warnings \
+    --exit \

scripts/integration.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+node --max-old-space-size=4096 \
+  ./node_modules/.bin/nyc \
+    --exclude '**/sc_temp/**' \
+    --exclude '**/test/**/' \
+  -- \
+  mocha test/integration/* \
+    --timeout 100000 \
+    --no-warnings \
+    --exit

scripts/unit.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+node --max-old-space-size=4096 \
+  ./node_modules/.bin/nyc \
+    --exclude '**/sc_temp/**' \
+    --exclude '**/test/**/' \
+  -- \
+  mocha test/units/* \
+    --timeout 100000 \
+    --no-warnings \
+    --exit

test/units/hardhat/errors.js → test/integration/errors.js

@@ -5,8 +5,8 @@ const pify = require('pify')
 const shell = require('shelljs');
 const ganache = require('ganache-cli')
 
-const verify = require('../../util/verifiers')
-const mock = require('../../util/integration');
+const verify = require('./../util/verifiers')
+const mock = require('./../util/integration');
 
 // =======
 // Errors

test/units/hardhat/flags.js → test/integration/flags.js

@@ -3,8 +3,8 @@ const fs = require('fs');
 const path = require('path')
 const shell = require('shelljs');
 
-const verify = require('../../util/verifiers')
-const mock = require('../../util/integration');
+const verify = require('./../util/verifiers')
+const mock = require('./../util/integration');
 
 // =======================
 // CLI Options / Flags

test/units/hardhat/standard.js → test/integration/standard.js

@@ -3,8 +3,8 @@ const fs = require('fs');
 const path = require('path')
 const shell = require('shelljs');
 
-const verify = require('../../util/verifiers')
-const mock = require('../../util/integration');
+const verify = require('./../util/verifiers')
+const mock = require('./../util/integration');
 
 // =======================
 // Standard Use-case Tests

test/util/integration.js

@@ -17,8 +17,8 @@ const hardhatConfigName = 'hardhat.config.js';
 const configPath =        `${temp}/.solcover.js`;
 const testPath =          './test/sources/js/';
 const sourcesPath =       './test/sources/solidity/contracts/app/';
-const templatePath =      './test/integration/generic/*';
-const projectPath =       './test/integration/projects/'
+const templatePath =      './test/sources/generic/*';
+const projectPath =       './test/sources/projects/'
 
 let previousCWD;