fix(tests): switch coverage tool, add coveralls (#145) r=vbudhram

.gitignore

@@ -3,6 +3,7 @@ fxa-auth-db-server/node_modules
 node_modules/
 sandbox/
 coverage.html
+.nyc_output
 *.log
 *.swp
 *~

.travis.yml

@@ -40,7 +40,10 @@ before_script:
   - grunt nsp --force
 
 script:
-  - npm test
+  # 'npm run test-travis' runs all tests together to collect all coverage into one from mysql and db-server
+  - COVERALLS_REPO_TOKEN=mlOESL8slkePkodJpcvhF1AUKUH3llXi8 npm run test-travis
+  # memory tests are separate to avoid being included into coverage because they run through the same code
+  - npm run test-mem
 
 matrix:
   allow_failures:

bin/mem.js

@@ -12,11 +12,6 @@ function shutdown() {
   process.nextTick(process.exit)
 }
 
-// defer to allow ass code coverage results to complete processing
-if (process.env.ASS_CODE_COVERAGE) {
-  process.on('SIGINT', shutdown)
-}
-
 DB.connect(config)
   .done(function (db) {
     var server = dbServer.createServer(db)

bin/server.js

@@ -13,11 +13,6 @@ function shutdown() {
   process.nextTick(process.exit)
 }
 
-// defer to allow ass code coverage results to complete processing
-if (process.env.ASS_CODE_COVERAGE) {
-  process.on('SIGINT', shutdown)
-}
-
 function logCharsetInfo(db, poolName) {
   // Record some information about mysql connection configuration and
   // charset at startup.

fxa-auth-db-server/test/local/bufferize.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var test = require('tap').test
 var sinon = require('sinon')
 

fxa-auth-db-server/test/local/error.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var test = require('tap').test
 
 test(

package.json

@@ -18,7 +18,8 @@
     "test": "npm run test-mysql && npm run test-mem && npm run test-server",
     "test-mem": "./scripts/tap-coverage.js test/mem",
     "test-mysql": "grunt && node ./bin/db_patcher.js >/dev/null && ./scripts/tap-coverage.js test/backend test/local",
-    "test-server": "./scripts/tap-coverage.js fxa-auth-db-server/test/local"
+    "test-server": "./scripts/tap-coverage.js fxa-auth-db-server/test/local",
+    "test-travis": "grunt && node ./bin/db_patcher.js >/dev/null && ./scripts/tap-coverage.js test/backend test/local fxa-auth-db-server/test/local"
   },
   "author": "Mozilla (https://mozilla.org/)",
   "homepage": "https://github.com/mozilla/fxa-auth-db-mysql",
@@ -38,7 +39,6 @@
     "restify": "4.1.1"
   },
   "devDependencies": {
-    "ass": "git://github.com/jrgm/ass.git#5be99ee",
     "eslint-config-fxa": "2.1.0",
     "grunt": "1.0.1",
     "grunt-bump": "0.8.0",

scripts/tap-coverage.js

@@ -1,38 +1,21 @@
 #!/usr/bin/env node
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
-* License, v. 2.0. If a copy of the MPL was not distributed with this
-* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-if (!process.env.NO_COVERAGE) {
-  var ass = require('ass').enable( {
-    // exclude files in /client/ and /test/ from code coverage
-    exclude: [ '/client/', '/test', '/fxa-auth-db-server/node_modules/' ]
-  })
-}
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var path = require('path'),
-  spawn = require('child_process').spawn,
-  fs = require('fs')
+  spawn = require('child_process').spawn
+
+var COVERAGE_ARGS = ['--coverage', '--cov']
+if (process.env.NO_COVERAGE) {
+  COVERAGE_ARGS = []
+}
 
 var p = spawn(path.join(path.dirname(__dirname), 'node_modules', '.bin', 'tap'),
-              process.argv.slice(2), { stdio: 'inherit' })
+  process.argv.slice(2).concat(COVERAGE_ARGS), { stdio: 'inherit', env: process.env })
 
-p.on('close', function(code) {
-  if (!process.env.NO_COVERAGE) {
-    ass.report('json', function(err, r) {
-      console.log('code coverage:', r.percent + '%') //eslint-disable-line no-console
-      process.stdout.write('generating coverage.html: ')
-      var start = new Date()
-      ass.report('html', function(err, html) {
-        fs.writeFileSync(path.join(path.dirname(__dirname), 'coverage.html'),
-                         html)
-        process.stdout.write('complete in ' +
-                             ((new Date() - start) / 1000.0).toFixed(1) + 's\n')
-        process.exit(code)
-      })
-    })
-  } else {
-    process.exit(code)
-  }
+// exit this process with the same exit code as the test process
+p.on('close', function (code) {
+  process.exit(code)
 })

test/backend/db_tests.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var dbServer = require('../../fxa-auth-db-server')
 var dbTests = require('../../fxa-auth-db-server/test/backend').dbTests
 var log = require('../lib/log')

test/backend/remote.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var dbServer = require('../../fxa-auth-db-server')
 var backendTests = require('../../fxa-auth-db-server/test/backend')
 var config = require('../../config')
@@ -10,14 +9,6 @@ var DB = require('../../lib/db/mysql')(log, dbServer.errors)
 var P = require('bluebird')
 
 var server
-
-// defer to allow ass code coverage results to complete processing
-if (process.env.ASS_CODE_COVERAGE) {
-  process.on('SIGINT', function() {
-    process.nextTick(process.exit)
-  })
-}
-
 var db
 
 DB.connect(config)

test/db_server_stub.js

@@ -2,5 +2,4 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-require('ass')
 require('../bin/server')

test/local/event_log.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var dbServer = require('../../fxa-auth-db-server')
 var test = require('tap').test
 var log = require('../lib/log')

test/local/incorrect-patch-level.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var dbServer = require('../../fxa-auth-db-server')
 var log = require('../lib/log')
 var DB = require('../../lib/db/mysql')(log, dbServer.errors)

test/local/log-stats.js

@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-require('ass')
 var dbServer = require('../../fxa-auth-db-server')
 var test = require('tap').test
 var P = require('../../lib/promise')