Merge branch '747-ci-fixes'

.gitignore

@@ -12,3 +12,4 @@ sandbox/*
 .deploy.js
 .DS_Store
 npm-debug.log
+coverage/*

.travis.yml

@@ -1,13 +1,20 @@
 language: node_js
 
 node_js:
-  - '0.12'
+  - '4.1'
+
+env:
+  - NODE_ENV="test" DB_USER="postgres" CXX=g++-4.8
 
 addons:
   postgresql: "9.4"
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 
 before_script:
   - psql -c 'create database opendatacensus_test;' -U postgres
 
-env:
-  - NODE_ENV="test" DB_USER="postgres"
+after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

README.md

@@ -1,7 +1,7 @@
 # Open Data Census
 
 [![Travis Build Status](https://travis-ci.org/okfn/opendatacensus.svg?branch=master)](https://travis-ci.org/okfn/opendatacensus)
-[![Coveralls](http://img.shields.io/coveralls/okfn/opendatacensus.svg?branch=master)](https://coveralls.io/r/okfn/opendatacensus?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/okfn/opendatacensus/badge.svg?branch=master)](https://coveralls.io/github/okfn/opendatacensus?branch=master)
 
 Open Data Census is a web application that supports a submission and review workflow to collect information on the state of open data.
 

package.json

@@ -57,13 +57,15 @@
     "chai-as-promised": "^5.1.0",
     "chalk": "^1.1.0",
     "colors": "^1.1.0",
+    "coveralls": "^2.11.9",
     "eslint": "^3.0.1",
     "eslint-config-google": "^0.6.0",
     "execSync": "^1.0.2",
     "gulp": "^3.8.9",
     "gulp-concat-po": "^0.1.0",
     "gulp-replace": "^0.4.0",
     "gulp-xgettext": "^0.2.1",
+    "istanbul": "^0.4.4",
     "jscs": "^2.3.1",
     "jsxgettext": "^0.5.1",
     "mocha": "^2.2.5",
@@ -83,7 +85,7 @@
     "migrate_users": "node scripts/users.js",
     "start": "node server.js",
     "debug": "node-debug server.js",
-    "test": "NODE_ENV=test mocha tests/ --patient --harmony",
+    "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover -x '**/census/migrations/**' -x '**/scripts/**' ./node_modules/mocha/bin/_mocha -- -R spec tests/ --harmony",
     "jscs": "jscs census/*.js census/**/*.js fixtures scripts tests"
   }
 }