test(rebase): adjust tests from rebase and glue them together

2017-11-06 12:35:14 +01:00
parent 1e271656de
commit f2f2a79670
3 changed files with 18 additions and 20 deletions
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    "lint": "eslint ./app.js routes",
    "format": "eslint --fix . bin --ignore public node_modules",
    "pretest": "npm run lint",
-    "test": "npm run test:e2e",
+    "test": "npm run test:unit && npm run test:integration && npm run test:e2e",
    "test:e2e": "node test/e2e/run-e2e-test.js",
    "test:integration": "jest test/integration",
    "test:integration:watch": "jest test/integration --watch",