From 76254f0601f83cea53f9caf92a71c4033f9f8343 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Wed, 10 Jan 2018 17:23:44 +0000 Subject: [PATCH 1/2] Add recursion support to reporters --- lib/reporters/eclipse.js | 1 + lib/reporters/html.js | 1 + lib/reporters/junit.js | 3 ++- lib/reporters/lcov.js | 5 +++-- lib/reporters/machineout.js | 5 +++-- lib/reporters/minimal.js | 1 + lib/reporters/nested.js | 3 ++- lib/reporters/skip_passed.js | 1 + lib/reporters/verbose.js | 3 ++- 9 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/reporters/eclipse.js b/lib/reporters/eclipse.js index c56a4b812..31a866259 100644 --- a/lib/reporters/eclipse.js +++ b/lib/reporters/eclipse.js @@ -54,6 +54,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: undefined, + recursive: options.recursive, moduleStart: function (name) { console.log('\n' + name); }, diff --git a/lib/reporters/html.js b/lib/reporters/html.js index d1f229474..7c5fdb114 100644 --- a/lib/reporters/html.js +++ b/lib/reporters/html.js @@ -56,6 +56,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { console.log('

' + name + '

'); console.log('
    '); diff --git a/lib/reporters/junit.js b/lib/reporters/junit.js index 079653342..7bcf99ba5 100644 --- a/lib/reporters/junit.js +++ b/lib/reporters/junit.js @@ -103,6 +103,7 @@ exports.run = function (files, opts, callback) { nodeunit.runFiles(paths, { testspec: opts.testspec, testFullSpec: opts.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { curModule = { errorCount: 0, @@ -179,7 +180,7 @@ exports.run = function (files, opts, callback) { ' assertions (' + assertions.duration + 'ms)' ); } - + if (callback) callback(assertions.failures() ? new Error('We have got test failures.') : undefined); }); }); diff --git a/lib/reporters/lcov.js b/lib/reporters/lcov.js index 86289499a..cfadc12e4 100644 --- a/lib/reporters/lcov.js +++ b/lib/reporters/lcov.js @@ -23,8 +23,9 @@ exports.run = function (files, options, callback) { var paths = files.map(function (p) { return path.resolve(p); }); - + nodeunit.runFiles(paths, { + recursive: options.recursive, done: function (assertions) { var cov = (global || window)._$jscoverage || {}; @@ -32,7 +33,7 @@ exports.run = function (files, options, callback) { var data = cov[filename]; reportFile(filename, data); }); - + if (callback) callback(assertions.failures() ? new Error('We have got test failures.') : undefined); } }); diff --git a/lib/reporters/machineout.js b/lib/reporters/machineout.js index c58ee40a6..6feecf9ea 100644 --- a/lib/reporters/machineout.js +++ b/lib/reporters/machineout.js @@ -74,8 +74,8 @@ exports.run = function (files, options, callback) { var names = tracker.names(); for (var i = 0; i < names.length; i += 1) { console.log(createErrorMessage( - 'Error', names[i], - '', '', '', + 'Error', names[i], + '', '', '', 'Undone tests - To fix this, make sure all tests call test.done()' )); } @@ -86,6 +86,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) {}, testDone: function (name, assertions) { tracker.remove(name); diff --git a/lib/reporters/minimal.js b/lib/reporters/minimal.js index dbd7996b6..dc4fd9a94 100644 --- a/lib/reporters/minimal.js +++ b/lib/reporters/minimal.js @@ -73,6 +73,7 @@ exports.run = function (files, options, callback) { var opts = { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { process.stdout.write(bold(name) + ': '); }, diff --git a/lib/reporters/nested.js b/lib/reporters/nested.js index 9c979b6de..dce8c932c 100644 --- a/lib/reporters/nested.js +++ b/lib/reporters/nested.js @@ -168,6 +168,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { console.log('\n' + bold(name)); }, @@ -207,7 +208,7 @@ exports.run = function (files, options, callback) { ' assertions (' + assertions.duration + 'ms)' ); } - + if (callback) callback(assertions.failures() ? new Error('We have got test failures.') : undefined); }, testStart: function (name) { diff --git a/lib/reporters/skip_passed.js b/lib/reporters/skip_passed.js index c238a0685..ae23fb886 100644 --- a/lib/reporters/skip_passed.js +++ b/lib/reporters/skip_passed.js @@ -60,6 +60,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { console.log('\n' + bold(name)); }, diff --git a/lib/reporters/verbose.js b/lib/reporters/verbose.js index 1f5595da4..28848cb7c 100644 --- a/lib/reporters/verbose.js +++ b/lib/reporters/verbose.js @@ -77,6 +77,7 @@ exports.run = function (files, options, callback) { nodeunit.runFiles(paths, { testspec: options.testspec, testFullSpec: options.testFullSpec, + recursive: options.recursive, moduleStart: function (name) { console.log('\n' + bold(name)); }, @@ -117,7 +118,7 @@ exports.run = function (files, options, callback) { ' assertions (' + assertions.duration + 'ms)' ); } - + if (callback) callback(assertions.failures() ? new Error('We have got test failures.') : undefined); }, testStart: function(name) { From 94136bc922832afa7c6c627ac620aada75fca7e0 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 6 Jul 2018 14:08:48 +0000 Subject: [PATCH 2/2] fix: package.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/npm:hoek:20180212 - https://snyk.io/vuln/npm:tunnel-agent:20170305 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c238fcf68..eb68eb947 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ }, "dependencies": { "ejs": "^2.5.2", - "tap": "^10.0.2" + "tap": "^11.1.3" }, "scripts": { "test": "node ./bin/nodeunit"