Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

resolves #1329: ability to disable syntax highlighting

Christopher Hiller7d896623385a
diff --git a/lib/mocha.js b/lib/mocha.js
index 8e57487d..7bfc42f4 100644
--- a/lib/mocha.js
+++ b/lib/mocha.js
@@ -370,6 +370,16 @@ Mocha.prototype.asyncOnly = function(){
return this;
};
+/**
+ * Disable syntax highlighting (in browser).
+ * @returns {Mocha}
+ * @api public
+ */
+Mocha.prototype.noHighlighting = function() {
+ this.options.noHighlighting = true;
+ return this;
+};
+
/**
* Run tests and invoke `fn()` when complete.
*
diff --git a/mocha.js b/mocha.js
index a19f5e96..1cd09907 100644
--- a/mocha.js
+++ b/mocha.js
@@ -1757,6 +1757,16 @@ Mocha.prototype.asyncOnly = function(){
return this;
};
+/**
+ * Disable syntax highlighting (in browser).
+ * @returns {Mocha}
+ * @api public
+ */
+Mocha.prototype.noHighlighting = function() {
+ this.options.noHighlighting = true;
+ return this;
+};
+
/**
* Run tests and invoke `fn()` when complete.
*
@@ -3143,7 +3153,7 @@ function clean(test) {
title: test.title,
fullTitle: test.fullTitle(),
duration: test.duration,
- err: errorJSON(test.err)
+ err: errorJSON(test.err || {})
}
}
@@ -4302,6 +4312,7 @@ Runnable.prototype.resetTimeout = function(){
if (!this._enableTimeouts) return;
this.clearTimeout();
this.timer = setTimeout(function(){
+ if (!self._enableTimeouts) return;
self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
self.timedOut = true;
}, ms);
@@ -5778,7 +5789,7 @@ function highlight(js) {
*/
exports.highlightTags = function(name) {
- var code = document.getElementsByTagName(name);
+ var code = document.getElementById('mocha').getElementsByTagName(name);
for (var i = 0, len = code.length; i < len; ++i) {
code[i].innerHTML = highlight(code[i].innerHTML);
}
@@ -5979,7 +5990,7 @@ mocha.run = function(fn){
return Mocha.prototype.run.call(mocha, function(err){
// The DOM Document is not available in Web Workers.
- if (global.document) {
+ if (global.document && options.noHighlighting !== false) {
Mocha.utils.highlightTags('code');
}
if (fn) fn(err);
diff --git a/support/tail.js b/support/tail.js
index 16be67cd..1abea5de 100644
--- a/support/tail.js
+++ b/support/tail.js
@@ -144,7 +144,7 @@ mocha.run = function(fn){
return Mocha.prototype.run.call(mocha, function(err){
// The DOM Document is not available in Web Workers.
- if (global.document) {
+ if (global.document && options.noHighlighting !== false) {
Mocha.utils.highlightTags('code');
}
if (fn) fn(err);