Merge pull request mathquill#1030 from desmosinc/fix-unit-test-merge

Fix merge issues in unit.html
CarnegieLearningWeb · Oct 2, 2023 · ca30110 · ca30110
2 parents e9217d1 + fd70d29
commit ca30110
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/test/unit.html b/test/unit.html
@@ -28,7 +28,7 @@
 
       mocha.setup({
         ui: 'tdd',
-        reporter: outputXunit ? 'xunit' : 'html'
+        reporter: outputXunit ? 'xunit' : 'html',
         bail: false
       });
     </script>
@@ -58,6 +58,9 @@ <h1>Unit Tests</h1>
       teardown(function() { $('#mock').empty(); });
 
       function runXUnit() {
+        var xunit = '';
+        Mocha.process.stdout.write = function(line) { xunit += line; };
+
         var runner = mocha.run();
         runner.on('end', function() {
           setTimeout(function() {