Merge c45075f into 171d89e

.travis.yml

@@ -18,10 +18,13 @@ script: "(npm test || npm test) && sudo sh -c 'export PATH=\"'\"$(dirname $(whic
 before_script:
   - "./test/hosts.sh"
 before_install:
- - sudo apt-get update -qq
- - sudo apt-get install -qq graphicsmagick
- - npm install -g npm@5
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq graphicsmagick
+  - npm install -g npm@5
+after_script:
+  # We need sudo because the coverage data from as-root tests is root:root but not world-readable
+  - "sudo sh -c 'export PATH=\"'\"$(dirname $(which node)):$PATH\"'\" && npm run test:report-coverage'"
 notifications:
- email: false
- webhooks:
-   - https://pumabot.strugee.net/hubot/travis-ci-events
+  email: false
+  webhooks:
+    - https://pumabot.strugee.net/hubot/travis-ci-events

package.json

@@ -6,11 +6,14 @@
   "author": "Evan Prodromou <evan@e14n.com>",
   "description": "Social server with an ActivityStreams API",
   "devDependencies": {
+    "coveralls": "^2.13.1",
     "dependency-check": "^2.8.0",
     "jscs": "^3.0.3",
     "jshint": "^2.9.2",
     "jsonlint": "^1.6.2",
+    "lcov-result-merger": "^1.2.0",
     "node-mocks-http": "^1.6.1",
+    "nyc": "^11.2.1",
     "proxyquire": "^1.8.0",
     "pug-lint": "^2.3.0",
     "rimraf": "^2.6.1",
@@ -75,14 +78,15 @@
     "build": "jade --client --extension jade.js --no-debug public/template",
     "fullbuild": "npm run build && echo 'use `npm run build` instead next time' 1>&2",
     "test": "npm run lint && npm run test:vows",
-    "test:vows": "vows -v test/*-test.js",
-    "test:root": "vows -v test/*-test-as-root.js",
+    "test:vows": "nyc -r lcov vows -v test/*-test.js",
+    "test:root": "nyc -r lcov --report-dir coverage-root vows -v test/*-test-as-root.js",
     "test:install": "npm install -g .",
     "test:system": "vows -v test/*-test-system.js",
     "test:systemd": "docker run -v $(pwd):/tmp/pump.io:ro -v $NVM_DIR:/.nvm:ro ubuntu sh -c \"export NVM_DIR=$NVM_DIR; . $NVM_DIR/nvm.sh; nvm use $TRAVIS_NODE_VERSION; cd /tmp/pump.io; npm run test:systemd:run\"",
     "test:systemd:run": "mkdir -p /tmp/pump.io/uploads; sed 's/%i.service//g' pump.io@.service | sudo tee /etc/systemd/system/pump.io.service; sudo systemctl daemon-reload; sudo systemctl start pump.io.service; npm run test:system",
+    "test:report-coverage": "lcov-result-merger 'coverage*/lcov.info' | coveralls",
     "lint": "npm run lint:jshint && npm run lint:jscs && npm run lint:jade && npm run lint:json && npm run lint:deps",
-    "lint:deps": "dependency-check package.json test/*.js > /dev/null && dependency-check --unused package.json -i dependency-check -i jscs -i jshint -i jsonlint -i pug-lint test/*.js > /dev/null",
+    "lint:deps": "dependency-check package.json test/*.js > /dev/null && dependency-check --unused package.json -i dependency-check -i jscs -i jshint -i jsonlint -i pug-lint -i nyc -i lcov-result-merger -i coveralls test/*.js > /dev/null",
     "lint:jshint": "jshint --exclude 'public/javascript/libs' bin/* lib routes public/javascript test",
     "lint:jscs": "jscs bin/* lib public/javascript/pump* routes test",
     "lint:jade": "pug-lint public/template/*.jade",