Add testsuites output to junit

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 
 node_js:
   - "8"
-  - "9"
-  - "node"
+  - "10"
 
 sudo: false

lib/reporters/junit.js

@@ -40,24 +40,37 @@ internals.Reporter.prototype.end = function (notebook) {
         failures: notebook.failures,
         errors: notebook.errors.length,
         skipped: 0,
-        time: notebook.ms / 1000
+        time: notebook.ms / 1000,
+        testsuites: []
     };
 
-    const tests = context.tests = [];
-
     notebook.tests.forEach((nbtest) => {
 
+        const name = nbtest.path.join(' ');
+        let testsuite = context.testsuites.find((contextTestsuite) => {
+
+            return contextTestsuite.name === name;
+        });
+
+        if (!testsuite) {
+            testsuite = { name, tests: [], count: 0, skipped: 0, errors: 0, failures: 0, time: 0 };
+            context.testsuites.push(testsuite);
+        }
+
         const test = {
             title: nbtest.title,
             path: nbtest.path.join(' '),
             relativeTitle: nbtest.relativeTitle,
             time: nbtest.duration / 1000
         };
 
+        testsuite.time += test.time;
+
         if (nbtest.skipped || nbtest.todo) {
 
             test.skipped = true;
             ++context.skipped;
+            ++testsuite.skipped;
         }
 
         if (nbtest.err) {
@@ -67,9 +80,11 @@ internals.Reporter.prototype.end = function (notebook) {
                 message: nbtest.err.message,
                 details: nbtest.err.stack
             };
+            ++testsuite.errors;
         }
 
-        tests.push(test);
+        ++testsuite.count;
+        testsuite.tests.push(test);
     });
 
     this.report(this.view(context));

lib/reporters/junit/report.xml

@@ -1,6 +1,8 @@
-<testsuite tests="{{this.count}}" skipped="{{this.skipped}}" errors="{{this.errors}}" failures="{{this.failures}}" time="{{this.time}}">
+<testsuites tests="{{this.count}}" errors="{{this.errors}}" failures="{{this.failures}}" time="{{this.time}}">
+{{#each this.testsuites~}}
+<testsuite name="{{this.name}}" tests="{{this.count}}" skipped="{{this.skipped}}" errors="{{this.errors}}" time="{{this.time}}">
     {{#each this.tests~}}
-    <testcase classname="{{this.title}}" name="{{this.title}}" time="{{this.time}}">
+    <testcase classname="{{this.path}}" name="{{this.relativeTitle}}" time="{{this.time}}">
       {{#if this.err~}}
       <failure message="{{this.err.message}}" type="{{this.err.name}}">
         <![CDATA[{{this.err.details}}]]>
@@ -10,3 +12,5 @@
     </testcase>
     {{/each}}
 </testsuite>
+{{/each}}
+</testsuites>

test/cli.js

@@ -632,7 +632,8 @@ describe('CLI', () => {
 
         expect(result.errorOutput).to.equal('');
         expect(result.code).to.equal(0);
-        expect(result.output).to.contain('<testsuite tests="2"');
+        expect(result.output).to.contain('<testsuites tests="2"');
+        expect(result.output).to.contain('<testsuite name="Test CLI" tests="2"');
     });
 
     it('outputs to file passed with -o argument', async () => {