updating appveyor

mikeguta · Dec 29, 2017 · 3e4d333 · 3e4d333
1 parent d700489
commit 3e4d333
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 20 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,6 +12,7 @@ environment:
 install:
   - ps: Install-Product node $env:nodejs_version x64
   - npm install
+  - npm i xunit-viewer
 
 test_script:
   - node --version
@@ -28,5 +29,7 @@ after_test:
       $file = '.\test-results.xml'
       (New-Object 'System.Net.WebClient').UploadFile($url, (Resolve-Path '.\test-results.xml'))
       Push-AppveyorArtifact (Resolve-Path '.\test-results.xml')
+      Push-AppveyorArtifact (Resolve-Path '.\test-results-xunit-viewer.xml')
+      Push-AppveyorArtifact (Resolve-Path '.\test-results-xunit-viewer.html')
 
 build: off
diff --git a/tools/coverage.js b/tools/coverage.js
@@ -5,6 +5,7 @@ var input = path.resolve(testDir, 'tests.cs');
 var output = path.resolve(testDir, 'Edge.Tests.dll');
 var buildParameters = ['-target:library', '/debug', '-out:' + output, input];
 var mocha = path.resolve(__dirname, '../node_modules/mocha/bin/mocha');
+var xunit = path.resolve(__dirname, '../node_modules/xunit-viewer/bin/xunit-viewer');
 var fs = require('fs');
 const merge = require('junit-report-merger');
 
@@ -39,32 +40,51 @@ function run(cmd, args, onClose, signal){
     });
 
     command.on('close', function(code){
-        console.log(result);
+        //console.log(result);
         onClose(code, signal);
     });
 }
 
-function runOnSuccess(code, signal) {
+function runOnSuccess(code, framework) {
     if (code === 0) {
         process.env['EDGE_APP_ROOT'] = path.join(testDir, 'bin', 'Debug', 'netcoreapp1.1');
 
-        spawn('node', [mocha, testDir, '-R', 'mocha-junit-reporter', '-t', '10000', '-gc', '--reporter-options', 'mochaFile=./test-results-' + signal + '.xml'], {
-            stdio: 'inherit'
-        }).on('close', function(code) {
-            var source = [];
-            if(fs.existsSync('./test-results-coreclr.xml')){
-                source.push('./test-results-coreclr.xml');
-            }
-            if(fs.existsSync('./test-results-net.xml')){
-                source.push('./test-results-net.xml');
-            }
-            merge.mergeFiles('./test-results.xml', source, function(err) {
-                if(err)
-                    console.log(err)
-            })
-        }).on('error', function(err) {
-            console.log(err);
-        });
-
+        createJunitReports(framework, false);
+        createJunitReports(framework, true);
     }
 }
+
+function createJunitReports(framework, createHtml){
+    let suffix = createHtml ? '-xunit-viewer' : '';
+    spawn('node', [mocha, testDir, '-R', 'mocha-junit-reporter', '-t', '10000', '-gc', '--reporter-options', `mochaFile=./test-results-${framework}${suffix}.xml,testCaseSwitchClassnameAndName=${createHtml ? 'true' : ''}`], {
+        stdio: 'inherit'
+    }).on('close', function(code) {
+        let source = [];
+        if(fs.existsSync(`./test-results-coreclr${suffix}.xml`)){
+            source.push(`./test-results-coreclr${suffix}.xml`);
+        }
+        if(fs.existsSync(`./test-results-net${suffix}.xml`)){
+            source.push(`./test-results-net${suffix}.xml`);
+        }
+        merge.mergeFiles(`./test-results${suffix}.xml`, source, function(err) {
+            if(err)
+            {
+                console.log(err)
+            }else{
+                if(createHtml){
+                    spawn('node', [xunit, '--results=test-results-xunit-viewer.xml','--output=test-results-xunit-viewer.html'], {
+                        stdio: 'inherit'
+                    }).on('close', function(code) {
+                    }).on('error', function(err) {
+                        console.log(err);
+                    });
+                }
+
+
+            }
+        })
+    }).on('error', function(err) {
+        console.log(err);
+    });
+}
+