From bc2c1a1ef8df0a3a557856371f6b06bd916f5711 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 16 Nov 2017 04:01:16 +0000 Subject: [PATCH 1/2] chore(deps): update dependency mocha to v4.0.1 --- packages/admiral-integration-mocha/package.json | 2 +- packages/admiral-unit-mocha/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/admiral-integration-mocha/package.json b/packages/admiral-integration-mocha/package.json index 83b4dd7..d1dfc48 100644 --- a/packages/admiral-integration-mocha/package.json +++ b/packages/admiral-integration-mocha/package.json @@ -26,7 +26,7 @@ "devDependencies": { "admiral-target-local": "^0.2.0", "chai": "4.1.2", - "mocha": "3.5.3", + "mocha": "4.0.1", "nyc": "11.3.0", "standard": "10.0.3" } diff --git a/packages/admiral-unit-mocha/package.json b/packages/admiral-unit-mocha/package.json index d70423e..e91eb57 100644 --- a/packages/admiral-unit-mocha/package.json +++ b/packages/admiral-unit-mocha/package.json @@ -23,7 +23,7 @@ "fs-extra": "^1.0.0", "lodash": "^4.17.2", "mkdirp": "^0.5.1", - "mocha": "^3.2.0", + "mocha": "^4.0.0", "mustache": "^2.3.0", "node-static": "^0.7.9", "node-uuid": "^1.4.7", @@ -34,7 +34,7 @@ "devDependencies": { "admiral-target-local": "0.1.0", "chai": "3.5.0", - "mocha": "3.5.3", + "mocha": "4.0.1", "nyc": "10.3.2", "standard": "8.6.0", "strip-ansi": "3.0.1", From a29bd6e2c60741a52337073b4b44bee369468bfd Mon Sep 17 00:00:00 2001 From: Jarid Margolin Date: Thu, 16 Nov 2017 11:09:08 -0500 Subject: [PATCH 2/2] Add support for mocha 4.x reporting --- packages/admiral-unit-mocha/client/index.html | 1 + packages/admiral-unit-mocha/lib/index.js | 2 ++ packages/admiral-unit-mocha/test/index.js | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/admiral-unit-mocha/client/index.html b/packages/admiral-unit-mocha/client/index.html index 896c4ac..3918e7c 100644 --- a/packages/admiral-unit-mocha/client/index.html +++ b/packages/admiral-unit-mocha/client/index.html @@ -67,6 +67,7 @@ duration: test.duration, title: test.title, fullTitle: test.fullTitle(), + titlePath: test.titlePath(), _slow: test.slow() } } diff --git a/packages/admiral-unit-mocha/lib/index.js b/packages/admiral-unit-mocha/lib/index.js index 449393b..35a4238 100644 --- a/packages/admiral-unit-mocha/lib/index.js +++ b/packages/admiral-unit-mocha/lib/index.js @@ -77,8 +77,10 @@ module.exports = class UnitMochaRunner extends UnitRunner { _deserializeFailEvent (event) { const err = this.deserializeError(event.args[1]) const fullTitle = event.args[0].fullTitle + const titlePath = event.args[0].titlePath _.set(event, 'args[0].fullTitle', () => fullTitle) + _.set(event, 'args[0].titlePath', () => titlePath) return _.set(event, 'args[1]', err) } diff --git a/packages/admiral-unit-mocha/test/index.js b/packages/admiral-unit-mocha/test/index.js index 7048689..6987fdf 100644 --- a/packages/admiral-unit-mocha/test/index.js +++ b/packages/admiral-unit-mocha/test/index.js @@ -38,12 +38,16 @@ describe('UnitMochaRunner', function () { assert.include(output, 'Should run tests in multiple files.') assert.include(output, '2 passing') assert.include(output, '1 failing') - assert.include(output, '1) Runner Should report failures.') + assert.include(output, '1) Runner') + assert.include(output, 'Should report failures.:') assert.include(output, 'Error: test') assert.include(output, 'Context.') assert.include(output, 'test.js:14:11') stdoutSpy.restore() + }).catch((e) => { + stdoutSpy.restore() + throw e }) }) })