MochaReporter: update Mocha reporter based on js-reporters adapter.

Author: flore77

lib/_patch/mocha-plugin.js

@@ -1,73 +1,32 @@
 (function() {
-  function stack(err) {
-    var str = err.stack || err.toString();
+  var runner = new JsReporters.MochaAdapter(mocha);
+  var tracebacks = [];
+  var total = 0,
+      passed = 0,
+      failed = 0;
 
-    if (!~str.indexOf(err.message)) {
-      str = err.message + '\n' + str;
-    }
+  runner.on('testEnd', function(test) {
+    total = total + 1
 
-    if ('[object Error]' == str) {
-      str = err.message;
-    }
+    passed = passed + (test.status === 'passed' ? 1 : 0);
+    failed = failed + (test.status === 'failed' ? 1 : 0);
 
-    if (!err.stack && err.sourceURL && err.line !== undefined) {
-      str += '\n(' + err.sourceURL + ':' + err.line + ')';
-    }
-    return str.replace(/^/gm, '  ');
-  }
-
-  function title(test) {
-    return test.fullTitle().replace(/#/g, '');
-  }
-
-  var origReporter = mocha._reporter;
-
-  Mocha.BrowserStack = function(runner, root) {
-    origReporter.apply(this, arguments);
-
-    var count = 1,
-      that = this,
-      failures = 0,
-      passes = 0,
-      start = 0,
-      tracebacks = [];
-
-    runner.on('start', function() {
-      start = (new Date).getTime();
-    });
-
-    runner.on('test end', function(test) {
-      count += 1;
+    test.errors.forEach(function(error) {
+      tracebacks.push(error)
     });
+  });
 
-    runner.on('pass', function(test) {
-      passes += 1;
-    });
-
-    runner.on('fail', function(test, err) {
-      failures += 1;
-
-      if (err) {
-        tracebacks.push(stack(err));
-      }
-    });
-
-    runner.on('end', function() {
-      // delay posting results a little to capture "multiple-done" errors
-      setTimeout(function () {
-        results = {};
-        results.runtime = (new Date).getTime() - start;
-        results.total = passes + failures;
-        results.passed = passes;
-        results.failed = failures;
-        results.tracebacks = tracebacks;
-        results.url = window.location.pathname;
-        BrowserStack.post("/_report", results, function(){});
-      }, 1000);
-    });
-  };
+  runner.on('runEnd', function(globalSuite) {
+    var results = {};
 
-  Mocha.BrowserStack.prototype = origReporter.prototype;
+    // TODO investigate why globalSuite.runtime is not working
+    results.runtime = 0;
+    results.total = total;
+    results.passed = passed;
+    results.failed = failed;
+    results.tracebacks = tracebacks;
+    results.url = window.location.pathname;
 
-  return Mocha.BrowserStack;
+    BrowserStack.post("/_report", results, function() {});
+  });
 })();

lib/server.js

@@ -71,7 +71,6 @@ exports.Server = function Server(bsClient, workers) {
           framework_scripts['mocha'].forEach(function(script) {
             patch += '<script type="text/javascript" src="/_patch/' + script + '"></script>\n';
           });
-          patch += '<script type="text/javascript">mocha.reporter(Mocha.BrowserStack);</script>\n';
         } else if (framework === 'qunit') {
           framework_scripts['qunit'].forEach(function(script) {
             patch += '<script type="text/javascript" src="/_patch/' + script + '"></script>\n';